[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/
commit: feacb8e6956e306319f7c83d8440ac86006bfb90
Author: William Hubbs gentoo org>
AuthorDate: Sun Sep 6 06:31:05 2015 +
Commit: William Hubbs gentoo org>
CommitDate: Sun Sep 6 06:35:14 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feacb8e6
sys-fs/udev: sync live ebuild
sys-fs/udev/udev-.ebuild | 6 ++
1 file changed, 6 insertions(+)
diff --git a/sys-fs/udev/udev-.ebuild b/sys-fs/udev/udev-.ebuild
index e69fa2d..96cc496 100644
--- a/sys-fs/udev/udev-.ebuild
+++ b/sys-fs/udev/udev-.ebuild
@@ -147,6 +147,12 @@ src_prepare() {
fi
}
+src_configure() {
+ # Prevent conflicts with i686 cross toolchain, bug 559726
+ tc-export AR CC NM OBJCOPY RANLIB
+ multilib-minimal_src_configure
+}
+
multilib_src_configure() {
tc-export CC #463846
export cc_cv_CFLAGS__flto=no #502950
[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/
commit: 14f79ca586e022cbef903c9cec4db035076e7c83
Author: William Hubbs gentoo org>
AuthorDate: Sun Sep 6 06:28:04 2015 +
Commit: William Hubbs gentoo org>
CommitDate: Sun Sep 6 06:35:05 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14f79ca5
sys-fs/udev: version bump
sys-fs/udev/Manifest| 1 +
sys-fs/udev/udev-225.ebuild | 439
2 files changed, 440 insertions(+)
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index e21e829..e4d8135 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -9,3 +9,4 @@ DIST udev-218-patches-1.tar.xz 616 SHA256
80c0e57caa2845164b3fda1a9a74d07763a6b1
DIST udev-220-patches-4.tar.xz 3432 SHA256
b17c676c7984d90bcafb57d087e77bc9e435a3244187f51e8c5ce1b3d4248ac9 SHA512
747e6d36faaed145bbe630e794bdd636d4e39d55fc2fc422d815cee3ab4aa579f15abbd1ff88c0448667546c8b04f72663cffa46d07861199076912bd009d25d
WHIRLPOOL
0a349daae71b6ac95afc7414aa931f8aaa7328d2a0e7058cf6099b794531a1148bcd198f404d5d4bab7b250b1390adeb6938e8771da90fb7f56114560fd03a82
DIST udev-222.tar.gz 4015599 SHA256
b49f51f9855127987adc98aad3b6d608e4e53eaa029b629f2ea2089ce0234f34 SHA512
83f0acf0ca90c89c902c268af6eef4b61380a30380013cbe89c929357959f51682cd3961a6a4f772abc09d5ca09404ae290edf2c3253fab1b20dc2b5b3ecde47
WHIRLPOOL
dd0151034de374b072e70448e7a9ff47693df0190e8a2a11488593400d3d7e53e0a91d86037d027c750584089e6c68e58c437647d608a72f8826f091e3253879
DIST udev-224.tar.gz 3868075 SHA256
0d7ac1532a57639fbc828f8a5051a090883c6ad2908618a7a13ab386db831bfc SHA512
7717d340c6de11afd589234b7ec8952fe2ffcd05829622bd7ea8e008870c0e3b83eb1eaf20e85a7adafc9c0c0b94fd93784510792109240e22e6b963f198
WHIRLPOOL
645b08ff0c20994b17b8ed585fb0eef682336961d7fedf25031fa4dc89a4d9a2b58c254e0f9baeedcb228435316fdfb562f9fefd21e5a63f94499d2f1040e093
+DIST udev-225.tar.gz 3878442 SHA256
b2f576bb3688e9315f2f49b98e141ac6f964567370e98ebd8fd7332a0a6f9701 SHA512
35b3946509c7b01660da4370d3c51ff0e6a537dadd9dbb0a039c4f7ed552fd4e02ebac6eb8a788f61f1e3ba99444238d959051dd004c174b027729a80368ac19
WHIRLPOOL
47cd3b5690dafdf3c0ef6a9767e947666b1853541f8aefd17eb5c07eee1477daf32f3b249b04327b1c56d8ec430745725383750b97755bb6cf594d354a7ffdf8
diff --git a/sys-fs/udev/udev-225.ebuild b/sys-fs/udev/udev-225.ebuild
new file mode 100644
index 000..96cc496
--- /dev/null
+++ b/sys-fs/udev/udev-225.ebuild
@@ -0,0 +1,439 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools bash-completion-r1 eutils linux-info multilib
multilib-minimal toolchain-funcs udev user versionator
+
+if [[ ${PV} = * ]]; then
+ EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd"
+ inherit git-r3
+else
+ patchset=
+ SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+ if [[ -n "${patchset}" ]]; then
+ SRC_URI="${SRC_URI}
+
https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
+
https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz";
+ fi
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace
devfs)"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd";
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="acl +kmod selinux static-libs"
+
+RESTRICT="test"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.24
+ sys-libs/libcap[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl )
+ kmod? ( >=sys-apps/kmod-16 )
+ selinux? ( >=sys-libs/libselinux-2.1.9 )
+ != -r4 to skip some parallel build issues
+DEPEND="${COMMON_DEPEND}
+ dev-util/gperf
+ >=dev-util/intltool-0.50
+ >=sys-apps/coreutils-8.16
+ virtual/os-headers
+ virtual/pkgconfig
+ >=sys-devel/make-3.82-r4
+ >=sys-kernel/linux-headers-3.9
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt"
+RDEPEND="${COMMON_DEPEND}
+ ! "${T}"/40-gentoo.rules
+ # Gentoo specific floppy and usb groups
+ SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
+ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
+ EOF
+
+ # change rules back to group uucp instead of dialout for now wrt #454556
+ sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
+
+ # stub out the am_path_libcrypt function
+ echo 'AC_DEFUN([AM_PATH_LIBGCRYPT],[:])' > m4/gcrypt.m4
+
+ # apply user patches
+ epatch_user
+
+ eautoreconf
+
+ if ! [[ ${PV} = * ]]; then
+ check_default_rules
+ fi
+
+ # Restore possibility of running --enable-static wrt #47
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/bunny/
commit: d02cdf7ffd85713cb3f64a3d7eb36dff96b5739e
Author: Hans de Graaff gentoo org>
AuthorDate: Sun Sep 6 06:04:47 2015 +
Commit: Hans de Graaff gentoo org>
CommitDate: Sun Sep 6 06:23:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d02cdf7f
dev-ruby/bunny: version bump
Package-Manager: portage-2.2.20.1
dev-ruby/bunny/Manifest | 1 +
dev-ruby/bunny/bunny-2.2.0.ebuild | 32
2 files changed, 33 insertions(+)
diff --git a/dev-ruby/bunny/Manifest b/dev-ruby/bunny/Manifest
index b980c60..22789c9 100644
--- a/dev-ruby/bunny/Manifest
+++ b/dev-ruby/bunny/Manifest
@@ -1,3 +1,4 @@
DIST bunny-1.6.3.gem 180224 SHA256
3eb1339993db6ea5b8655be374c0427924c13bdc9cafee8141e513d334e0a52d SHA512
ceeca544cd05c78adb3bd3164ca84851b65270ecd069e923979b432abc92160642f334df088364ae9960b2c3523260a0ffcd06dd20b51bd798178231efa74a95
WHIRLPOOL
7a9a20240e15c3b480aa870c6270f08ba0d95d12d4ea68e71c444e5abe4933a9dfadbe3babf71c1e35c78a04be09a0d8c01159781b749db3be79189ddede9e13
DIST bunny-1.7.0.gem 181248 SHA256
889b3bb5b173d8ce16ec7d96cd72ccd742a3e31eaaf0f0336b762cec1f0bf806 SHA512
158ea3906c1318458da7551519ff00e30191f91f0cf3ea777b1069f55cd5fce865591495f56177f8d23a4498bdf95b145caa2027136fab2d3108af6a685eca59
WHIRLPOOL
05fa177b554a5d0c4a76f953242b3d715c4dc969b939375ac22e5d054fee4a1a6634c8a851f25f11120037a1992af7202ff5727452415cea5a3e60cea6c24a03
DIST bunny-2.0.1.gem 183296 SHA256
ceff06015fa1ddc3aeea397f23242a9de13f3bc7f3481ace1a0b194d66a84236 SHA512
53ef3ec503f4ed5cbcec72343a492f102c358f7f2bd6f4833a3306384faf03195e59f9ca5ef9a7e0d7dc21ae1428c9b107bbbc5a4691853920d3410765e576be
WHIRLPOOL
465ea17a2c1ed51127ed37f4ad8fc916d9227111debec127bfcd4e539a7c697c8f5395c3f26cc47c4665948f7e67027d1d0b20c1235b93482aa17302bcbf7771
+DIST bunny-2.2.0.gem 183808 SHA256
901b9e4ccac2edc7b1e08ca63083e519410b46a0c8d23438a6be6570be8282f1 SHA512
f7043ddb7d0f7e9cf365d27456b0545110aa9b61cbbf89fdb73cb73cc60b14d7d9d13c4e6292347a43698053ac06468fe7e10f6bcf4a22306040e85e83fd6d36
WHIRLPOOL
35cbee6eaca8b19248e8f3c344838651ecde93b65eee632c468fa45327adf8685f2deba394a6435fe9635aa5f4a1a0df3284f6c48551be2cd62b88b4880ae658
diff --git a/dev-ruby/bunny/bunny-2.2.0.ebuild
b/dev-ruby/bunny/bunny-2.2.0.ebuild
new file mode 100644
index 000..d4bedab
--- /dev/null
+++ b/dev-ruby/bunny/bunny-2.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+# Tests require a live AMQP server.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Another synchronous Ruby AMQP client"
+HOMEPAGE="https://github.com/celldee/bunny";
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/amq-protocol:2"
+
+all_ruby_install() {
+ all_fakegem_install
+
+ insinto /usr/share/doc/${PF}
+ doins -r examples || die
+}
[gentoo-commits] repo/gentoo:master commit in: www-apache/passenger/
commit: 4a3f05d5cda6ebb744a811b3210e94d683fc1bb7
Author: Hans de Graaff gentoo org>
AuthorDate: Sun Sep 6 06:23:00 2015 +
Commit: Hans de Graaff gentoo org>
CommitDate: Sun Sep 6 06:23:53 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a3f05d5
www-apache/passenger: version bump
Package-Manager: portage-2.2.20.1
www-apache/passenger/Manifest| 1 +
www-apache/passenger/passenger-5.0.16.ebuild | 118 +++
2 files changed, 119 insertions(+)
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 37c2e23..304f2c2 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -2,4 +2,5 @@ DIST passenger-4.0.53.tar.gz 4447609 SHA256
0b8d256cd930f93cfe723392aaa12fa3f9d5
DIST passenger-4.0.59.tar.gz 4521206 SHA256
8b4756564a5133dc97425883d15d1ba1c9f6566c79e92794dc3e1f5b749238ae SHA512
d29400c71cf9530b41ce8b8d4cf94007e4d77fb4ceff290786506d6b9dfbab790f18423dc5dcd71aef07147ba2610c2982f7ca733a8e491de6a0cb3704c54bfb
WHIRLPOOL
4683d19813ecbb284ec3eb9681c6c1a1b84f256f0262e6c2b1941df5872031a30da1396cb22fa1cfbad2f53f8971131ed0418c2ef4c20160a3d67f151d54208a
DIST passenger-5.0.13.tar.gz 5556161 SHA256
9fef27b97e883e6bc55d817c52b927f2d5cd8bbc2ce79686a3de794d7e0c40e1 SHA512
68ff1e6701e431b1e26ffce8dd46198fffdddaa14bfa2f3917a20d32a7d54b3acac46d1ce797b551d9f988e7e0129d8372158f2e096342e08cb1a614d9fbf716
WHIRLPOOL
85282b61b675a0459a33208dd267d9e3b2284134bd5931df619041b5e4a2265542f9355e7f1feae2c98ffc27128504ecd46dc6493e8cbb8d55e7f9dfbf5deeac
DIST passenger-5.0.14.tar.gz 5557110 SHA256
dbc994a9d8a0f28f2abeec25191471bbfec6e51d3e0748d7e16947bc8713f6d5 SHA512
39540136547db1b21c61174a4e86a4b5255c1f59036abbfc571eaee6fb03c48d4ec262d7fb1f1a27bf08b093112d8aaeb09c294304b597d0fdcd1fc278167b79
WHIRLPOOL
8cc983685142abbde9e85b12ee7283246fa7ebd627d56516328d6fc2ad5362439da9fcab37fffc129c2b4e992834c5efd09cfa9ee570d2c577dfd27ec8c56f95
+DIST passenger-5.0.16.tar.gz 4925041 SHA256
39799fdfa4873f67764747de1eddbe1fae759b1cd459c1c592ec71eecb462be5 SHA512
98e3c15113429bef4f01c35178c41b63fa9cd52b9fc3fc37e5e2d1a1a8d167057f73f03448b7989899d9fcce65a1a69488ae1f998dbf28368e2ee13aec909550
WHIRLPOOL
9e792dede7beaf6ee86950615cef2d4e81d8353f9077d5a9d50127eb669fe9708e8a61c597b3b5b1ad7645df8c4299060ed918ffcccdb7901db61967cfd61d98
DIST passenger-5.0.4.tar.gz 5289792 SHA256
5c29f2c1407db515ddccd540443cb34bff7ca180b3e269c2e28a34ad795f99f6 SHA512
a04bcf579a8148b34c34743a87f4f3b180218e871ed6309d7b83e9b4ab88334f01a566896c7406e3ddaf11ba0322128557cf5cfb2bcf5da7e4ea81f0539784ec
WHIRLPOOL
f2d523266a616d2b893963d5139be0d781a2bf76b122b4c76bb5cb6af7a655e5492b8c58d2f38f97858616108d0c3122278598fcfa7a262bab252e079e888536
diff --git a/www-apache/passenger/passenger-5.0.16.ebuild
b/www-apache/passenger/passenger-5.0.16.ebuild
new file mode 100644
index 000..79dd68d
--- /dev/null
+++ b/www-apache/passenger/passenger-5.0.16.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
+
+DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails
applications a breeze"
+HOMEPAGE="http://modrails.com/";
+SRC_URI="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="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.5.0
+ net-misc/curl[ssl]
+ 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"
+
+need_apache2
+
+pkg_setup() {
+ use debug && append-flags -DPASSENGER_DEBUG
+}
+
+all_ruby_prepare() {
+ epatch "${FILESDIR}"/${PN}-5.0.4-gentoo.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/=.*$/= '$(tc-getCXX)'/" \
+ -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
+
+ # Avoid fixed debugging CFLAGs.
+ sed -e '/debugging_cflags/areturn ""' -i
lib/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/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:"
\
+ -e
"s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/a
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/bson/
commit: f70354028b76abbd561305c93536947f62283a97
Author: Hans de Graaff gentoo org>
AuthorDate: Sun Sep 6 06:01:14 2015 +
Commit: Hans de Graaff gentoo org>
CommitDate: Sun Sep 6 06:23:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7035402
dev-ruby/bson: version bump
Package-Manager: portage-2.2.20.1
dev-ruby/bson/Manifest | 1 +
dev-ruby/bson/bson-3.2.4.ebuild | 45 +
2 files changed, 46 insertions(+)
diff --git a/dev-ruby/bson/Manifest b/dev-ruby/bson/Manifest
index e4ad23c..47cfcca 100644
--- a/dev-ruby/bson/Manifest
+++ b/dev-ruby/bson/Manifest
@@ -1,4 +1,5 @@
DIST bson-3.0.4.tar.gz 49517 SHA256
10a34e681804abfde9a2c047d9fa4554e40aef28f0a7114b88f7324215041de4 SHA512
8a57ff6706af44ef22841fdd33cd8c9d2ea4fd94dfde9f4fe94fdb08d95d3249b96939866459294c8258d99f37ff3e0ab8ac16b53fad1db6ddb26506135a4008
WHIRLPOOL
07f81925049e23c5f8f75e08b3eb4594e0df4a890bc864674d19a3a291eca8a58f121b3d045d14c44f454753dc3d0be425ff140d3d0eb72bc2cd8a61734d08d8
DIST bson-3.2.0.tar.gz 50495 SHA256
a452bf4f77548697f36659413fa2c106e592d29b8259c285262a1db5c1ffae06 SHA512
258cd31e390cafb12b93d326686e2a08e55da44b458a68cbf5ce8ebc51a477844934a346a77914a9baf1004ca465b45d7399e7daab74b2b9e7389b7c23cbf777
WHIRLPOOL
d8c192343dcabbf162d16dd4f19612ddeb43cdabe8e13559014db2ca2d7dda2c5df759631fba7f0f4ed7b5e2d76e7327dc4a46d695a792afbc84aaaf8f6b4489
DIST bson-3.2.1.tar.gz 50640 SHA256
8e81a04bd433bd82fd558b1ef58b35a53448eb6dc9c85a808238b0d21dfa71d4 SHA512
c5565965615036608b87895d40d62b42193eb7ba31f168051222595f9095627157606ba8ba7966ed349ec05005645320ce10cc510e1fa47368f907368734fb0a
WHIRLPOOL
1e1007132aeb99655f1af49de0696ba104d1ac9d63c09b3136e5e523318acb36c568fe813ecbd663212a109bd94486fda1074f12fd18b3336e600b239252a4e4
+DIST bson-3.2.4.tar.gz 51208 SHA256
adcc339e4618fbd9bc8dc91677971118834adfd19bf6ae783d79308f2fb446b2 SHA512
d7817d5ec068895e4a883921dc8495aa9d44401b7a66c77f29b71434428efaf417f1219ebbb1bd7065a8beebba41c0c461e7b9f5376bc9259ada695f6eb97715
WHIRLPOOL
670239430ec0ccfe01a4a50d843fbc871faea06b0d5cf7db4cf53d32ec7a6dcca7ef06497589d1e0f4ee8e20e451bff33b7d0bcfea298b71dead22716f07eab2
DIST mongo-ruby-driver-1.12.0.tar.gz 360669 SHA256
84c87d26601c9bd91a6604bcb3630be50d239e471542f9b0a68379705dd03e11 SHA512
725110c527867379def85fde50b6825e94a320356f062e4403d9d55c223f2503676f83ae42916d6ab45afd90d30b2a4272519e070c4af2095c0965297fd72bb6
WHIRLPOOL
c152aa579a0535707909560cc73fc878521aac95c034ec71bca6c2397754b5e057c1e7ca32f6b2b3393ce975f122e65926820cdde29aa5f5734fb9717bd980e0
diff --git a/dev-ruby/bson/bson-3.2.4.ebuild b/dev-ruby/bson/bson-3.2.4.ebuild
new file mode 100644
index 000..0627cb8
--- /dev/null
+++ b/dev-ruby/bson/bson-3.2.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+GITHUB_USER="mongodb"
+GITHUB_PROJECT="bson-ruby"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A Ruby BSON implementation for MongoDB. (Includes binary C-based
extension.)"
+HOMEPAGE="http://www.mongodb.org/";
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
+RUBY_S="bson-ruby-${PV}"
+
+LICENSE="APSL-2"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE="test doc"
+
+all_ruby_prepare() {
+ # Remove bundler support
+ sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+ # Remove project-specific rspec options
+ rm .rspec || die
+}
+
+each_ruby_configure() {
+ ${RUBY} -C ext/bson extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+ emake -C ext/bson V=1 CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
+ cp ext/bson/*$(get_modname) lib/ || die
+}
[gentoo-commits] repo/gentoo:master commit in: app-editors/vim/
commit: 86b9ef89f85a723c8dabc06c50405e25040e8dd7
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 06:22:54 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 06:22:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86b9ef89
app-editors/vim: Stable for HPPA PPC64 (bug #551552).
Package-Manager: portage-2.2.20.1
app-editors/vim/vim-7.4.769.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-editors/vim/vim-7.4.769.ebuild
b/app-editors/vim/vim-7.4.769.ebuild
index 832f4bb..02aa3ca 100644
--- a/app-editors/vim/vim-7.4.769.ebuild
+++ b/app-editors/vim/vim-7.4.769.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == * ]] ; then
else
SRC_URI="https://github.com/vim/vim/archive/v${MY_PV}.tar.gz ->
${P}.tar.gz
https://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2";
- KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd
~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
~x64-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64
~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd
~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Vim, an improved vi-style text editor"
[gentoo-commits] repo/gentoo:master commit in: app-editors/gvim/
commit: ad3c33fb0decba270310fdce2e8a670601e24461
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 06:23:23 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 06:23:23 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad3c33fb
app-editors/gvim: Stable for HPPA PPC64 (bug #551552).
Package-Manager: portage-2.2.20.1
app-editors/gvim/gvim-7.4.769.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-editors/gvim/gvim-7.4.769.ebuild
b/app-editors/gvim/gvim-7.4.769.ebuild
index b0b8f90..606cb37 100644
--- a/app-editors/gvim/gvim-7.4.769.ebuild
+++ b/app-editors/gvim/gvim-7.4.769.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == * ]] ; then
else
SRC_URI="https://github.com/vim/vim/archive/v${MY_PV}.tar.gz ->
vim-${PV}.tar.gz
https://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2";
- KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+ KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd
~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
fi
DESCRIPTION="GUI version of the Vim text editor"
[gentoo-commits] proj/toolchain:master commit in: sys-devel/gcc/
commit: 5195005da78a528986b387f8166866ec96df0d41 Author: Mike Frysinger gentoo org> AuthorDate: Sun Sep 6 06:09:11 2015 + Commit: Mike Frysinger gentoo org> CommitDate: Sun Sep 6 06:09:11 2015 + URL:https://gitweb.gentoo.org/proj/toolchain.git/commit/?id=5195005d gcc: update snapshots sys-devel/gcc/Manifest | 22 ++ sys-devel/gcc/gcc-4.9.0_alpha20150715.ebuild | 18 ++ sys-devel/gcc/gcc-4.9.0_alpha20150722.ebuild | 18 ++ sys-devel/gcc/gcc-4.9.0_alpha20150729.ebuild | 18 ++ sys-devel/gcc/gcc-4.9.0_alpha20150805.ebuild | 18 ++ sys-devel/gcc/gcc-4.9.0_alpha20150812.ebuild | 18 ++ sys-devel/gcc/gcc-4.9.0_alpha20150819.ebuild | 18 ++ sys-devel/gcc/gcc-4.9.0_alpha20150826.ebuild | 18 ++ sys-devel/gcc/gcc-4.9.0_alpha20150902.ebuild | 18 ++ sys-devel/gcc/gcc-5.0.0_alpha20150721.ebuild | 18 ++ sys-devel/gcc/gcc-5.0.0_alpha20150728.ebuild | 18 ++ sys-devel/gcc/gcc-5.0.0_alpha20150804.ebuild | 18 ++ sys-devel/gcc/gcc-5.0.0_alpha20150811.ebuild | 18 ++ sys-devel/gcc/gcc-5.0.0_alpha20150818.ebuild | 18 ++ sys-devel/gcc/gcc-5.0.0_alpha20150825.ebuild | 18 ++ sys-devel/gcc/gcc-5.0.0_alpha20150901.ebuild | 18 ++ sys-devel/gcc/gcc-6.0.0_alpha20150719.ebuild | 18 ++ sys-devel/gcc/gcc-6.0.0_alpha20150726.ebuild | 18 ++ sys-devel/gcc/gcc-6.0.0_alpha20150802.ebuild | 18 ++ sys-devel/gcc/gcc-6.0.0_alpha20150809.ebuild | 18 ++ sys-devel/gcc/gcc-6.0.0_alpha20150816.ebuild | 18 ++ sys-devel/gcc/gcc-6.0.0_alpha20150823.ebuild | 18 ++ sys-devel/gcc/gcc-6.0.0_alpha20150830.ebuild | 18 ++ 23 files changed, 418 insertions(+) diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 58a9efe..b2d5a85 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -170,6 +170,14 @@ DIST gcc-4.9-20150617.tar.bz2 85874465 SHA256 10c4ac376f40674184891530e4cb323daf DIST gcc-4.9-20150624.tar.bz2 85876805 SHA256 fb37f9ac1a49f1c454f63ae45c5e004ab714ba005e940fa6ca54aaa1b6611761 SHA512 b0c4c0214ef60d671b2087800ecd96dca1e56d8e57361f95f110dc476e985f37409d201dc6081b2618736d0f3c1e09508f88db1b14ee44ef3ce24ecf9aacf4e3 WHIRLPOOL 986ef4b08686ffcd38b4fe3056e5c23cef613743e2b27fd14368a37a7d922e4bc6d642e9506a7f510def9793522eacf7fd965333236502952d8b9894b7fa13d8 DIST gcc-4.9-20150701.tar.bz2 85867080 SHA256 7ab2967809c14c862f155ca054f57ae7927c4c210882ad82d2874976d63ec6ea SHA512 d19a3d41ae566fdd51bebae9ad3f9833f93615612e10bb42158fb4cafb9bbf2ae980b9acfca0f1360e0d9b478849095b566993c4d729f6a0300e4435eee4f272 WHIRLPOOL 03737f0b35abc4401bc091fcc343891f18895d9b069af4f75f33bfad6cf20a53ab2d712f58d4e6289d410c50638c9a410dca37ab6482455266bb6be538b33dde DIST gcc-4.9-20150708.tar.bz2 85865178 SHA256 c16e36614cf641515a2579ac9ebd93566d3effec18cc49c622a36a7706ddd2b1 SHA512 e8580fe6253bbff7e4b95575cb7a7e570fc9c09e745c6a0ccf9a19bf9ca07e2f635a122d10cb54988df0e911f77de70781dfffda962a94fb8d27d849495c63e2 WHIRLPOOL f6697c3399218e80c5c3b7cb9fd0796d81e48c0c1e968e7d7fde47e8ce0b2deec8c009022c27aaaf88c65f28d5bd9d0ad7ee87c15b0c8332db49ca1e611fb807 +DIST gcc-4.9-20150715.tar.bz2 85864053 SHA256 5989287e88d434a4f4497da4609dde735efca890471634d64cf85909f5a29126 SHA512 3004f3ef147066d8ad5f0c44aca1d5730febbb16cc5d61dc44c68834bdec75c62d7664f16cc9194500574ffb8d942a6e560e94017f98d777c9cc9f0094b20903 WHIRLPOOL 4811a347f756840cefc3d3993d6a845c1009a51bb626fb2776668520faa258bb522a5cf4e363900c35fda7f54365025bb7b67d68e9de326504393d3c201d6eae +DIST gcc-4.9-20150722.tar.bz2 85871172 SHA256 1957cf8228d9baeb32484d336b1f1e84cc6b7632d57d8bbf7d4bedcb0d3d9e34 SHA512 bdc55007b91b42ffb8c46bd30339c876e9cb407d09b263cff6f470587b5cc08f917066007094174d3295ef7767b68765839cb11122039f275eab53c36269aa13 WHIRLPOOL ce09ad812395acbbab814a125d2b381ee7dfc2bec07c42693bd7e9f71d2e0f3baf41e3dcff1717288e3f5781013807d150ab90f297ef0e4a69c6bc77d353709c +DIST gcc-4.9-20150729.tar.bz2 85847009 SHA256 93caa05908f684c680aa4bc48a9d9d1ec01230441dc656912fc28eaae1a39f4d SHA512 0ceaad6d47ca79bc783e47e0684a3a0106c4b507d7102a76488fa4ba3d20fc1712ea2d03fb0ec61bcf302a9c13e2c6332dda9f2fda178f58130e1727f366 WHIRLPOOL f6205a43084fae8ba9d1a991217793c55087a0d34cc83a5dcc13ab9d3e41d0d4c3461b4d374fbc7f654bfd5be30617c126578a780782f8873c5dcf6be6fc9c63 +DIST gcc-4.9-20150805.tar.bz2 85833191 SHA256 3a5278b50759aeff3bf13e87491e4abfaf9344b26fea6517bf26c89197113d00 SHA512 c05508e5f54d4fcedbf0b98bc4d15f57c703973c858068a985aec8d2207a4905da34842f27bb77b5b1e5d0a417a1770ed7c2195a570fc9ff637606d8860c2948 WHIRLPOOL 35e9acc5000fa38ed7200dac5f743bec464f4a851ec0a2a0adb147b22f5d2f7957add718283a4f07a1b83f85033f81150bceb41452dc758505e28c3c552b6b37 +DIST gcc-4.9-20150812.tar.bz2 85839
[gentoo-commits] repo/gentoo:master commit in: app-editors/vim-core/
commit: 5121158ec82f7f9ceb9e5e32f0201fca524accd6
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 06:22:39 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 06:22:39 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5121158e
app-editors/vim-core: Stable for HPPA PPC64 (bug #551552).
Package-Manager: portage-2.2.20.1
app-editors/vim-core/vim-core-7.4.769.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-editors/vim-core/vim-core-7.4.769.ebuild
b/app-editors/vim-core/vim-core-7.4.769.ebuild
index a0de48a..8628606 100644
--- a/app-editors/vim-core/vim-core-7.4.769.ebuild
+++ b/app-editors/vim-core/vim-core-7.4.769.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == * ]] ; then
else
SRC_URI="https://github.com/vim/vim/archive/v${MY_PV}.tar.gz ->
vim-${PV}.tar.gz
https://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2";
- KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd
~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
~x64-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64
~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd
~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
~x64-solaris ~x86-solaris"
fi
DESCRIPTION="vim and gvim shared files"
[gentoo-commits] proj/toolchain:master commit in: sys-devel/gdb/
commit: f2d14ec62a07979ad03dd0f07c1e65b37e8988ba
Author: Mike Frysinger gentoo org>
AuthorDate: Sun Sep 6 06:09:47 2015 +
Commit: Mike Frysinger gentoo org>
CommitDate: Sun Sep 6 06:09:47 2015 +
URL:https://gitweb.gentoo.org/proj/toolchain.git/commit/?id=f2d14ec6
gdb: update snapshots
sys-devel/gdb/Manifest | 6 +++---
.../{gdb-7.10.50.20150715.ebuild => gdb-7.10.50.20150904.ebuild}| 0
.../{gdb-7.10.50.20150714.ebuild => gdb-7.10.50.20150905.ebuild}| 0
.../{gdb-7.10.50.20150713.ebuild => gdb-7.10.50.20150906.ebuild}| 0
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index ddeef03..40c3d3e 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -31,9 +31,9 @@ DIST gdb-7.7.tar.bz2 24846320 SHA256
0404d1c6ee6b3ddd811722b5197944758d37b4591c2
DIST gdb-7.8.1.tar.xz 17669136 SHA256
497722b58386f4428c3474281eb3ef1c872404998b6ace907edb3bba1fabdc35 SHA512
c40775e727a665300b45ec5d375424565671768cb73eee6793285a5b9a29db66072fc55d56bc1b4189cd38e0590573554e283661e4fbec23e4ad3d5b90542a87
WHIRLPOOL
845988be5a667eae2ca2f433399d51af3bf8219a692385477f6f7f37bae000a017f39db271f28cf101a0b92eb4b48fe79c7edd1da1b84a83f3a612e49b96e265
DIST gdb-7.8.tar.xz 17664316 SHA256
49c4abe174f79f54e1f9e75210ffb590d9b497d5b5200b5398c0e073a4ecb875 SHA512
e3977393c3a9bc2860d845928f457f4696a87106ccf30569cb69a82893deeab9b05fd1cffa4316cc5cfdfd3ad11a2d5660ed07a9965fa3d696a0ec604702557f
WHIRLPOOL
fb97f1fbee170fccf462d25fd6b4a218a8126b75465b59e21322ff2cacf2707d6b037d593663a4f52ae293c72d012a69a65377ee6827de18da80159c829b672d
DIST gdb-7.9.tar.xz 17859428 SHA256
9b315651a16528f7af8c7d8284699fb0c965df316cc7339bb0b7bae335848392 SHA512
850202a477b486a75dc8196efead79c95bc675e348064a5eefee2a50215d40f62e9e052e9b8df29f997f91430f6e7454883652c701f5b1e688d9e2c575876c83
WHIRLPOOL
597cbe8b8c9da7e2188f6d207738fd9679c3a841fec9483f67ff91156d7886636b1da61bf1255155115655d87648278a0670ad381afde931c7c6ab6e762a9ecd
-DIST gdb-weekly-7.10.50.20150713.tar.xz 19958112 SHA256
285adfe9879396fcf9c8447e353d1f2d821c97d04af4a9d310ebac601ccc0c23 SHA512
7eb38fda72e71bdcc2dfdf8a47d1089ef18ff7de6af25f5418de1bfb7972a3425fde1212cd9b76b3dd6c6fc34f2b21fface3e99309123952b9c6613cf7129382
WHIRLPOOL
edc1c4c12577b51e94e9eaf2f36dbf0e68992f1fc4b5dfa78abad3f40538fa2fb2e97a4fd8fa6fc6f9921f8ac3501ef0e360cb1d1b3085c30d223912a9f096e2
-DIST gdb-weekly-7.10.50.20150714.tar.xz 19963848 SHA256
67a448247f3d7e185b279a9553730541cfaf06573c5638ab2a4268ad8c624020 SHA512
49f84b2cee26a44393c0d255b2e6e7c03b7f08a34db4f174eee946e16902043b0f678490f3a089de532e6b169790e0518c219158e8d739bfb0341655691901a4
WHIRLPOOL
6591e97b4a7c7ffb12918d461533ce4d2184bb94f6fbdbeb7886d07d47e3eb61188ae5f3c19dbaddd34904e3f4269d8dd3c91eee93750c21f1e5a2ebd81bb577
-DIST gdb-weekly-7.10.50.20150715.tar.xz 19962244 SHA256
d438bcd1f15d7ecfbfb145df355e682e6146a97cc3289dfbb923354dbc0791b0 SHA512
2ce6d9cd4023dfc44c427cff30e72a971ce43a07463f7ac667a0867ef1ee1e940ef0c693879266a472d30cc56f29e978a84358aecf109bf06e1d20d23ac32a1e
WHIRLPOOL
e6bf92e1fa884e38dac6e7cc051b50e0aaf31386f2033baf7968a9a44875613539502c63d798ff3de2b04560d8fb531910008b1ff7f19bd2cb04f3be07e49b58
+DIST gdb-weekly-7.10.50.20150904.tar.xz 20080720 SHA256
ab609fc0652487a40bfb5d7b471a8d6250baea22b9d4e2c1c25ae89237efaea5 SHA512
dab781800037f8fffb3feb5d2d2b5f8d23cca6cf69910d56c8063f96530b98b546292c671150474dca3f0bb140c5cab98ad177c4917c1de47711d59366339b2b
WHIRLPOOL
adea4c7e71f6cbdea1c7e1061ea31016a3b295a57cc63f3a556a48da030f0e142c0eca55f23c8bac96c3eee3c49ee86acaf9e6f7a2457d027caa61cc3ddbb0af
+DIST gdb-weekly-7.10.50.20150905.tar.xz 20068388 SHA256
8d2e2d00d46bbc35f00401c2a54241cd150f8593d663e0c85d4fab2dd764e447 SHA512
6a5352bcbb661b4ddc9459ec597f327ea5e18b79bf53c24954b8381ac5708cbd895ffd0365524d24ed9f729f044254fa1670fab0fcbdb6576782056883f3e945
WHIRLPOOL
3b7b29e75cedbff0f3b59b613692ff7b73b2fbc510b1db23a5c5a03086f9d987c4e0bcb7123e7803d591eadcfa2d7beb9598ba4fcb4bb0a86124382023ab2c78
+DIST gdb-weekly-7.10.50.20150906.tar.xz 20070252 SHA256
64ae0067a3acfeb683f92c7e9a921e36780041cd22581bef444a4f3581c9851b SHA512
b59acb6d0b1b8ce49a42403f180a6cb3ca93adfd91fa6a3dd123e2a2af042c4f5c269af32a16f6fb557cd0d4511e09aa4e69a8b7eca354171ffbfc013fb4fb23
WHIRLPOOL
5dc2a5efced83812edb045a31016045a0bedd13d705ebd92f7c5f139c8d60e095da751cd4620502dd0f48070a8c3ed69dabd19c2304ce900e4c037cf76338177
DIST gdb-weekly-7.3.50.2029.tar.bz2 21632339 SHA256
d8dd66e50c014bfc5d1a83501615ea9e83c6bd7b504f4fdb434fffed362f9211
DIST gdb-weekly-7.3.50.20111206.tar.bz2 21710785 SHA256
1169ccb5cc300ccdb2f3d3088ce44a4abcdd5945cbb987686a442a43649100dc
DIST gdb-weekly-7.3.50.20111213.tar.bz2 21725949 SHA256
01ce3897be48245dd7af2abf130adbeab5cd3c0d8df264f1dc409ff3ab419327
diff --git a/sys-devel/gdb/gdb-7.10.50.20150715.ebuild
b/sys-devel/gdb/gdb-7.10.50.20150904.ebuild
similarity index 100%
rename from sys-devel/gdb/gdb-7.10.
[gentoo-commits] repo/gentoo:master commit in: media-gfx/svg2rlg/
commit: a9c8025831a9bc58066ff9a0465268f2df004eaa
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 06:10:59 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 06:10:59 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9c80258
media-gfx/svg2rlg: Stable for HPPA (bug #558600).
Package-Manager: portage-2.2.20.1
media-gfx/svg2rlg/svg2rlg-0.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
index 764e61c..e658f29 100644
--- a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
+++ b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
[gentoo-commits] repo/gentoo:master commit in: media-libs/FusionSound/
commit: fbb5d3ad76f294fdb81ab2444093e05d8c1ccd34
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 06:06:18 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 06:06:18 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbb5d3ad
media-libs/FusionSound: Stable for PPC64 (bug #558600).
Package-Manager: portage-2.2.20.1
media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild
b/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild
index 1d803eb..e483428 100644
--- a/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild
+++ b/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.directfb.org/downloads/Core/${P}.tar.gz";
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc x86"
+KEYWORDS="alpha amd64 hppa ppc ppc64 x86"
IUSE="alsa cddb ffmpeg mad oss timidity vorbis"
RDEPEND=">=dev-libs/DirectFB-${PV}
[gentoo-commits] repo/gentoo:master commit in: media-libs/rubberband/
commit: 3e1704e72d925a1fe71482af933841e25b2dc796
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 05:49:30 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 05:49:30 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e1704e7
media-libs/rubberband: Stable for HPPA PPC64 (bug #558600).
Package-Manager: portage-2.2.20.1
media-libs/rubberband/rubberband-1.8.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/rubberband/rubberband-1.8.1.ebuild
b/media-libs/rubberband/rubberband-1.8.1.ebuild
index 910bdcb..e8da3ef 100644
--- a/media-libs/rubberband/rubberband-1.8.1.ebuild
+++ b/media-libs/rubberband/rubberband-1.8.1.ebuild
@@ -11,7 +11,7 @@
SRC_URI="http://code.breakfastquay.com/attachments/download/34/${P}.tar.bz2";
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 hppa ~ppc ppc64 ~x86"
IUSE="static-libs"
RDEPEND="media-libs/vamp-plugin-sdk
[gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/
commit: b3bead0ef9073917f8d87e3db47ac842893c0cd5
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 06:06:52 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 06:06:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3bead0e
media-libs/libsdl2: Stable for HPPA PPC64 (bug #558600).
Package-Manager: portage-2.2.20.1
media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild
b/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild
index 42b779d..66786d2 100644
--- a/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz";
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm hppa ppc64 x86"
IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles
haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound
cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video
wayland X xinerama xscreensaver"
REQUIRED_USE="
[gentoo-commits] repo/gentoo:master commit in: dev-python/rst2pdf/
commit: 1e632168abceae88c5a340fa85f967fe60db86a2
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 06:11:26 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 06:11:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e632168
dev-python/rst2pdf: Stable for HPPA (bug #558600).
Package-Manager: portage-2.2.20.1
dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild
b/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild
index 9dc9e86..3ba057a 100644
--- a/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild
+++ b/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://rst2pdf.googlecode.com/files/${P}.tar.gz";
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 x86"
IUSE="svg"
DEPEND="dev-python/docutils[${PYTHON_USEDEP}]
[gentoo-commits] repo/gentoo:master commit in: dev-python/pdfrw/
commit: a2e4345c5ba8dc97c2dcf92c36a1d62a8337c1e8
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 06:09:44 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 06:09:44 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2e4345c
dev-python/pdfrw: Stable for HPPA (bug #558600).
Package-Manager: portage-2.2.20.1
dev-python/pdfrw/pdfrw-0.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/pdfrw/pdfrw-0.2.ebuild
b/dev-python/pdfrw/pdfrw-0.2.ebuild
index 0c3c56a..bb2f08c 100644
--- a/dev-python/pdfrw/pdfrw-0.2.ebuild
+++ b/dev-python/pdfrw/pdfrw-0.2.ebuild
@@ -13,5 +13,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ppc ~ppc64 ~x86"
IUSE=""
[gentoo-commits] repo/gentoo:master commit in: sys-auth/skey/
commit: 1e3bee7088902c35508adf1dace3acab61e7da6f
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 05:49:11 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 05:49:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e3bee70
sys-auth/skey: Stable for HPPA PPC64 (bug #558486).
Package-Manager: portage-2.2.20.1
sys-auth/skey/skey-1.1.5-r9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-auth/skey/skey-1.1.5-r9.ebuild
b/sys-auth/skey/skey-1.1.5-r9.ebuild
index dc3dba2..61db770 100644
--- a/sys-auth/skey/skey-1.1.5-r9.ebuild
+++ b/sys-auth/skey/skey-1.1.5-r9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
LICENSE="BSD MIT RSA BEER-WARE"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh
~sparc ~x86"
IUSE="static-libs"
DEPEND="dev-lang/perl
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: b973020930ab2fbd70504bc3e96d24c5ac2c0409
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 06:12:10 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 06:12:10 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9730209
media-video/mpv: Stable for HPPA PPC64 (bug #558600).
Package-Manager: portage-2.2.20.1
media-video/mpv/mpv-0.9.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.9.2-r1.ebuild
b/media-video/mpv/mpv-0.9.2-r1.ebuild
index ab9881a..0a8a354 100644
--- a/media-video/mpv/mpv-0.9.2-r1.ebuild
+++ b/media-video/mpv/mpv-0.9.2-r1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == ** ]]; then
inherit git-r3
else
SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
~amd64-linux"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ppc ppc64 ~sparc ~x86
~amd64-linux"
DOCS+=( RELEASE_NOTES )
fi
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libtar/
commit: 4489ce57a76faff20014bd75aed83f8488d7cf90
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 05:54:44 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 05:54:44 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4489ce57
dev-libs/libtar: Stable for PPC64 (bug #487686).
Package-Manager: portage-2.2.20.1
dev-libs/libtar/libtar-1.2.20-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/libtar/libtar-1.2.20-r3.ebuild
b/dev-libs/libtar/libtar-1.2.20-r3.ebuild
index af9b25b..6434292 100644
--- a/dev-libs/libtar/libtar-1.2.20-r3.ebuild
+++ b/dev-libs/libtar/libtar-1.2.20-r3.ebuild
@@ -13,7 +13,7 @@
SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz";
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
~ppc-macos"
+KEYWORDS="amd64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
~ppc-macos"
IUSE="static-libs zlib"
RDEPEND="zlib? ( sys-libs/zlib )
[gentoo-commits] repo/gentoo:master commit in: dev-python/ctypesgen/
commit: a721951e2fe711d69fe3b747d2e5d292c423e455
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 05:39:21 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 05:39:21 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a721951e
dev-python/ctypesgen: Stable for HPPA PPC64 (bug #559292).
Package-Manager: portage-2.2.20.1
dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
index 76e73e7..e855ca1 100644
--- a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
+++ b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86
~amd64-fbsd ~x86-fbsd"
IUSE=""
DEPEND=""
[gentoo-commits] repo/gentoo:master commit in: media-libs/libass/
commit: b32c4f4a345f331ba2124cc2f7df8cdb00635c53
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 05:35:45 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 05:35:45 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b32c4f4a
media-libs/libass: Stable for HPPA PPC64 (bug #558596).
Package-Manager: portage-2.2.20.1
media-libs/libass/libass-0.12.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libass/libass-0.12.3.ebuild
b/media-libs/libass/libass-0.12.3.ebuild
index baf9995..8a44f44 100644
--- a/media-libs/libass/libass-0.12.3.ebuild
+++ b/media-libs/libass/libass-0.12.3.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz";
LICENSE="ISC"
SLOT="0/5" # subslot = libass soname version
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~x86-solaris"
IUSE="+enca +fontconfig +harfbuzz static-libs"
RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
[gentoo-commits] repo/gentoo:master commit in: media-libs/libraw/
commit: 2c3376550d43d9bbcb2520ef6cb1fce9ad623905
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 05:33:02 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 05:33:02 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c337655
media-libs/libraw: Stable for HPPA PPC64 (bug #558186).
Package-Manager: portage-2.2.20.1
media-libs/libraw/libraw-0.16.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libraw/libraw-0.16.2.ebuild
b/media-libs/libraw/libraw-0.16.2.ebuild
index 2258bb2..57c78d6 100644
--- a/media-libs/libraw/libraw-0.16.2.ebuild
+++ b/media-libs/libraw/libraw-0.16.2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="http://www.libraw.org/data/${MY_P}.tar.gz
# http://www.libraw.org/data/LICENSE.LibRaw.pdf
LICENSE="LGPL-2.1 CDDL GPL-2 GPL-3"
SLOT="0/10" # subslot = libraw soname version
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86
~amd64-linux ~x86-linux"
IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
[gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap/
commit: 2178c19e16665223be9c198199260aadce0472de
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 05:26:46 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 05:26:46 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2178c19e
sys-libs/libcap: Stable for HPPA (bug #558862).
Package-Manager: portage-2.2.20.1
sys-libs/libcap/libcap-2.24-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/libcap/libcap-2.24-r2.ebuild
b/sys-libs/libcap/libcap-2.24-r2.ebuild
index 03becb6..e49211a 100644
--- a/sys-libs/libcap/libcap-2.24-r2.ebuild
+++ b/sys-libs/libcap/libcap-2.24-r2.ebuild
@@ -13,7 +13,7 @@
SRC_URI="mirror://kernel/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
# it's available under either of the licenses
LICENSE="|| ( GPL-2 BSD )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
IUSE="pam static-libs"
RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
[gentoo-commits] repo/gentoo:master commit in: sys-apps/man-db/
commit: 181537ecf7113791c151fa9ae9cbcd34edc1d907
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 05:24:01 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 05:24:01 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=181537ec
sys-apps/man-db: Stable for HPPA PPC64 (bug #559140).
Package-Manager: portage-2.2.20.1
sys-apps/man-db/man-db-2.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/man-db/man-db-2.7.2.ebuild
b/sys-apps/man-db/man-db-2.7.2.ebuild
index fbaeba1..9f42601 100644
--- a/sys-apps/man-db/man-db-2.7.2.ebuild
+++ b/sys-apps/man-db/man-db-2.7.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh
~sparc ~x86 ~arm-linux ~x86-linux"
IUSE="berkdb +gdbm nls selinux static-libs zlib"
CDEPEND=">=dev-libs/libpipeline-1.4.0
[gentoo-commits] repo/gentoo:master commit in: dev-python/colorama/
commit: c87becc8c48958d987ebb1c60c9105f176ba4445
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 05:06:09 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 05:06:09 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c87becc8
dev-python/colorama: Mark ~hppa ~ppc64 (bug #558546).
Package-Manager: portage-2.2.20.1
dev-python/colorama/colorama-0.3.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/colorama/colorama-0.3.3.ebuild
b/dev-python/colorama/colorama-0.3.3.ebuild
index f52552f..1213881 100644
--- a/dev-python/colorama/colorama-0.3.3.ebuild
+++ b/dev-python/colorama/colorama-0.3.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="examples"
python_install_all() {
[gentoo-commits] repo/gentoo:master commit in: dev-python/progress/
commit: c15e2043cbe089cb8a21a9d611608999a5196c10
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 05:15:27 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 05:15:27 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c15e2043
dev-python/progress: Mark ~hppa ~ppc64 (bug #558546).
Package-Manager: portage-2.2.20.1
dev-python/progress/progress-1.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/progress/progress-1.2.ebuild
b/dev-python/progress/progress-1.2.ebuild
index 7b4ef23..79c0801 100644
--- a/dev-python/progress/progress-1.2.ebuild
+++ b/dev-python/progress/progress-1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="ISC"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=""
[gentoo-commits] repo/gentoo:master commit in: dev-python/lockfile/
commit: 8edbc73606ec904a0f83614a951dbb828f46d8cd
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 05:09:45 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 05:09:45 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8edbc736
dev-python/lockfile: Mark ~hppa ~ppc64 (bug #558546).
Package-Manager: portage-2.2.20.1
dev-python/lockfile/lockfile-0.10.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/lockfile/lockfile-0.10.2.ebuild
b/dev-python/lockfile/lockfile-0.10.2.ebuild
index 99b7908..02e6bfe 100644
--- a/dev-python/lockfile/lockfile-0.10.2.ebuild
+++ b/dev-python/lockfile/lockfile-0.10.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
IUSE="doc test"
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-python/packaging/
commit: 871f60b5399b5358f7df5f9ea525f213b1736009
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 05:13:16 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 05:13:16 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=871f60b5
dev-python/packaging: Mark ~hppa ~ppc64 (bug #558546).
Package-Manager: portage-2.2.20.1
dev-python/packaging/packaging-15.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/packaging/packaging-15.3-r1.ebuild
b/dev-python/packaging/packaging-15.3-r1.ebuild
index aaac708..9fd3131 100644
--- a/dev-python/packaging/packaging-15.3-r1.ebuild
+++ b/dev-python/packaging/packaging-15.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND=""
[gentoo-commits] repo/gentoo:master commit in: dev-python/CacheControl/
commit: 236e612d0cbc185584dc8493b09369a919c8f7c0
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 05:10:59 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 05:10:59 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=236e612d
dev-python/colorama: Mark ~hppa ~ppc64 (bug #558546).
Package-Manager: portage-2.2.20.1
dev-python/CacheControl/CacheControl-0.11.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/CacheControl/CacheControl-0.11.5.ebuild
b/dev-python/CacheControl/CacheControl-0.11.5.ebuild
index 60020bb..8b990c9 100644
--- a/dev-python/CacheControl/CacheControl-0.11.5.ebuild
+++ b/dev-python/CacheControl/CacheControl-0.11.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
IUSE="redis test"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-python/pip/
commit: 31db277e6e5f884753aff72d21547c6941632541
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 05:19:36 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 05:19:36 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31db277e
dev-python/pip: Mark ~hppa ~ppc64 (bug #558546).
Package-Manager: portage-2.2.20.1
dev-python/pip/pip-7.1.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/pip/pip-7.1.2.ebuild b/dev-python/pip/pip-7.1.2.ebuild
index 1a0c9d3..4772101 100644
--- a/dev-python/pip/pip-7.1.2.ebuild
+++ b/dev-python/pip/pip-7.1.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pip.pypa.io/
https://pypi.python.org/pypi/pip/ https://github.
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
SLOT="0"
# Check pip/_vendor/vendor.txt for this
[gentoo-commits] repo/gentoo:master commit in: dev-python/retrying/
commit: 029409d4c04032c15e6668df7dc246e2eab4674b
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 05:16:53 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 05:16:53 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=029409d4
dev-python/retrying: Mark ~hppa ~ppc64 (bug #558546).
Package-Manager: portage-2.2.20.1
dev-python/retrying/retrying-1.3.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/retrying/retrying-1.3.3.ebuild
b/dev-python/retrying/retrying-1.3.3.ebuild
index 7830c2a..424b863 100644
--- a/dev-python/retrying/retrying-1.3.3.ebuild
+++ b/dev-python/retrying/retrying-1.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
IUSE=""
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-python/distlib/
commit: 418b31dcb38ca5172ba0c48f619f389e5edd759b
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Sep 6 05:04:10 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Sep 6 05:04:10 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=418b31dc
dev-python/distlib: Mark ~hppa ~ppc64 (bug #558546).
Package-Manager: portage-2.2.20.1
dev-python/distlib/distlib-0.2.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/distlib/distlib-0.2.1.ebuild
b/dev-python/distlib/distlib-0.2.1.ebuild
index 7b1a1e4..e82dfdd 100644
--- a/dev-python/distlib/distlib-0.2.1.ebuild
+++ b/dev-python/distlib/distlib-0.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
python_test() {
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/corosync/
commit: d39516627ef48f9f192a03ebaf8ad7d16adb99fe Author: Doug Goldstein gentoo org> AuthorDate: Sun Sep 6 04:18:21 2015 + Commit: Doug Goldstein gentoo org> CommitDate: Sun Sep 6 04:18:44 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3951662 sys-cluster/corosync: remove myself as maintainer I have not been involved in this package for a very long time. Package-Manager: portage-2.2.20.1 Signed-off-by: Doug Goldstein gentoo.org> sys-cluster/corosync/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/sys-cluster/corosync/metadata.xml b/sys-cluster/corosync/metadata.xml index 08d3ba8..28abf00 100644 --- a/sys-cluster/corosync/metadata.xml +++ b/sys-cluster/corosync/metadata.xml @@ -3,10 +3,6 @@ cluster - car...@gentoo.org - Doug Goldstein - - robb...@gentoo.org Robin Johnson
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libgcrypt/
commit: d4a2f30e1bce34f2a4d52fbc190454cf0adcd5b9
Author: Alon Bar-Lev gentoo org>
AuthorDate: Sun Sep 6 04:16:19 2015 +
Commit: Alon Bar-Lev gentoo org>
CommitDate: Sun Sep 6 04:17:22 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4a2f30e
dev-libs/libgcrypt: re-enable via padlock
Bug: 559724
Package-Manager: portage-2.2.20.1
dev-libs/libgcrypt/libgcrypt-1.6.3-r5.ebuild | 74
1 file changed, 74 insertions(+)
diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.3-r5.ebuild
b/dev-libs/libgcrypt/libgcrypt-1.6.3-r5.ebuild
new file mode 100644
index 000..0d65974
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.6.3-r5.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=1
+WANT_AUTOMAKE=1.14
+
+inherit autotools-multilib flag-o-matic
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="http://www.gnupg.org/";
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0/20" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd
~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs +threads"
+
+RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20131008-r19
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
+ )"
+DEPEND="${RDEPEND}
+ doc? ( virtual/texi2dvi )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.1-uscore.patch
+ "${FILESDIR}"/${PN}-multilib-syspath.patch
+ "${FILESDIR}"/${P}-freebsd-mpi.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/libgcrypt-config
+)
+
+multilib_src_configure() {
+ if [[ ${CHOST} == *86*-solaris* ]] ; then
+ # ASM code uses GNU ELF syntax, divide in particular, we need to
+ # allow this via ASFLAGS, since we don't have a flag-o-matic
+ # function for that, we'll have to abuse cflags for this
+ append-cflags -Wa,--divide
+ fi
+ local myeconfargs=(
+ --disable-dependency-tracking
+ --enable-noexecstack
+ --disable-O-flag-munging
+ $(use_enable static-libs static)
+ $(use_enable threads)
+
+ # disabled due to various applications requiring privileges
+ # after libgcrypt drops them (bug #468616)
+ --without-capabilities
+
+ # http://trac.videolan.org/vlc/ticket/620
+ # causes bus-errors on sparc64-solaris
+ $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+ $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+ )
+ autotools-utils_src_configure
+}
+
+multilib_src_compile() {
+ emake
+ multilib_is_native_abi && use doc && emake -C doc gcrypt.pdf
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+ multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
+}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libgcrypt/
commit: 45f15635f2c7caa15ecadd69bd4418b7200fab54
Author: Alon Bar-Lev gentoo org>
AuthorDate: Sun Sep 6 04:14:57 2015 +
Commit: Alon Bar-Lev gentoo org>
CommitDate: Sun Sep 6 04:17:19 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45f15635
dev-libs/libgcrypt: cleanup
Package-Manager: portage-2.2.20.1
dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild| 48 --
dev-libs/libgcrypt/libgcrypt-1.6.3-r3.ebuild | 74
2 files changed, 122 deletions(-)
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild
b/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild
deleted file mode 100644
index ba7b573..000
--- a/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/";
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0/11" # subslot = soname major version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc
x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.8"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.5.0-uscore.patch
- "${FILESDIR}"/${PN}-multilib-syspath.patch
- "${FILESDIR}"/${P}-clang-arm.patch
-)
-
-src_configure() {
- local myeconfargs=(
- --disable-padlock-support # bug 201917
- --disable-dependency-tracking
- --enable-noexecstack
- --disable-O-flag-munging
- $(use_enable static-libs static)
-
- # disabled due to various applications requiring privileges
- # after libgcrypt drops them (bug #468616)
- --without-capabilities
-
- # http://trac.videolan.org/vlc/ticket/620
- # causes bus-errors on sparc64-solaris
- $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
- $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
- )
- autotools-utils_src_configure
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.3-r3.ebuild
b/dev-libs/libgcrypt/libgcrypt-1.6.3-r3.ebuild
deleted file mode 100644
index 9efac8b..000
--- a/dev-libs/libgcrypt/libgcrypt-1.6.3-r3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-WANT_AUTOMAKE=1.14
-
-inherit autotools-multilib flag-o-matic
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/";
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd
~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20131008-r19
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
- )"
-DEPEND="${RDEPEND}
- doc? ( virtual/texi2dvi )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.6.1-uscore.patch
- "${FILESDIR}"/${PN}-multilib-syspath.patch
- "${FILESDIR}"/${P}-freebsd-mpi.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/libgcrypt-config
-)
-
-multilib_src_configure() {
- if [[ ${CHOST} == *86*-solaris* ]] ; then
- # ASM code uses GNU ELF syntax, divide in particular, we need to
- # allow this via ASFLAGS, since we don't have a flag-o-matic
- # function for that, we'll have to abuse cflags for this
- append-cflags -Wa,--divide
- fi
- local myeconfargs=(
- --disable-padlock-support # bug 201917
- --disable-dependency-tracking
- --enable-noexecstack
- --disable-O-flag-munging
- $(use_enable static-libs static)
-
- # disabled due to various applications requiring privileges
- # after libgcrypt drops them (bug #468616)
- --without-capabilities
-
- # http://trac.videolan.org/vlc/ticket/620
- # causes bus-errors on s
[gentoo-commits] repo/gentoo:master commit in: dev-util/android-ndk/
commit: 01fea9f3b59ffa9997ae66c35b6b7242e4b15552 Author: Doug Goldstein gentoo org> AuthorDate: Sun Sep 6 04:12:31 2015 + Commit: Doug Goldstein gentoo org> CommitDate: Sun Sep 6 04:12:31 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01fea9f3 dev-util/android-ndk: remove myself as maintainer I have not been involved in this package in a really long time. Package-Manager: portage-2.2.20.1 Signed-off-by: Doug Goldstein gentoo.org> dev-util/android-ndk/metadata.xml | 7 --- 1 file changed, 7 deletions(-) diff --git a/dev-util/android-ndk/metadata.xml b/dev-util/android-ndk/metadata.xml index 905572c..cdb306c 100644 --- a/dev-util/android-ndk/metadata.xml +++ b/dev-util/android-ndk/metadata.xml @@ -5,13 +5,6 @@ perfin...@gentoo.org Jason Zaman - - car...@gentoo.org - Doug Goldstein - Feel free to update/modify this package, just don't break - my limited use case that I use it for. - - Install legacy toolchains Support for 32-bit targets
[gentoo-commits] repo/gentoo:master commit in: x11-libs/libvdpau/
commit: eb0c17813af59f37622e63f28724a22aed02b6c3 Author: Doug Goldstein gentoo org> AuthorDate: Sun Sep 6 04:09:27 2015 + Commit: Doug Goldstein gentoo org> CommitDate: Sun Sep 6 04:09:27 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb0c1781 x11-libs/libvdpau: change maintainer Jeroen has been maintaining this package for a while now. Package-Manager: portage-2.2.20.1 Signed-off-by: Doug Goldstein gentoo.org> x11-libs/libvdpau/metadata.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-libs/libvdpau/metadata.xml b/x11-libs/libvdpau/metadata.xml index a445a73..52363bf 100644 --- a/x11-libs/libvdpau/metadata.xml +++ b/x11-libs/libvdpau/metadata.xml @@ -2,7 +2,7 @@ http://www.gentoo.org/dtd/metadata.dtd";> - car...@gentoo.org - Doug Goldstein + j...@gentoo.org + Jeroen Roovers
[gentoo-commits] repo/gentoo:master commit in: dev-python/pyDeComp/
commit: b7af0b4e58df79600d38128ee2f41b1e65bb1eb6
Author: Zero_Chaos gentoo org>
AuthorDate: Sun Sep 6 03:27:35 2015 +
Commit: Richard Farina gentoo org>
CommitDate: Sun Sep 6 03:28:01 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7af0b4e
dev-python/pyDeComp: incorrect dep fixed upstream, removing
Package-Manager: portage-2.2.20.1
dev-python/pyDeComp/pyDeComp-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/pyDeComp/pyDeComp-.ebuild
b/dev-python/pyDeComp/pyDeComp-.ebuild
index dddbbef..bce3935 100644
--- a/dev-python/pyDeComp/pyDeComp-.ebuild
+++ b/dev-python/pyDeComp/pyDeComp-.ebuild
@@ -22,7 +22,7 @@ IUSE=""
KEYWORDS=""
-DEPEND="dev-python/pyGPG[${PYTHON_USEDEP}]"
+DEPEND=""
RDEPEND="${DEPEND}
"
[gentoo-commits] repo/gentoo:master commit in: media-tv/mythtv/files/, media-tv/mythtv/
commit: a9570ca04e0816c050178ac466fae72680f1098d Author: Doug Goldstein gentoo org> AuthorDate: Sat Sep 5 02:44:55 2015 + Commit: Doug Goldstein gentoo org> CommitDate: Sun Sep 6 03:24:42 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9570ca0 Retire a slew of old ebuilds Package-Manager: portage-2.2.20.1 Signed-off-by: Doug Goldstein gentoo.org> media-tv/mythtv/Manifest | 6 - media-tv/mythtv/files/mythtv.logrotate.d-r3| 20 -- media-tv/mythtv/mythtv-0.27.1_p20140817.ebuild | 353 media-tv/mythtv/mythtv-0.27.3_p20141009.ebuild | 355 - media-tv/mythtv/mythtv-0.27.4_p20150124.ebuild | 355 - 5 files changed, 1089 deletions(-) diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest index 931c9d3..27e05e5 100644 --- a/media-tv/mythtv/Manifest +++ b/media-tv/mythtv/Manifest @@ -1,12 +1,6 @@ DIST mythtv-0.26.0-9fd7c6102b2cd1a3760337663803b110446c6ea7.tar.xz 179540 SHA256 ae63398f1ea8884950eb4653c42f6bf71e504738112f5ac8f4d13c1988098d95 SHA512 599dab7a51e9e2f5e240e6d80aadf3bc1f89b8f83e0a5c2e6c82695926ef3f1b7694a73d95b0a296544f9642f1e070a809d86563a415498345a3c1049f269aa4 WHIRLPOOL 74c8aa8f2846eb67f88bddacf5d7c5aa0445e0fe2fbd0f6f2f284e51e1f2c024ca8b7ef22639b7e201b8304421859d7bab802a7d2fe9343ec40d36453f0bfa8e DIST mythtv-0.26.0.tar.bz2 40887666 SHA256 2f158962ca3009db563dabc32827c47788a688bd67a25abd76f4baa9c3cfe306 SHA512 8c8766542b6a1a877d400fd99343e8149d9c6cc4ab1e425db358bdbdc10b6cb7422bb4bdcf984ce64b2cf02b0ad0725606b266558afcadff9ec9c9bb95bb49c0 WHIRLPOOL c737a1dbdfafe65ae5ee3bde8d0b3a9ad50ebfccec784d6907c78d03f9732637cfbf8b82ecfca80af0b049c65d70c608a81ac3bf27a8070ba3f32d657f5137bb DIST mythtv-0.27-583395f5a376637efcd408a102fa64d0f188c12f.tar.xz 298048 SHA256 2b18428980fe8951694eb9c8594aa2559df491b029987e1a4b983128fdea4f51 SHA512 1d8c2a61bd91d7116ba3b43251d517bda3c8db3c235e73dde66116dc02d14806db9c80bacf6e19eaf816c4765d8e51fe9b53900efa3112134c564c08cc0ca012 WHIRLPOOL 3d50908d085f844cd210c568b50c55c47e4fe8dd8423ffe18303a7c799a45e24dfceaa5221e6f59596394484162d9992f46d5f66b0ad3c57fbb5a240def68dec -DIST mythtv-0.27.1-082d5c1fbccd48dd862f14007c0445dee8502f3d.tar.xz 161652 SHA256 271c12af8bdf6188f1a11f07ac7c3ad45374cc60211e4a005975af66d5421739 SHA512 ed7ecb9fc5d3abe592e195309d88979a41132ebd99e92e59e2471f17c3f5da089cc5846d817a5228657cef37fade5724f9ac8f0e335ec45855158996a2317016 WHIRLPOOL 86a99cc0a74c75789a98e18fd57b5627b59c650da02602d947a8ccd854ed2bf210e76bf858bc16a2a6fd93763149257ae0e3ea95f44aecf0916b5f1a2b81460d -DIST mythtv-0.27.1.tar.gz 85612356 SHA256 a7039ba46347f1d6a0ed392a53117639c8cba6bc458a6ad30082046d8ad85de7 SHA512 f2c79765948c0a00c7a92f24d2315b5af3044333f67ed8925a59c5bebbdebf98792ef05e2bc8864bfbe77be8cc8ff530e3f4e8761320cfe5ed21369341d8915e WHIRLPOOL 938e0e77070473a523323fe64e40eb416809b40b16943d66a5914d65caa7530dd4b5ba5209919050a7b4968c9e5ca5155ee970f165b39a5c77392debb20bf0ad -DIST mythtv-0.27.3-e1d575da2fdde7ae7119972c688b0ddd15e676c4.tar.xz 77584 SHA256 43e54366582c71c0835771987be6dd33543326ba2aba4efb8a57f83b965647cc SHA512 0360b990d0ec5eade879879c516a9169c50aafaff8b08fff60d4d65e93b3c2dadac36869f958e070b644eea72592344a7f678c78a25ae7950372e17b725a1cd1 WHIRLPOOL 5eb3b1cbea2defad1143ad3934ad5d2c2585595013bc8619f8e436eebcdfa35efe377bf40b50281140901314b5c1daf2c8654b9a0f7ab4be59fdc49c5d278c43 -DIST mythtv-0.27.3.tar.gz 85624583 SHA256 8eaaf8c6e42ca6eb81f180467de90d597dbeabb1bb14b7085da353d2980db8f4 SHA512 c825c6d5a4fab6fe3179dbb78730575732615ab41cf2d21f82c6e6317ab62c9a6570cd9d204c39c04d176138c90dfdc95892cd8336bb8487051f1f3842cc0866 WHIRLPOOL b9382dbe1019bde96135ff404039d4db5ef03d52d5f2d75cfd3005e1e5eea702529df3a45497c081de89d9ecfd5a6a143b6dadc228e581453b9aa75c63bcc042 -DIST mythtv-0.27.4-3b4390396bf09dfe3741508ecf7fc71a004abd01.tar.xz 12752 SHA256 b3331d8dbe36d34c88ab42aec2d2d84e2bb51ba11b714f23c5faa91e32ce06de SHA512 8f80378cfc5be8058baa74f7d25e8ec0a0405201e6f8b77b6cb96ba91dbd9b9251947ba7b6e48efad5270624769195891e2c48e0c8d0a16d6f8893801103a26b WHIRLPOOL 140d8dfb39942ef587b551099942b6b284bd49e070225aaee71f3fb4feebfc0ce293461b87fe9f6477def2745a6d71226fb103cf090a25fc33ecf85bd62212b6 -DIST mythtv-0.27.4.tar.gz 85644227 SHA256 1f734ffc776e4938aa913e49ce94279f2c2d520c62af278f1d04fe399723365b SHA512 6f858f32467756e96db6f79ccb2c42edc0bf22d217cb7b9dc9188ada994bbb9aafe9f72dd71aca10cd26bad1bd5d344af64487ec5fc925872aba81cf7aa257c8 WHIRLPOOL 65cd1869b7cee00197179b13a138d466dc443ecaf23c665754e0451e7ab51940e7235cb74d23ed7296be2c716f443c9c42df2fdd918a0480a04c63381ebce2c4 DIST mythtv-0.27.5-9498257571e8158926b60a0eefc74568c4436823.tar.xz 11992 SHA256 aef3b944a9f4b49daa3f5489b58a080db35eb7b85c76819d9d00ccf1adfadfdf SHA512 bddc80f6d7e7ad583459a2192660e6101d53d8821c0f875634f90588bc6fbff86c80fa75f6e8cb859fd5164a81f0ad3427939d57da2b112741b1ea9ce646659d WHIRLPOOL 249d4f5332d943669610b96363b6d2b19d63973ba191bd62900e7d31362b4
[gentoo-commits] repo/gentoo:master commit in: dev-python/pyDeComp/
commit: b288366ef17fff33bcef384fbe8d7c62f7babce0
Author: Zero_Chaos gentoo org>
AuthorDate: Sun Sep 6 02:41:08 2015 +
Commit: Richard Farina gentoo org>
CommitDate: Sun Sep 6 02:41:08 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b288366e
dev-python/pyDeComp: fix dep to include [${PYTHON_USEDEP}]
Package-Manager: portage-2.2.20.1
dev-python/pyDeComp/pyDeComp-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/pyDeComp/pyDeComp-.ebuild
b/dev-python/pyDeComp/pyDeComp-.ebuild
index 43654f7..dddbbef 100644
--- a/dev-python/pyDeComp/pyDeComp-.ebuild
+++ b/dev-python/pyDeComp/pyDeComp-.ebuild
@@ -22,7 +22,7 @@ IUSE=""
KEYWORDS=""
-DEPEND="dev-python/pyGPG"
+DEPEND="dev-python/pyGPG[${PYTHON_USEDEP}]"
RDEPEND="${DEPEND}
"
[gentoo-commits] repo/gentoo:master commit in: dev-python/pyDeComp/
commit: 92563ed6f052d9aa4073983c57e1ed564d47bc47
Author: Zero_Chaos gentoo org>
AuthorDate: Sun Sep 6 02:39:27 2015 +
Commit: Richard Farina gentoo org>
CommitDate: Sun Sep 6 02:39:27 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92563ed6
dev-python/pyDeComp: add pyGPG to deps
>>> Compiling source in
>>> /var/tmp/portage/dev-python/pyDeComp-/work/pyDeComp- ...
* python3_4: running distutils-r1_run_phase distutils-r1_python_compile
/usr/bin/python3.4 setup.py build
Traceback (most recent call last):
File "setup.py", line 6, in
from pyGPG import __version__, __license__
ImportError: No module named 'pyGPG'
Package-Manager: portage-2.2.20.1
dev-python/pyDeComp/pyDeComp-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/pyDeComp/pyDeComp-.ebuild
b/dev-python/pyDeComp/pyDeComp-.ebuild
index bce3935..43654f7 100644
--- a/dev-python/pyDeComp/pyDeComp-.ebuild
+++ b/dev-python/pyDeComp/pyDeComp-.ebuild
@@ -22,7 +22,7 @@ IUSE=""
KEYWORDS=""
-DEPEND=""
+DEPEND="dev-python/pyGPG"
RDEPEND="${DEPEND}
"
[gentoo-commits] repo/gentoo:master commit in: sys-boot/gnu-efi/
commit: b785bd6de7e4fedada8f301d6a29d8d3cf2c2fad
Author: Mike Gilbert gentoo org>
AuthorDate: Sun Sep 6 02:28:29 2015 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Sep 6 02:28:40 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b785bd6d
sys-boot/gnu-efi: Support building ia32 EFI libs on amd64
Package-Manager: portage-2.2.20
sys-boot/gnu-efi/gnu-efi-3.0.3.ebuild | 55 +++
1 file changed, 37 insertions(+), 18 deletions(-)
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.3.ebuild
b/sys-boot/gnu-efi/gnu-efi-3.0.3.ebuild
index f79b3b2..9c6a09f 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0.3.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="-* ~amd64 ~ia64 ~x86"
-IUSE=""
+IUSE="abi_x86_32 abi_x86_64"
DEPEND="sys-apps/pciutils"
RDEPEND=""
@@ -21,29 +21,48 @@ RDEPEND=""
# These objects get run early boot (i.e. not inside of Linux),
# so doing these QA checks on them doesn't make sense.
QA_EXECSTACK="usr/*/lib*efi.a:* usr/*/crt*.o"
+RESTRICT="strip"
-_emake() {
- emake \
- prefix=${CHOST}- \
- ARCH=${iarch} \
- PREFIX="${EPREFIX}/usr" \
- LIBDIR='$(PREFIX)/'"$(get_libdir)" \
- "$@"
+efimake() {
+ local arch=
+ case ${CHOST} in
+ arm*) arch=arm ;;
+ aarch64*) arch=aarch64 ;;
+ ia64*) arch=ia64 ;;
+ i?86*) arch=ia32 ;;
+ x86_64*) arch=x86_64 ;;
+ *) die "Unknown CHOST" ;;
+ esac
+
+ local args=(
+ ARCH="${arch}"
+ HOSTCC="${BUILD_CC}"
+ CC="${CC}"
+ AS="${AS}"
+ LD="${LD}"
+ AR="${AR}"
+ PREFIX="${EPREFIX}/usr"
+ LIBDIR='$(PREFIX)'/$(get_libdir)
+ )
+ emake -j1 "${args[@]}" "$@"
}
src_compile() {
- case ${ARCH} in
- ia64) iarch=ia64 ;;
- x86) iarch=ia32 ;;
- amd64) iarch=x86_64 ;;
- *) die "unknown architecture: $ARCH" ;;
- esac
- # The lib subdir uses unsafe archive targets, and
- # the apps subdir needs gnuefi subdir
- _emake -j1
+ tc-export BUILD_CC AR AS CC LD
+ if [[ ${CHOST} == x86_64* ]]; then
+ use abi_x86_32 && CHOST=i686 ABI=x86 efimake
+ use abi_x86_64 && efimake
+ else
+ efimake
+ fi
}
src_install() {
- _emake install PREFIX=/usr INSTALLROOT="${D}"
+ if [[ ${CHOST} == x86_64* ]]; then
+ use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}"
install
+ use abi_x86_64 && efimake INSTALLROOT="${D}" install
+ else
+ efimake INSTALLROOT="${D}" install
+ fi
dodoc README* ChangeLog
}
[gentoo-commits] repo/gentoo:master commit in: media-sound/teamspeak-client-bin/
commit: 315ad3e957a04ba46fb773d3e04f12f1b3032fa1 Author: Ian Delaney gentoo org> AuthorDate: Sun Sep 6 02:12:41 2015 + Commit: Ian Delaney gentoo org> CommitDate: Sun Sep 6 02:12:41 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=315ad3e9 teamspeak-client-bin: added new maintainer, offer made via bug #558348 Package-Manager: portage-2.2.20 media-sound/teamspeak-client-bin/metadata.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/media-sound/teamspeak-client-bin/metadata.xml b/media-sound/teamspeak-client-bin/metadata.xml index 2302bba..4a48abc 100644 --- a/media-sound/teamspeak-client-bin/metadata.xml +++ b/media-sound/teamspeak-client-bin/metadata.xml @@ -7,5 +7,10 @@ Karol Herbst Proxy-Maintainer. Assign bugs to him + +dry...@gmail.com +Sami Loone +Proxy-Maintainer. Assign bugs to him + TeamSpeak Client (Voice Communication Software)
[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/
commit: 6a64d9f608b0b6f5f0dcbc0eea8bc20bf6ddd6dc
Author: Mike Gilbert gentoo org>
AuthorDate: Sun Sep 6 01:31:38 2015 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Sep 6 01:31:38 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a64d9f6
sys-apps/systemd: Export toolchain vars
This prevents any i686 cross toolchain from being used for a multilib build.
Bug: https://bugs.gentoo.org/559726
Package-Manager: portage-2.2.20
sys-apps/systemd/systemd-225.ebuild | 3 +++
sys-apps/systemd/systemd-.ebuild | 3 +++
2 files changed, 6 insertions(+)
diff --git a/sys-apps/systemd/systemd-225.ebuild
b/sys-apps/systemd/systemd-225.ebuild
index 1a325de..8e44315 100644
--- a/sys-apps/systemd/systemd-225.ebuild
+++ b/sys-apps/systemd/systemd-225.ebuild
@@ -164,6 +164,9 @@ src_configure() {
# Fix systems broken by bug #509454.
[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
+ # Prevent conflicts with i686 cross toolchain, bug 559726
+ tc-export AR CC NM OBJCOPY RANLIB
+
multilib-minimal_src_configure
}
diff --git a/sys-apps/systemd/systemd-.ebuild
b/sys-apps/systemd/systemd-.ebuild
index 1a325de..8e44315 100644
--- a/sys-apps/systemd/systemd-.ebuild
+++ b/sys-apps/systemd/systemd-.ebuild
@@ -164,6 +164,9 @@ src_configure() {
# Fix systems broken by bug #509454.
[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
+ # Prevent conflicts with i686 cross toolchain, bug 559726
+ tc-export AR CC NM OBJCOPY RANLIB
+
multilib-minimal_src_configure
}
[gentoo-commits] repo/gentoo:master commit in: app-crypt/zuluCrypt/
commit: 4eef56b3fe1c72a6f75cd8ce83902f0f94ddb98a
Author: Julian Ospald gentoo org>
AuthorDate: Wed Sep 2 10:20:09 2015 +
Commit: Julian Ospald gentoo org>
CommitDate: Sat Sep 5 23:36:06 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eef56b3
app-crypt/zuluCrypt: version bump to 4.7.7
app-crypt/zuluCrypt/Manifest | 1 +
app-crypt/zuluCrypt/zuluCrypt-4.7.7.ebuild | 52 ++
2 files changed, 53 insertions(+)
diff --git a/app-crypt/zuluCrypt/Manifest b/app-crypt/zuluCrypt/Manifest
index 40f1b8e..41b8ffb 100644
--- a/app-crypt/zuluCrypt/Manifest
+++ b/app-crypt/zuluCrypt/Manifest
@@ -1 +1,2 @@
DIST zuluCrypt-4.7.6.tar.bz2 582120 SHA256
b39533de700608a0d1981eb6818f8e103c948c342ba3de36f2f4a0520664294b SHA512
bcf3dd31997ba7db47df4beae2c1e54d031b9c468517475fb7ea6a73e3cf787aaf87a4fdc3cfbb3e54cc0ed8ea218b92014315e940ecb722e0b748248367a2b7
WHIRLPOOL
e4d1ca05ebce4c33a8b849e96917b842a1a0330a57700e94fc3f1d1af6a13bcfca9d2039e58f6b4b9353c14296d9feaf898b3de47c3ccd6cc11517be5f07088f
+DIST zuluCrypt-4.7.7.tar.bz2 550309 SHA256
d832668c646bb93a63e908bd1896def830db304138a17f34eae09dd41b3197d4 SHA512
bca390caacc7ff39b03dce370c2f85da2f52d9de3604713ec2dec6f53b75573163a5db60ca30746f4056def8617a9a93f80026c1833396356c849b10948468f1
WHIRLPOOL
6d54015b8458cd6b4460afc33f14dabe3672bc3aea849230090b0c2a64f37da9777f1e0745e7000be1e05874962f4cc97e284fa8877fa0a1d09b93b71bb5e215
diff --git a/app-crypt/zuluCrypt/zuluCrypt-4.7.7.ebuild
b/app-crypt/zuluCrypt/zuluCrypt-4.7.7.ebuild
new file mode 100644
index 000..c0bf1f0
--- /dev/null
+++ b/app-crypt/zuluCrypt/zuluCrypt-4.7.7.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib cmake-utils
+
+DESCRIPTION="Front end to cryptsetup"
+HOMEPAGE="http://mhogomchungu.github.io/zuluCrypt/";
+SRC_URI="https://github.com/mhogomchungu/zuluCrypt/releases/download/${PV}/zuluCrypt-${PV}.tar.bz2";
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome +gui kde udev"
+
+CDEPEND="
+ dev-libs/libgcrypt:0
+ sys-apps/util-linux
+ sys-fs/cryptsetup
+ gnome? ( app-crypt/libsecret )
+ gui? (
+ dev-libs/libpwquality
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ kde? (
+ kde-base/kdelibs:4
+ kde-apps/kwalletd:4
+ )
+ )
+"
+RDEPEND="${CDEPEND}
+ udev? ( virtual/udev )"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use udev UDEVSUPPORT)
+ -DLIB_SUFFIX="$(get_libdir)"
+ $(cmake-utils_use !gnome NOGNOME)
+ $(cmake-utils_use !gui NOGUI)
+ # WITH_PWQUALITY has no effect without gui
+ $(cmake-utils_use gui WITH_PWQUALITY)
+ # KDE has no effect without gui
+ $(usex gui "$(cmake-utils_use !kde NOKDE)" "-DNOKDE=TRUE")
+ )
+
+ cmake-utils_src_configure
+}
[gentoo-commits] proj/kde:master commit in: profiles/package.mask/
commit: 13104e890a97543e9fb61e60914753d6522c7a07 Author: Manuel Rüger rueg eu> AuthorDate: Sat Sep 5 23:35:57 2015 + Commit: Manuel Rüger gentoo org> CommitDate: Sat Sep 5 23:35:57 2015 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=13104e89 profiles: Update mask message. profiles/package.mask/kde-apps-15.08.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/package.mask/kde-apps-15.08.0 b/profiles/package.mask/kde-apps-15.08.0 index a6009b2..44a69e4 100644 --- a/profiles/package.mask/kde-apps-15.08.0 +++ b/profiles/package.mask/kde-apps-15.08.0 @@ -1,5 +1,5 @@ # Manuel Rüger (15 Aug 2015) -# Not released yet +# Unmasking not decided yet ~kde-apps/akonadi-calendar-15.08.0 ~kde-apps/akonadi-search-15.08.0 ~kde-apps/akonadi-15.08.0
[gentoo-commits] proj/layman:master commit in: /
commit: 64f2c5530097774d063fac98ca7bdbfe1c5abebc Author: Devan Franchini gentoo org> AuthorDate: Sat Sep 5 23:30:23 2015 + Commit: Devan Franchini gentoo org> CommitDate: Sat Sep 5 23:30:23 2015 + URL:https://gitweb.gentoo.org/proj/layman.git/commit/?id=64f2c553 CHANGES: Updates to reflect new changes CHANGES | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index af7da09..f35ee3b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,8 +1,18 @@ CHANGES --- -Version 2.3.1 - Release 2015-03-28 +Version 2.4.0 - Release 2015-??-?? == + - adds support for different overlay database types + - adds json database support + - adds sqlite database support + - adds database migration tool in layman-updater + - adds AddDeleteDB tests in test suite + - adds file locker utility class + - corrects importing of laymansync classes + - corrects type in enable/disable_repos() + - adds multiple owner support + - deprecates get_all_info() function - adds repos.conf dir creation if it doesn't exist - fixes bug #540012 - moves Layman class initialization into a layman sub-file
[gentoo-commits] proj/layman:master commit in: doc/, etc/
commit: 6177908118a2f7fd1765d5561177c8b1a2dc7061 Author: Devan Franchini gentoo org> AuthorDate: Sat Sep 5 23:29:50 2015 + Commit: Devan Franchini gentoo org> CommitDate: Sat Sep 5 23:29:50 2015 + URL:https://gitweb.gentoo.org/proj/layman.git/commit/?id=61779081 Adds documentation for multiple database type support doc/layman.8.txt | 8 etc/layman.cfg | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/layman.8.txt b/doc/layman.8.txt index cb391f1..4152566 100644 --- a/doc/layman.8.txt +++ b/doc/layman.8.txt @@ -287,6 +287,14 @@ git_postsync:: These are a space separated list of commands that are run after each add, sync operation if they are defined. +DATABASE CONFIGURATION OPTIONS +~~ +*layman* now supports multiple database types for layman's install file. The +options allowed include: *xml*, *json*, and *sqlite*. While xml is the default +database type you may migrate from one database type to the other using the +*layman-updater* tool while supplying the *-m* flag, followed by the database +type you'd like to use. + REPO CONFIGURATION OPTIONS ~~ diff --git a/etc/layman.cfg b/etc/layman.cfg index e1caa33..c6038ee 100644 --- a/etc/layman.cfg +++ b/etc/layman.cfg @@ -68,7 +68,7 @@ conf_type : repos.conf Database Config Options COMING SOON #--- # Database types used by layman, only one should be specified. -# (xml, json) +# (xml, json, sqlite) #db_type : xml #---
[gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/files/, app-emulation/lxd/
commit: dc04154e0238085235132f4e4346d8934482ff8a
Author: Alex Brandt gentoo org>
AuthorDate: Sat Sep 5 21:48:37 2015 +
Commit: Alex Brandt gentoo org>
CommitDate: Sat Sep 5 21:48:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc04154e
app-emulation/lxd: add version 0.16
submitted by Erik Mackdanz
Package-Manager: portage-2.2.20.1
app-emulation/lxd/Manifest | 1 +
app-emulation/lxd/files/lxd-0.16-dont-go-get.patch | 15 ++
.../lxd/files/lxd-0.16-nc-binary-name.patch| 11 ++
app-emulation/lxd/files/lxd-0.16.confd | 23 +++
app-emulation/lxd/files/lxd-0.16.initd | 32
app-emulation/lxd/lxd-0.16.ebuild | 164 +
app-emulation/lxd/metadata.xml | 10 ++
7 files changed, 256 insertions(+)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 79b1749..6254714 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1,3 @@
DIST lxd-0.13.tar.bz2 3336161 SHA256
4228979ea9a856647f75f0230f58cc577c111a287f148787af766ab36c55f756 SHA512
12cd865ef63702674342df23ebb298b6ba39f0d44e9bfe91c643820be06ff30910145388a4daa2d63fbcb53c236e3cd4eb84e3e0bc617c85247322b0024c4920
WHIRLPOOL
82e788e9b35429df308d498955bd0cab06eb7d1a09c0a20bddad78490900b2cb78a44da9970db149ebfda546250a1d5aa2204e5f6f98b81a228310bfee3003a7
DIST lxd-0.14.tar.bz2 2526939 SHA256
c0c51ac5b3d30c7906323eba965011073b412a3c354ce095e46f14df4298c46c SHA512
d3f9eb38cdf71add270c895c1583dab85b0e0dba0d956900628b519881b41582113d6c25d37b9522493de069ad6a43b197ae895aefeb83391337273a4b60953e
WHIRLPOOL
2b9c6931b81df7e60b13e35bfcd5272a46fb29377e11f6326616f55bf6c583db7be82d41273369518e9b9e434bee3b30f989b6816cd8dbdd40cc2cc1effac7b4
+DIST lxd-0.16.tar.bz2 2660683 SHA256
bbe2b7542af34c93c7509e9638016a420bfc1daf1f1f45a33fa3d379ae10f14f SHA512
856e5ea1920ec3025cbd308a8e2ef656393a149111a38188f749e7d42a41032d762009d85316815c3f18ac0907fa9380758ca48666b13e900c9bbdf809d57f1c
WHIRLPOOL
f4bbea69073f2cc0dce65e39d88cdf1a0fadd4629b5b42bdee7ab385df459f78a2e36619c40ace687be124fb8d59c0da043cb1a8195630b2d0a051ab53297b89
diff --git a/app-emulation/lxd/files/lxd-0.16-dont-go-get.patch
b/app-emulation/lxd/files/lxd-0.16-dont-go-get.patch
new file mode 100644
index 000..fbfcf13
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.16-dont-go-get.patch
@@ -0,0 +1,15 @@
+--- Makefile.orig 2015-09-03 10:08:26.921410426 -0500
Makefile 2015-09-03 10:08:52.193408698 -0500
+@@ -12,12 +12,10 @@
+
+ .PHONY: default
+ default:
+- go get -t -v -d ./... || true
+ go install -v ./...
+
+ .PHONY: client
+ client:
+- go get -t -v -d ./...
+ go install -v ./lxc
+
+ # This only needs to be done when migrate.proto is actually changed; since we
diff --git a/app-emulation/lxd/files/lxd-0.16-nc-binary-name.patch
b/app-emulation/lxd/files/lxd-0.16-nc-binary-name.patch
new file mode 100644
index 000..c81a3ed
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.16-nc-binary-name.patch
@@ -0,0 +1,11 @@
+--- lxd/migration/rsync.go.orig2015-08-21 12:05:15.098768663 -0500
lxd/migration/rsync.go 2015-08-21 12:06:15.899764506 -0500
+@@ -73,7 +73,7 @@
+* command (i.e. the command to run on --server). However, we're
+* hardcoding that at the other end, so we can just ignore it.
+*/
+- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
++ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
+ cmd := exec.Command("rsync", "-arvP", "--devices", "--partial", path,
"localhost:/tmp/foo", "-e", rsyncCmd)
+ if err := cmd.Start(); err != nil {
+ return nil, nil, err
diff --git a/app-emulation/lxd/files/lxd-0.16.confd
b/app-emulation/lxd/files/lxd-0.16.confd
new file mode 100644
index 000..c3e6e68
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.16.confd
@@ -0,0 +1,23 @@
+LXD_OPTIONS=""
+
+# Group which owns the shared socket
+LXD_OPTIONS="${LXD_OPTIONS} --group lxd"
+
+
+
+# Enable cpu profiling into the specified file
+#LXD_OPTIONS="${LXD_OPTIONS} --cpuprofile ''"
+
+# Enable memory profiling into the specified file
+#LXD_OPTIONS="${LXD_OPTIONS} --memprofile ''"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS="${LXD_OPTIONS} --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS="${LXD_OPTIONS} --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS="${LXD_OPTIONS} -v"
diff --git a/app-emulation/lxd/files/lxd-0.16.initd
b/app-emulation/lxd/files/lxd-0.16.initd
new file mode 100644
index 000..2b75e51
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.16.initd
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+depend() {
+need cgmanager
+need net
+}
+
+start() {
+e
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/
commit: 0d1ae797f9dae8ffcc3cb4bccf2c31f3303ddf0b
Author: Tom Wijsman gentoo org>
AuthorDate: Wed Jun 4 14:17:49 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:47:37 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0d1ae797
repoman/main.py: More KEYWORDS checks to checks/ebuilds/keywords.py
pym/repoman/checks/ebuilds/keywords.py | 64 ++
pym/repoman/main.py| 32 +
2 files changed, 59 insertions(+), 37 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/keywords.py
b/pym/repoman/checks/ebuilds/keywords.py
index b724269..235c751 100644
--- a/pym/repoman/checks/ebuilds/keywords.py
+++ b/pym/repoman/checks/ebuilds/keywords.py
@@ -21,7 +21,7 @@ class KeywordChecks(object):
def check(
self, pkg, package, ebuild, y_ebuild, keywords, ebuild_archs,
changed,
- live_ebuild):
+ live_ebuild, kwlist, profiles):
'''Perform the check.
@param pkg: Package in which we check (object).
@@ -33,21 +33,32 @@ class KeywordChecks(object):
@param changed: Changes instance
@param slot_keywords: A dictionary of keywords per slot.
@param live_ebuild: A boolean that determines if this is a live
ebuild.
+ @param kwlist: A list of all global keywords.
+ @param profiles: A list of all profiles.
'''
if not self.options.straight_to_stable:
self._checkAddedWithStableKeywords(
package, ebuild, y_ebuild, keywords, changed)
+
self._checkForDroppedKeywords(
pkg, ebuild, ebuild_archs, live_ebuild)
+ self._checkForInvalidKeywords(
+ pkg, package, y_ebuild, kwlist, profiles)
+
+ self._checkForMaskLikeKeywords(
+ package, y_ebuild, keywords, kwlist)
+
self.slot_keywords[pkg.slot].update(ebuild_archs)
+ def _isKeywordStable(self, keyword):
+ return not keyword.startswith("~") and not
keyword.startswith("-")
+
def _checkAddedWithStableKeywords(
self, package, ebuild, y_ebuild, keywords, changed):
catdir, pkgdir = package.split("/")
- is_stable = lambda kw: not kw.startswith("~") and not
kw.startswith("-")
- stable_keywords = list(filter(is_stable, keywords))
+ stable_keywords = list(filter(self._isKeywordStable, keywords))
if stable_keywords:
if ebuild.ebuild_path in changed.new_ebuilds and catdir
!= "virtual":
stable_keywords.sort()
@@ -64,6 +75,47 @@ class KeywordChecks(object):
elif ebuild_archs and "*" not in ebuild_archs and not
live_ebuild:
dropped_keywords =
previous_keywords.difference(ebuild_archs)
if dropped_keywords:
- self.qatracker.add_error("KEYWORDS.dropped",
- "%s: %s" %
- (ebuild.relative_path, "
".join(sorted(dropped_keywords
+ self.qatracker.add_error(
+ "KEYWORDS.dropped", "%s: %s" % (
+ ebuild.relative_path,
+ "
".join(sorted(dropped_keywords
+
+ def _checkForInvalidKeywords(
+ self, pkg, package, y_ebuild, kwlist, profiles):
+ myuse = pkg._metadata["KEYWORDS"].split()
+
+ for mykey in myuse:
+ if mykey not in ("-*", "*", "~*"):
+ myskey = mykey
+
+ if not self._isKeywordStable(myskey[:1]):
+ myskey = myskey[1:]
+
+ if myskey not in kwlist:
+ self.qatracker.add_error(
+ "KEYWORDS.invalid",
+ "%s/%s.ebuild: %s" % (
+ package, y_ebuild,
mykey))
+ elif myskey not in profiles:
+ self.qatracker.add_error(
+ "KEYWORDS.invalid",
+ "%s/%s.ebuild: %s (profile
invalid)" % (
+ package, y_ebuild,
mykey))
+
+ def _checkForMaskLikeKeywords(
+ self, package, y_ebuild, keywords, kwlist):
+
+ # KEYWORDS="-*" is a stupid replacement for package.mask
+ # and screws general KEYWORDS seman
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/variables/, pym/repoman/
commit: 7104d9aace97693d935f0e97f86ba4c048d3cc54 Author: Tom Wijsman gentoo org> AuthorDate: Fri Jun 6 14:50:26 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Sat Sep 5 21:47:38 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=7104d9aa repoman/main.py: Split DESCRIPTION checks to checks/ebuild/variables/ .../checks/ebuilds/variables/description.py| 32 ++ pym/repoman/main.py| 13 - 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/pym/repoman/checks/ebuilds/variables/description.py b/pym/repoman/checks/ebuilds/variables/description.py new file mode 100644 index 000..a2b1057 --- /dev/null +++ b/pym/repoman/checks/ebuilds/variables/description.py @@ -0,0 +1,32 @@ + +'''description.py +Perform checks on the DESCRIPTION variable. +''' + +from repoman.qa_data import max_desc_len + + +class DescriptionChecks(object): + '''Perform checks on the DESCRIPTION variable.''' + + def __init__(self, qatracker): + ''' + @param qatracker: QATracker instance + ''' + self.qatracker = qatracker + + def check(self, pkg, ebuild): + ''' + @param pkg: Package in which we check (object). + @param ebuild: Ebuild which we check (object). + ''' + self._checkTooLong(pkg, ebuild) + + def _checkTooLong(self, pkg, ebuild): + # 14 is the length of DESCRIPTION="" + if len(pkg._metadata['DESCRIPTION']) > max_desc_len: + self.qatracker.add_error( + 'DESCRIPTION.toolong', + "%s: DESCRIPTION is %d characters (max %d)" % + (ebuild.relative_path, len( + pkg._metadata['DESCRIPTION']), max_desc_len)) diff --git a/pym/repoman/main.py b/pym/repoman/main.py index 6bfd1be..f692b63 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -61,6 +61,7 @@ from repoman.check_missingslot import check_missingslot from repoman.checks.ebuilds.misc import bad_split_check, pkg_invalid from repoman.checks.ebuilds.pkgmetadata import PkgMetadata from repoman.checks.ebuilds.use_flags import USEFlagChecks +from repoman.checks.ebuilds.variables.description import DescriptionChecks from repoman.checks.ebuilds.variables.eapi import EAPIChecks from repoman.ebuild import Ebuild from repoman.errors import err @@ -68,7 +69,7 @@ from repoman.modules.commit import repochecks from repoman.profile import check_profiles, dev_keywords, setup_profile from repoman.qa_data import ( format_qa_output, format_qa_output_column, qahelp, - qawarnings, qacats, max_desc_len, missingvars, + qawarnings, qacats, missingvars, suspect_virtual, suspect_rdepend, valid_restrict) from repoman.qa_tracker import QATracker from repoman.repos import RepoSettings, repo_metadata @@ -297,6 +298,7 @@ keywordcheck = KeywordChecks(qatracker, options) liveeclasscheck = LiveEclassChecks(qatracker) rubyeclasscheck = RubyEclassChecks(qatracker) eapicheck = EAPIChecks(qatracker, repo_settings) +descriptioncheck = DescriptionChecks(qatracker) ## for xpkg in effective_scanlist: @@ -436,12 +438,9 @@ for xpkg in effective_scanlist: myqakey = var + ".virtual" qatracker.add_error(myqakey, ebuild.relative_path) - # 14 is the length of DESCRIPTION="" - if len(myaux['DESCRIPTION']) > max_desc_len: - qatracker.add_error( - 'DESCRIPTION.toolong', - "%s: DESCRIPTION is %d characters (max %d)" % - (ebuild.relative_path, len(myaux['DESCRIPTION']), max_desc_len)) + ### + descriptioncheck.check(pkg, ebuild) + ### keywords = myaux["KEYWORDS"].split()
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/
commit: 6bd98ee4b60bb581cf535f666dbde4bf1fe6fce5
Author: Brian Dolbec gentoo org>
AuthorDate: Tue Jun 3 19:20:43 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:47:36 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=6bd98ee4
Repoman: Refactor PkgMetadata and XmlLint classes for variable data passed in
Move all non-consistent data to be passed in via the check functions.
Initialize XmlLint once in the PkgMetadata class __init__().
pym/repoman/_xml.py | 33 ++-
pym/repoman/checks/ebuilds/pkgmetadata.py | 12 +--
2 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/pym/repoman/_xml.py b/pym/repoman/_xml.py
index b97c027..d5b5a5e 100644
--- a/pym/repoman/_xml.py
+++ b/pym/repoman/_xml.py
@@ -14,6 +14,8 @@ from repoman._subprocess import repoman_getstatusoutput
class _XMLParser(xml.etree.ElementTree.XMLParser):
+
+
def __init__(self, data, **kwargs):
xml.etree.ElementTree.XMLParser.__init__(self, **kwargs)
self._portage_data = data
@@ -25,11 +27,13 @@ class _XMLParser(xml.etree.ElementTree.XMLParser):
self.parser.StartDoctypeDeclHandler = \
self._portage_StartDoctypeDeclHandler
+
def _portage_XmlDeclHandler(self, version, encoding, standalone):
if self._base_XmlDeclHandler is not None:
self._base_XmlDeclHandler(version, encoding, standalone)
self._portage_data["XML_DECLARATION"] = (version, encoding,
standalone)
+
def _portage_StartDoctypeDeclHandler(
self, doctypeName, systemId, publicId, has_internal_subset):
if self._base_StartDoctypeDeclHandler is not None:
@@ -49,33 +53,44 @@ class
_MetadataTreeBuilder(xml.etree.ElementTree.TreeBuilder):
class XmlLint(object):
- def __init__(self, options, repolevel, repoman_settings):
+ def __init__(self, options, repoman_settings):
self.metadata_dtd = os.path.join(repoman_settings["DISTDIR"],
'metadata.dtd')
+ self.options = options
+ self.repoman_settings = repoman_settings
self._is_capable = False
self.binary = None
- self._check_capable(options, repolevel, repoman_settings)
+ self._check_capable()
+
- def _check_capable(self, options, repolevel, repoman_settings):
- if options.mode == "manifest":
+ def _check_capable(self):
+ if self.options.mode == "manifest":
return
self.binary = find_binary('xmllint')
if not self.binary:
print(red("!!! xmllint not found. Can't check
metadata.xml.\n"))
- if options.xml_parse or repolevel == 3:
- print("%s sorry, xmllint is needed. failing\n"
% red("!!!"))
- sys.exit(1)
else:
- if not fetch_metadata_dtd(self.metadata_dtd,
repoman_settings):
+ if not fetch_metadata_dtd(self.metadata_dtd,
self.repoman_settings):
sys.exit(1)
# this can be problematic if xmllint changes their
output
self._is_capable = True
+
@property
def capable(self):
return self._is_capable
- def check(self, checkdir):
+
+ def check(self, checkdir, repolevel):
+ '''Runs checks on the package metadata.xml file
+
+ @param checkdir: string, path
+ @param repolevel: integer
+ @return boolean, False == bad metadata
+ '''
if not self.capable:
+ if self.options.xml_parse or repolevel == 3:
+ print("%s sorry, xmllint is needed. failing\n"
% red("!!!"))
+ sys.exit(1)
return True
# xmlint can produce garbage output even on success, so only
dump
# the ouput when it fails.
diff --git a/pym/repoman/checks/ebuilds/pkgmetadata.py
b/pym/repoman/checks/ebuilds/pkgmetadata.py
index 0778696..674d32f 100644
--- a/pym/repoman/checks/ebuilds/pkgmetadata.py
+++ b/pym/repoman/checks/ebuilds/pkgmetadata.py
@@ -38,27 +38,28 @@ from repoman._xml import _XMLParser, _MetadataTreeBuilder,
XmlLint
class PkgMetadata(object):
'''Package metadata.xml checks'''
- def __init__(self, options, qatracker, repolevel, repoman_settings):
+ def __init__(self, options, qatracker, repoman_settings):
'''PkgMetadata init function
@param options: ArgumentParser.parse_known_args(argv[1:])
options
@param qatracker: QATracker instance
- @param repolev
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/
commit: 36fe5b2808a6c174e9025152293b0738cc9fd16a
Author: Tom Wijsman gentoo org>
AuthorDate: Tue Jun 3 11:15:10 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:47:35 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=36fe5b28
repoman/main.py: Split USE flag checks to checks/ebuilds/use_flags.py
pym/repoman/checks/ebuilds/misc.py | 2 +-
pym/repoman/checks/ebuilds/use_flags.py | 85 +
pym/repoman/main.py | 52
3 files changed, 95 insertions(+), 44 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/misc.py
b/pym/repoman/checks/ebuilds/misc.py
index 3bf61f0..744784a 100644
--- a/pym/repoman/checks/ebuilds/misc.py
+++ b/pym/repoman/checks/ebuilds/misc.py
@@ -39,7 +39,7 @@ def bad_split_check(xpkg, y_ebuild, pkgdir, qatracker):
return False
-def pkg_invalid(pkg, qatracker):
+def pkg_invalid(pkg, qatracker, ebuild):
'''Checks for invalid packages
@param pkg: _emerge.Package instance
diff --git a/pym/repoman/checks/ebuilds/use_flags.py
b/pym/repoman/checks/ebuilds/use_flags.py
new file mode 100644
index 000..bc09ed7
--- /dev/null
+++ b/pym/repoman/checks/ebuilds/use_flags.py
@@ -0,0 +1,85 @@
+
+'''use_flags.py
+Performs USE flag related checks
+'''
+
+# import our centrally initialized portage instance
+from repoman._portage import portage
+
+from portage import eapi
+from portage.eapi import eapi_has_iuse_defaults, eapi_has_required_use
+
+
+class USEFlagChecks(object):
+ '''Performs checks on USE flags listed in the ebuilds and
metadata.xml'''
+
+ def __init__(self, qatracker, globalUseFlags):
+ '''
+ @param qatracker: QATracker instance
+ @param globalUseFlags: Global USE flags
+ '''
+ self.qatracker = qatracker
+ self.useFlags = []
+ self.defaultUseFlags = []
+ self.usedUseFlags = set()
+ self.globalUseFlags = globalUseFlags
+
+ def check(self, pkg, package, ebuild, y_ebuild, localUseFlags):
+ '''Perform the check.
+
+ @param pkg: Package in which we check (object).
+ @param package: Package in which we check (string).
+ @param ebuild: Ebuild which we check (object).
+ @param y_ebuild: Ebuild which we check (string).
+ @param localUseFlags: Local USE flags of the package
+ '''
+ self._checkGlobal(pkg)
+ self._checkMetadata(package, ebuild, y_ebuild, localUseFlags)
+ self._checkRequiredUSE(pkg, ebuild)
+
+ def getUsedUseFlags(self):
+ '''Get the USE flags that this check has seen'''
+ return self.usedUseFlags
+
+ def _checkGlobal(self, pkg):
+ for myflag in pkg._metadata["IUSE"].split():
+ flag_name = myflag.lstrip("+-")
+ self.usedUseFlags.add(flag_name)
+ if myflag != flag_name:
+ self.defaultUseFlags.append(myflag)
+ if flag_name not in self.globalUseFlags:
+ self.useFlags.append(flag_name)
+
+ def _checkMetadata(self, package, ebuild, y_ebuild, localUseFlags):
+ for mypos in range(len(self.useFlags) - 1, -1, -1):
+ if self.useFlags[mypos] and (self.useFlags[mypos] in
localUseFlags):
+ del self.useFlags[mypos]
+
+ if self.defaultUseFlags and not eapi_has_iuse_defaults(eapi):
+ for myflag in self.defaultUseFlags:
+ self.qatracker.add_error(
+ 'EAPI.incompatible', "%s: IUSE defaults"
+ " not supported with EAPI='%s': '%s'" %
(
+ ebuild.relative_path, eapi,
myflag))
+
+ for mypos in range(len(self.useFlags)):
+ self.qatracker.add_error(
+ "IUSE.invalid",
+ "%s/%s.ebuild: %s" % (package, y_ebuild,
self.useFlags[mypos]))
+
+ def _checkRequiredUSE(self, pkg, ebuild):
+ required_use = pkg._metadata["REQUIRED_USE"]
+ if required_use:
+ if not eapi_has_required_use(eapi):
+ self.qatracker.add_error(
+ 'EAPI.incompatible', "%s: REQUIRED_USE"
+ " not supported with EAPI='%s'"
+ % (ebuild.relative_path, eapi,))
+ try:
+ portage.dep.check_required_use(
+ required_use, (),
pkg.iuse.is_valid_flag, eapi=eapi)
+
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 8b8c9507ccdcb2ffc4080213146eafc1153a6896
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Nov 17 02:07:13 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:47:39 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=8b8c9507
repoman/main.py: Update dependency.perlcore error to us qatracker
Update the original code added after the re-write had started.
This brings it up to date with teh new stats tracking class instance.
pym/repoman/main.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 582370e..7887a79 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -560,7 +560,9 @@ for xpkg in effective_scanlist:
qatracker.add_error('dependency.perlcore',
ebuild.relative_path +
": %s: please
use '%s' instead of '%s'" %
- (mytype,
atom.replace("perl-core/","virtual/perl-"), atom))
+ (mytype,
+
atom.replace("perl-core/","virtual/perl-"),
+ atom))
if buildtime and \
not is_blocker and \
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/, pym/repoman/
commit: d96f1eb255464fd2b48a7439e0a73f520b172555
Author: Tom Wijsman gentoo org>
AuthorDate: Wed Jun 4 09:17:12 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:47:37 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d96f1eb2
repoman/main.py: Split KEYWORDS checks to checks/ebuilds/keywords.py
pym/repoman/checks/ebuilds/keywords.py | 69 ++
pym/repoman/main.py| 33
2 files changed, 77 insertions(+), 25 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/keywords.py
b/pym/repoman/checks/ebuilds/keywords.py
new file mode 100644
index 000..b724269
--- /dev/null
+++ b/pym/repoman/checks/ebuilds/keywords.py
@@ -0,0 +1,69 @@
+
+'''keywords.py
+Perform KEYWORDS related checks
+'''
+
+
+class KeywordChecks(object):
+ '''Perform checks on the KEYWORDS of an ebuild'''
+
+ def __init__(self, qatracker, options):
+ '''
+ @param qatracker: QATracker instance
+ '''
+ self.qatracker = qatracker
+ self.options = options
+ self.slot_keywords = {}
+
+ def prepare(self):
+ '''Prepare the checks for the next package.'''
+ self.slot_keywords = {}
+
+ def check(
+ self, pkg, package, ebuild, y_ebuild, keywords, ebuild_archs,
changed,
+ live_ebuild):
+ '''Perform the check.
+
+ @param pkg: Package in which we check (object).
+ @param package: Package in which we check (string).
+ @param ebuild: Ebuild which we check (object).
+ @param y_ebuild: Ebuild which we check (string).
+ @param keywords: All the keywords (including -...) of the
ebuild.
+ @param ebuild_archs: Just the architectures (no prefixes) of
the ebuild.
+ @param changed: Changes instance
+ @param slot_keywords: A dictionary of keywords per slot.
+ @param live_ebuild: A boolean that determines if this is a live
ebuild.
+ '''
+ if not self.options.straight_to_stable:
+ self._checkAddedWithStableKeywords(
+ package, ebuild, y_ebuild, keywords, changed)
+ self._checkForDroppedKeywords(
+ pkg, ebuild, ebuild_archs, live_ebuild)
+
+ self.slot_keywords[pkg.slot].update(ebuild_archs)
+
+ def _checkAddedWithStableKeywords(
+ self, package, ebuild, y_ebuild, keywords, changed):
+ catdir, pkgdir = package.split("/")
+
+ is_stable = lambda kw: not kw.startswith("~") and not
kw.startswith("-")
+ stable_keywords = list(filter(is_stable, keywords))
+ if stable_keywords:
+ if ebuild.ebuild_path in changed.new_ebuilds and catdir
!= "virtual":
+ stable_keywords.sort()
+ self.qatracker.add_error(
+ "KEYWORDS.stable",
+ "%s/%s.ebuild added with stable
keywords: %s" %
+ (package, y_ebuild, "
".join(stable_keywords)))
+
+ def _checkForDroppedKeywords(
+ self, pkg, ebuild, ebuild_archs, live_ebuild):
+ previous_keywords = self.slot_keywords.get(pkg.slot)
+ if previous_keywords is None:
+ self.slot_keywords[pkg.slot] = set()
+ elif ebuild_archs and "*" not in ebuild_archs and not
live_ebuild:
+ dropped_keywords =
previous_keywords.difference(ebuild_archs)
+ if dropped_keywords:
+ self.qatracker.add_error("KEYWORDS.dropped",
+ "%s: %s" %
+ (ebuild.relative_path, "
".join(sorted(dropped_keywords
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 26fa50a..6e9dc22 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -51,6 +51,7 @@ from repoman.argparser import parse_args
from repoman.checks.directories.files import FileChecks
from repoman.checks.ebuilds.checks import run_checks, checks_init
from repoman.checks.ebuilds.fetches import FetchChecks
+from repoman.checks.ebuilds.keywords import KeywordChecks
from repoman.checks.ebuilds.isebuild import IsEbuild
from repoman.checks.ebuilds.thirdpartymirrors import ThirdPartyMirrors
from repoman.checks.ebuilds.manifests import Manifests
@@ -284,7 +285,7 @@ fetchcheck = FetchChecks(qatracker, repoman_settings,
repo_settings, portdb,
pkgmeta = PkgMetadata(options, qatracker, repoman_settings)
thirdparty = ThirdPartyMirrors(repoman_settings, qatracker)
use_flag_checks = USEFlagChecks(qatracker, uselist)
-
+keywordcheck = KeywordChecks(qatracker, op
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 0e00f62bec159b2666106db6fcbb3bf62135908e
Author: Brian Dolbec gentoo org>
AuthorDate: Tue Jun 3 19:32:18 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:47:36 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0e00f62b
repoman/main.py: Move the check class instantiations out of the xpkg loop
This should help reduce overall run time when doing large repoman full runs.
It instead re-uses the class instances for each pkg checked.
pym/repoman/main.py | 25 ++---
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 0b78001..26fa50a 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -273,6 +273,19 @@ if options.if_modified == "y":
chain(changed.changed, changed.new, changed.removed),
repolevel, reposplit, categories))
+### initialize our checks classes here before the big xpkg loop
+manifester = Manifests(options, qatracker, repoman_settings)
+is_ebuild = IsEbuild(repoman_settings, repo_settings, portdb, qatracker)
+filescheck = FileChecks(qatracker, repoman_settings, repo_settings, portdb,
+ vcs_settings)
+status_check = VCSStatus(vcs_settings, qatracker)
+fetchcheck = FetchChecks(qatracker, repoman_settings, repo_settings, portdb,
+ vcs_settings)
+pkgmeta = PkgMetadata(options, qatracker, repoman_settings)
+thirdparty = ThirdPartyMirrors(repoman_settings, qatracker)
+use_flag_checks = USEFlagChecks(qatracker, uselist)
+
+
for xpkg in effective_scanlist:
# ebuilds and digests added to cvs respectively.
logging.info("checking package %s" % xpkg)
@@ -289,7 +302,6 @@ for xpkg in effective_scanlist:
checkdir_relative = os.path.join(".", checkdir_relative)
#
- manifester = Manifests(options, qatracker, repoman_settings)
if manifester.run(checkdir, portdb):
continue
if not manifester.generated_manifest:
@@ -302,7 +314,6 @@ for xpkg in effective_scanlist:
checkdirlist = os.listdir(checkdir)
##
- is_ebuild = IsEbuild(repoman_settings, repo_settings, portdb, qatracker)
pkgs, allvalid = is_ebuild.check(checkdirlist, checkdir, xpkg)
if is_ebuild.continue_:
# If we can't access all the metadata then it's totally unsafe
to
@@ -320,26 +331,20 @@ for xpkg in effective_scanlist:
ebuildlist = sorted(pkgs.values())
ebuildlist = [pkg.pf for pkg in ebuildlist]
###
- filescheck = FileChecks(qatracker, repoman_settings, repo_settings,
portdb,
- vcs_settings)
filescheck.check(checkdir, checkdirlist, checkdir_relative,
changed.changed, changed.new)
###
- status_check = VCSStatus(vcs_settings, qatracker)
status_check.check(check_ebuild_notadded, checkdir, checkdir_relative,
xpkg)
eadded.extend(status_check.eadded)
#
- fetchcheck = FetchChecks(qatracker, repoman_settings, repo_settings,
portdb,
- vcs_settings)
fetchcheck.check(xpkg, checkdir, checkdir_relative, changed.changed,
changed.new)
#
if check_changelog and "ChangeLog" not in checkdirlist:
qatracker.add_error("changelog.missing", xpkg + "/ChangeLog")
#
- pkgmeta = PkgMetadata(options, qatracker, repolevel, repoman_settings)
- pkgmeta.check(xpkg, checkdir, checkdirlist)
+ pkgmeta.check(xpkg, checkdir, checkdirlist, repolevel)
muselist = frozenset(pkgmeta.musedict)
#
@@ -397,7 +402,6 @@ for xpkg in effective_scanlist:
if not fetchcheck.src_uri_error:
###
- thirdparty = ThirdPartyMirrors(repoman_settings,
qatracker)
thirdparty.check(myaux, ebuild.relative_path)
###
if myaux.get("PROVIDE"):
@@ -632,7 +636,6 @@ for xpkg in effective_scanlist:
badprovsyntax = badprovsyntax > 0
#
- use_flag_checks = USEFlagChecks(qatracker, uselist)
use_flag_checks.check(pkg, xpkg, ebuild, y_ebuild, muselist)
ebuild_used_useflags = use_flag_checks.getUsedUseFlags()
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: e78b98fa08c4d2c1ee940c0d39ea99d703d1b475
Author: Tom Wijsman gentoo org>
AuthorDate: Tue Jun 3 11:28:44 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:47:35 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e78b98fa
repoman/main.py: Refactor "RepoMan Sez"
pym/repoman/main.py | 27 ++-
pym/repoman/utilities.py | 8 ++--
2 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index a5214d8..30487b5 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -981,25 +981,21 @@ if options.mode != 'commit':
if dofull:
print(bold("Note: type \"repoman full\" for a complete
listing."))
if dowarn and not dofail:
- print(
- green("RepoMan sez:"),
+ utilities.repoman_sez(
"\"You're only giving me a partial QA payment?\n"
" I'll take it this time, but I'm not
happy.\"")
elif not dofail:
- print(
- green("RepoMan sez:"),
+ utilities.repoman_sez(
"\"If everyone were like you, I'd be out of
business!\"")
elif dofail:
print(bad("Please fix these important QA issues first."))
- print(
- green("RepoMan sez:"),
+ utilities.repoman_sez(
"\"Make your QA payment on time"
" and you'll never see the likes of me.\"\n")
sys.exit(1)
else:
if dofail and can_force and options.force and not options.pretend:
- print(
- green("RepoMan sez:"),
+ utilities.repoman_sez(
" \"You want to commit even with these QA issues?\n"
" I'll take it this time, but I'm not
happy.\"\n")
elif dofail:
@@ -1008,15 +1004,13 @@ else:
"The --force option has been disabled"
" due to extraordinary issues."))
print(bad("Please fix these important QA issues first."))
- print(
- green("RepoMan sez:"),
+ utilities.repoman_sez(
"\"Make your QA payment on time"
" and you'll never see the likes of me.\"\n")
sys.exit(1)
if options.pretend:
- print(
- green("RepoMan sez:"),
+ utilities.repoman_sez(
"\"So, you want to play it safe. Good call.\"\n")
myunadded = []
@@ -1199,7 +1193,8 @@ else:
if vcs_settings.vcs:
if not (mychanged or mynew or myremoved or (vcs_settings.vcs ==
"hg" and mydeleted)):
- print(green("RepoMan sez:"), "\"Doing nothing is not
always good for QA.\"")
+ utilities.repoman_sez(
+ "\"Doing nothing is not always good for QA.\"")
print()
print("(Didn't find any changed files...)")
print()
@@ -1604,8 +1599,7 @@ else:
portage.util.write_atomic(x, b''.join(mylines),
mode='wb')
if repolevel == 1:
- print(
- green("RepoMan sez:"),
+ utilities.repoman_sez(
"\"You're rather crazy... "
"doing the entire repository.\"\n")
@@ -1722,7 +1716,6 @@ else:
"repoman was too scared"
" by not seeing any familiar version control file"
" that he forgot to commit anything")
- print(
- green("RepoMan sez:"),
+ utilities.repoman_sez(
"\"If everyone were like you, I'd be out of business!\"\n")
sys.exit(0)
diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py
index 93e8840..2a1f4d9 100644
--- a/pym/repoman/utilities.py
+++ b/pym/repoman/utilities.py
@@ -39,9 +39,10 @@ from portage import shutil
from portage import _encodings
from portage import _unicode_decode
from portage import _unicode_encode
+from portage import util
from portage.localization import _
from portage.process import find_binary
-from portage import util
+from portage.output import green
from repoman.copyrights import update_copyright, update_copyright_year
@@ -126,7 +127,6 @@ def FindPackagesToScan(settings, startdir, reposplit):
path = os.path.join(startdir, cat)
if not os.path.isdir(path):
continue
- pkgdirs = os.listdir(path)
scanlist.extend(AddPackagesInDir(path))
elif repolevel == 2: # category level, startdir
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/variables/, pym/repoman/
commit: 26988a0cc70f23e85c0be0cbc388ad35da8572db
Author: Tom Wijsman gentoo org>
AuthorDate: Fri Jun 6 15:09:43 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:47:38 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=26988a0c
repoman/main.py: Split LICENSE checks to checks/ebuild/variables/
pym/repoman/checks/ebuilds/variables/license.py | 47 +
pym/repoman/main.py | 21 +++
2 files changed, 52 insertions(+), 16 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/variables/license.py
b/pym/repoman/checks/ebuilds/variables/license.py
new file mode 100644
index 000..bdc859c
--- /dev/null
+++ b/pym/repoman/checks/ebuilds/variables/license.py
@@ -0,0 +1,47 @@
+
+'''description.py
+Perform checks on the LICENSE variable.
+'''
+
+# import our initialized portage instance
+from repoman._portage import portage
+
+
+class LicenseChecks(object):
+ '''Perform checks on the LICENSE variable.'''
+
+ def __init__(self, qatracker, liclist, liclist_deprecated):
+ '''
+ @param qatracker: QATracker instance
+ @param liclist: List of licenses.
+ @param liclist: List of deprecated licenses.
+ '''
+ self.qatracker = qatracker
+ self.liclist = liclist
+ self.liclist_deprecated = liclist_deprecated
+
+ def check(
+ self, pkg, package, ebuild, y_ebuild):
+ '''
+ @param pkg: Package in which we check (object).
+ @param package: Package in which we check (string).
+ @param ebuild: Ebuild which we check (object).
+ @param y_ebuild: Ebuild which we check (string).
+ '''
+
+ # Parse the LICENSE variable, remove USE conditions and flatten
it.
+ licenses = portage.dep.use_reduce(
+ pkg._metadata["LICENSE"], matchall=1, flat=True)
+
+ # Check each entry to ensure that it exists in
${PORTDIR}/licenses/.
+ for lic in licenses:
+ # Need to check for "||" manually as no portage
+ # function will remove it without removing values.
+ if lic not in self.liclist and lic != "||":
+ self.qatracker.add_error(
+ "LICENSE.invalid",
+ package + "/" + y_ebuild + ".ebuild:
%s" % lic)
+ elif lic in self.liclist_deprecated:
+ self.qatracker.add_error(
+ "LICENSE.deprecated",
+ "%s: %s" % (ebuild.relative_path, lic))
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index f692b63..fd7baa0 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -63,6 +63,7 @@ from repoman.checks.ebuilds.pkgmetadata import PkgMetadata
from repoman.checks.ebuilds.use_flags import USEFlagChecks
from repoman.checks.ebuilds.variables.description import DescriptionChecks
from repoman.checks.ebuilds.variables.eapi import EAPIChecks
+from repoman.checks.ebuilds.variables.license import LicenseChecks
from repoman.ebuild import Ebuild
from repoman.errors import err
from repoman.modules.commit import repochecks
@@ -299,6 +300,7 @@ liveeclasscheck = LiveEclassChecks(qatracker)
rubyeclasscheck = RubyEclassChecks(qatracker)
eapicheck = EAPIChecks(qatracker, repo_settings)
descriptioncheck = DescriptionChecks(qatracker)
+licensecheck = LicenseChecks(qatracker, liclist, liclist_deprecated)
##
for xpkg in effective_scanlist:
@@ -617,22 +619,9 @@ for xpkg in effective_scanlist:
# license checks
if not badlicsyntax:
- # Parse the LICENSE variable, remove USE conditions and
- # flatten it.
- licenses = portage.dep.use_reduce(myaux["LICENSE"],
matchall=1, flat=True)
- # Check each entry to ensure that it exists in PORTDIR's
- # license directory.
- for lic in licenses:
- # Need to check for "||" manually as no portage
- # function will remove it without removing
values.
- if lic not in liclist and lic != "||":
- qatracker.add_error(
- "LICENSE.invalid",
- xpkg + "/" + y_ebuild +
".ebuild: %s" % lic)
- elif lic in liclist_deprecated:
- qatracker.add_error(
- "LICENSE.deprecated",
- "
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/vcs/
commit: d395ac47ec46b56fd437da1e99c73c00afa80099
Author: Brian Dolbec gentoo org>
AuthorDate: Tue Jun 3 18:42:37 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:47:36 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d395ac47
Repoman: Refactor VCSStatus to pass non consistent data to the check()
This will facilitae for the initialization of the class before the big xpkg
loop.
pym/repoman/main.py | 4 ++--
pym/repoman/vcs/vcsstatus.py | 39 ++-
2 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index e942dca..0b78001 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -325,8 +325,8 @@ for xpkg in effective_scanlist:
filescheck.check(checkdir, checkdirlist, checkdir_relative,
changed.changed, changed.new)
###
- status_check = VCSStatus(vcs_settings, checkdir, checkdir_relative,
xpkg, qatracker)
- status_check.check(check_ebuild_notadded)
+ status_check = VCSStatus(vcs_settings, qatracker)
+ status_check.check(check_ebuild_notadded, checkdir, checkdir_relative,
xpkg)
eadded.extend(status_check.eadded)
#
diff --git a/pym/repoman/vcs/vcsstatus.py b/pym/repoman/vcs/vcsstatus.py
index 6a81b1b..0517c04 100644
--- a/pym/repoman/vcs/vcsstatus.py
+++ b/pym/repoman/vcs/vcsstatus.py
@@ -13,52 +13,49 @@ class VCSStatus(object):
'''Determines the status of the vcs repositories
to determine if files are not added'''
- def __init__(self, vcs_settings, checkdir, checkdir_relative, xpkg,
qatracker):
+ def __init__(self, vcs_settings, qatracker):
self.vcs_settings = vcs_settings
self.vcs = vcs_settings.vcs
self.eadded = []
- self.checkdir = checkdir
- self.checkdir_relative = checkdir_relative
- self.xpkg = xpkg
self.qatracker = qatracker
- def check(self, check_not_added):
+ def check(self, check_not_added, checkdir, checkdir_relative, xpkg):
if self.vcs and check_not_added:
vcscheck = getattr(self, 'check_%s' % self.vcs)
- vcscheck()
+ vcscheck(checkdir, checkdir_relative, xpkg)
- def post_git_hg(self, myf):
+ def post_git_hg(self, myf, xpkg):
for l in myf:
if l[:-1][-7:] == ".ebuild":
self.qatracker.add_error("ebuild.notadded",
- os.path.join(self.xpkg,
os.path.basename(l[:-1])))
+ os.path.join(xpkg,
os.path.basename(l[:-1])))
myf.close()
- def check_git(self):
+ def check_git(self, checkdir, checkdir_relative, xpkg):
myf = repoman_popen(
"git ls-files --others %s" %
- (portage._shell_quote(self.checkdir_relative),))
- self.post_git_hg(myf)
+ (portage._shell_quote(checkdir_relative),))
+ self.post_git_hg(myf, xpkg)
- def check_hg(self):
+ def check_hg(self, checkdir, checkdir_relative, xpkg):
myf = repoman_popen(
"hg status --no-status --unknown %s" %
- (portage._shell_quote(self.checkdir_relative),))
- self.post_git_hg(myf)
+ (portage._shell_quote(checkdir_relative),))
+ self.post_git_hg(myf, xpkg)
- def check_cvs(self):
+ def check_cvs(self, checkdir, checkdir_relative, xpkg):
try:
- myf = open(self.checkdir + "/CVS/Entries", "r")
+ myf = open(checkdir + "/CVS/Entries", "r")
myl = myf.readlines()
myf.close()
except IOError:
self.qatracker.add_error("CVS/Entries.IO_error",
- self.checkdir + "/CVS/Entries")
+ checkdir + "/CVS/Entries")
return True
for l in myl:
if l[0] != "/":
@@ -71,7 +68,7 @@ class VCSStatus(object):
return True
- def check_svn(self):
+ def check_svn(self, checkdir, checkdir_relative, xpkg):
try:
myf = repoman_popen(
"svn status --depth=files --verbose " +
@@ -92,7 +89,7 @@ class VCSStatus(object):
try:
myf = repoman_popen(
"svn status " +
-
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/vcs/
commit: 2cef1f5b99fd94563dff033e148980724997c93e Author: Tom Wijsman gentoo org> AuthorDate: Mon Jun 2 16:23:20 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Sat Sep 5 21:47:34 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2cef1f5b repoman/vcs/vcsstatus.py: Only check VCS status in a VCS pym/repoman/vcs/vcsstatus.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pym/repoman/vcs/vcsstatus.py b/pym/repoman/vcs/vcsstatus.py index eedf866..f984832 100644 --- a/pym/repoman/vcs/vcsstatus.py +++ b/pym/repoman/vcs/vcsstatus.py @@ -22,7 +22,7 @@ class VCSStatus(object): def check(self, check_not_added): - if check_not_added: + if self.vcs and check_not_added: vcscheck = getattr(self, 'check_%s' % self.vcs) vcscheck()
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/eclasses/
commit: f58cea2bd71b571e0ff49f6284d5d76fdbed446f
Author: Tom Wijsman gentoo org>
AuthorDate: Wed Jun 4 13:40:35 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:47:37 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f58cea2b
repoman/main.py: Split "Live" checks to checks/ebuilds/eclass/live.py
pym/repoman/checks/ebuilds/eclasses/live.py | 39 +
pym/repoman/main.py | 45 -
2 files changed, 57 insertions(+), 27 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/eclasses/live.py
b/pym/repoman/checks/ebuilds/eclasses/live.py
new file mode 100644
index 000..20c573e
--- /dev/null
+++ b/pym/repoman/checks/ebuilds/eclasses/live.py
@@ -0,0 +1,39 @@
+
+'''live.py
+Performs Live eclass checks
+'''
+
+from repoman.repos import has_global_mask
+
+
+class LiveEclassChecks(object):
+ '''Performs checks for the usage of Live eclasses in ebuilds'''
+
+ def __init__(self, qatracker):
+ '''
+ @param qatracker: QATracker instance
+ '''
+ self.qatracker = qatracker
+
+ def check(self, pkg, package, ebuild, y_ebuild, keywords,
global_pmaskdict):
+ '''Ebuilds that inherit a "Live" eclass (darcs, subversion,
git, cvs,
+ etc..) should not be allowed to be marked stable
+
+ @param pkg: Package in which we check (object).
+ @param package: Package in which we check (string).
+ @param ebuild: Ebuild which we check (object).
+ @param y_ebuild: Ebuild which we check (string).
+ @param keywords: The keywords of the ebuild.
+ @param global_pmaskdict: A global dictionary of all the masks.
+ '''
+ is_stable = lambda kw: not kw.startswith("~") and not
kw.startswith("-")
+ bad_stable_keywords = list(filter(is_stable, keywords))
+
+ if bad_stable_keywords:
+ self.qatracker.add_error(
+ "LIVEVCS.stable", "%s/%s.ebuild with stable
keywords:%s " % (
+ package, y_ebuild, bad_stable_keywords))
+
+ good_keywords_exist = len(bad_stable_keywords) < len(keywords)
+ if good_keywords_exist and not has_global_mask(pkg,
global_pmaskdict):
+ self.qatracker.add_error("LIVEVCS.unmasked",
ebuild.relative_path)
\ No newline at end of file
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 6e9dc22..305e0b1 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -50,6 +50,7 @@ from portage.package.ebuild.digestgen import digestgen
from repoman.argparser import parse_args
from repoman.checks.directories.files import FileChecks
from repoman.checks.ebuilds.checks import run_checks, checks_init
+from repoman.checks.ebuilds.eclasses.live import LiveEclassChecks
from repoman.checks.ebuilds.fetches import FetchChecks
from repoman.checks.ebuilds.keywords import KeywordChecks
from repoman.checks.ebuilds.isebuild import IsEbuild
@@ -63,16 +64,17 @@ from repoman.ebuild import Ebuild
from repoman.errors import err
from repoman.modules.commit import repochecks
from repoman.profile import check_profiles, dev_keywords, setup_profile
-from repoman.qa_data import (format_qa_output, format_qa_output_column, qahelp,
+from repoman.qa_data import (
+ format_qa_output, format_qa_output_column, qahelp,
qawarnings, qacats, max_desc_len, missingvars,
ruby_deprecated, suspect_virtual, suspect_rdepend, valid_restrict)
from repoman.qa_tracker import QATracker
-from repoman.repos import has_global_mask, RepoSettings, repo_metadata
+from repoman.repos import RepoSettings, repo_metadata
from repoman.scan import Changes, scan
from repoman._subprocess import repoman_popen, repoman_getstatusoutput
from repoman import utilities
-from repoman.vcs.vcs import (git_supports_gpg_sign, vcs_files_to_cps,
- VCSSettings)
+from repoman.vcs.vcs import (
+ git_supports_gpg_sign, vcs_files_to_cps, VCSSettings)
from repoman.vcs.vcsstatus import VCSStatus
@@ -274,18 +276,21 @@ if options.if_modified == "y":
chain(changed.changed, changed.new, changed.removed),
repolevel, reposplit, categories))
-### initialize our checks classes here before the big xpkg loop
+##
+# initialize our checks classes here before the big xpkg loop
manifester = Manifests(options, qatracker, repoman_settings)
is_ebuild = IsEbuild(repoman_settings, repo_settings, portdb, qatracker)
-filescheck = FileChecks(qatracker, repoman_settings, repo_settings, portdb,
- vcs_settings)
+filescheck = FileChecks(
+ qatracker, repoman_settings, repo_settings, portdb, vcs_settings)
status_check = VCSStatus(vcs_settings, qatracker)
-fetchcheck = FetchChecks(qatracker, repoman_settings
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/herds/, pym/repoman/vcs/, pym/repoman/, ...
commit: a1aef8fda8481c31802d87909cfbe4977b4a4043 Author: Tom Wijsman gentoo org> AuthorDate: Fri Jun 6 12:24:18 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Sat Sep 5 21:47:38 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a1aef8fd repoman: Apply PEP 8 guidelines again (except for W191) pym/repoman/_portage.py | 1 - pym/repoman/_xml.py | 6 -- pym/repoman/checks/directories/files.py | 17 +++-- pym/repoman/checks/ebuilds/checks.py| 2 +- pym/repoman/checks/ebuilds/eclasses/live.py | 2 +- pym/repoman/checks/ebuilds/eclasses/ruby.py | 2 +- pym/repoman/checks/ebuilds/fetches.py | 29 pym/repoman/checks/ebuilds/isebuild.py | 6 +- pym/repoman/checks/ebuilds/manifests.py | 7 +- pym/repoman/checks/ebuilds/misc.py | 11 ++- pym/repoman/checks/ebuilds/pkgmetadata.py | 42 ++- pym/repoman/checks/ebuilds/thirdpartymirrors.py | 8 +- pym/repoman/checks/ebuilds/use_flags.py | 5 -- pym/repoman/checks/herds/metadata.py| 4 - pym/repoman/ebuild.py | 6 +- pym/repoman/errors.py | 2 - pym/repoman/main.py | 97 +++-- pym/repoman/qa_data.py | 2 - pym/repoman/qa_tracker.py | 13 ++-- pym/repoman/repos.py| 35 + pym/repoman/scan.py | 18 ++--- pym/repoman/vcs/vcs.py | 10 ++- pym/repoman/vcs/vcsstatus.py| 17 ++--- 23 files changed, 163 insertions(+), 179 deletions(-) diff --git a/pym/repoman/_portage.py b/pym/repoman/_portage.py index e72ce9f..0f611f7 100644 --- a/pym/repoman/_portage.py +++ b/pym/repoman/_portage.py @@ -23,4 +23,3 @@ sys.path.insert(0, pym_path) import portage portage._internal_caller = True portage._disable_legacy_globals() - diff --git a/pym/repoman/_xml.py b/pym/repoman/_xml.py index d5b5a5e..7bf6698 100644 --- a/pym/repoman/_xml.py +++ b/pym/repoman/_xml.py @@ -15,7 +15,6 @@ from repoman._subprocess import repoman_getstatusoutput class _XMLParser(xml.etree.ElementTree.XMLParser): - def __init__(self, data, **kwargs): xml.etree.ElementTree.XMLParser.__init__(self, **kwargs) self._portage_data = data @@ -27,13 +26,11 @@ class _XMLParser(xml.etree.ElementTree.XMLParser): self.parser.StartDoctypeDeclHandler = \ self._portage_StartDoctypeDeclHandler - def _portage_XmlDeclHandler(self, version, encoding, standalone): if self._base_XmlDeclHandler is not None: self._base_XmlDeclHandler(version, encoding, standalone) self._portage_data["XML_DECLARATION"] = (version, encoding, standalone) - def _portage_StartDoctypeDeclHandler( self, doctypeName, systemId, publicId, has_internal_subset): if self._base_StartDoctypeDeclHandler is not None: @@ -61,7 +58,6 @@ class XmlLint(object): self.binary = None self._check_capable() - def _check_capable(self): if self.options.mode == "manifest": return @@ -74,12 +70,10 @@ class XmlLint(object): # this can be problematic if xmllint changes their output self._is_capable = True - @property def capable(self): return self._is_capable - def check(self, checkdir, repolevel): '''Runs checks on the package metadata.xml file diff --git a/pym/repoman/checks/directories/files.py b/pym/repoman/checks/directories/files.py index 87220c0..b1d77df 100644 --- a/pym/repoman/checks/directories/files.py +++ b/pym/repoman/checks/directories/files.py @@ -13,8 +13,8 @@ from repoman.vcs.vcs import vcs_new_changed class FileChecks(object): - def __init__(self, qatracker, repoman_settings, repo_settings, portdb, - vcs_settings): + def __init__( + self, qatracker, repoman_settings, repo_settings, portdb, vcs_settings): ''' @param qatracker: QATracker instance @param repoman_settings: settings instance @@ -27,7 +27,6 @@ class FileChecks(object): self.repoman_settings = repoman_settings self.vcs_settings = vcs_settings - def check(self, checkdir, checkdirlist, checkdir_relative, changed, new): '''Checks the ebuild sources and files for errors @@ -48,10 +47,12 @@ class FileChecks(object): # prohibited characters). See bug #406877. index = -1 if index != -1: -
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/variables/
commit: 1346f715f98160c96204b063a18720c17dae62af Author: Tom Wijsman gentoo org> AuthorDate: Fri Jun 6 14:40:39 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Sat Sep 5 21:47:38 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=1346f715 repoman/main.py: Split EAPI checks to checks/ebuilds/variables/eapi.py pym/repoman/checks/ebuilds/variables/__init__.py | 0 pym/repoman/checks/ebuilds/variables/eapi.py | 44 pym/repoman/main.py | 12 +++ 3 files changed, 49 insertions(+), 7 deletions(-) diff --git a/pym/repoman/checks/ebuilds/variables/__init__.py b/pym/repoman/checks/ebuilds/variables/__init__.py new file mode 100644 index 000..e69de29 diff --git a/pym/repoman/checks/ebuilds/variables/eapi.py b/pym/repoman/checks/ebuilds/variables/eapi.py new file mode 100644 index 000..2f8b1cb --- /dev/null +++ b/pym/repoman/checks/ebuilds/variables/eapi.py @@ -0,0 +1,44 @@ + +'''eapi.py +Perform checks on the EAPI variable. +''' + + +class EAPIChecks(object): + '''Perform checks on the EAPI variable.''' + + def __init__(self, qatracker, repo_settings): + ''' + @param qatracker: QATracker instance + @param repo_settings: Repository settings + ''' + self.qatracker = qatracker + self.repo_settings = repo_settings + + def check(self, pkg, ebuild): + ''' + @param pkg: Package in which we check (object). + @param ebuild: Ebuild which we check (object). + ''' + eapi = pkg._metadata["EAPI"] + + if not self._checkBanned(ebuild, eapi): + self._checkDeprecated(ebuild, eapi) + + def _checkBanned(self, ebuild, eapi): + if self.repo_settings.repo_config.eapi_is_banned(eapi): + self.qatracker.add_error( + "repo.eapi.banned", "%s: %s" % (ebuild.relative_path, eapi)) + + return True + + return False + + def _checkDeprecated(self, ebuild, eapi): + if self.repo_settings.repo_config.eapi_is_deprecated(eapi): + self.qatracker.add_error( + "repo.eapi.deprecated", "%s: %s" % (ebuild.relative_path, eapi)) + + return True + + return False diff --git a/pym/repoman/main.py b/pym/repoman/main.py index bacc25f..6bfd1be 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -61,6 +61,7 @@ from repoman.check_missingslot import check_missingslot from repoman.checks.ebuilds.misc import bad_split_check, pkg_invalid from repoman.checks.ebuilds.pkgmetadata import PkgMetadata from repoman.checks.ebuilds.use_flags import USEFlagChecks +from repoman.checks.ebuilds.variables.eapi import EAPIChecks from repoman.ebuild import Ebuild from repoman.errors import err from repoman.modules.commit import repochecks @@ -295,6 +296,7 @@ use_flag_checks = USEFlagChecks(qatracker, uselist) keywordcheck = KeywordChecks(qatracker, options) liveeclasscheck = LiveEclassChecks(qatracker) rubyeclasscheck = RubyEclassChecks(qatracker) +eapicheck = EAPIChecks(qatracker, repo_settings) ## for xpkg in effective_scanlist: @@ -396,13 +398,9 @@ for xpkg in effective_scanlist: inherited = pkg.inherited live_ebuild = live_eclasses.intersection(inherited) - if repo_settings.repo_config.eapi_is_banned(eapi): - qatracker.add_error( - "repo.eapi.banned", "%s: %s" % (ebuild.relative_path, eapi)) - - elif repo_settings.repo_config.eapi_is_deprecated(eapi): - qatracker.add_error( - "repo.eapi.deprecated", "%s: %s" % (ebuild.relative_path, eapi)) + ### + eapicheck.check(pkg, ebuild) + ### for k, v in myaux.items(): if not isinstance(v, basestring):
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/
commit: f8dc20495c0d634eedfd15d3ddc9f9e25d69d42e
Author: Brian Dolbec gentoo org>
AuthorDate: Tue Jun 3 19:39:56 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:47:36 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f8dc2049
repoman.../use_flags.py: Reset state variables for each check() run
Also double space function separations.
pym/repoman/checks/ebuilds/use_flags.py | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/pym/repoman/checks/ebuilds/use_flags.py
b/pym/repoman/checks/ebuilds/use_flags.py
index bc09ed7..d63ae6d 100644
--- a/pym/repoman/checks/ebuilds/use_flags.py
+++ b/pym/repoman/checks/ebuilds/use_flags.py
@@ -19,10 +19,11 @@ class USEFlagChecks(object):
@param globalUseFlags: Global USE flags
'''
self.qatracker = qatracker
+ self.globalUseFlags = globalUseFlags
self.useFlags = []
self.defaultUseFlags = []
self.usedUseFlags = set()
- self.globalUseFlags = globalUseFlags
+
def check(self, pkg, package, ebuild, y_ebuild, localUseFlags):
'''Perform the check.
@@ -33,14 +34,20 @@ class USEFlagChecks(object):
@param y_ebuild: Ebuild which we check (string).
@param localUseFlags: Local USE flags of the package
'''
+ # reset state variables for the run
+ self.useFlags = []
+ self.defaultUseFlags = []
+ self.usedUseFlags = set()
self._checkGlobal(pkg)
self._checkMetadata(package, ebuild, y_ebuild, localUseFlags)
self._checkRequiredUSE(pkg, ebuild)
+
def getUsedUseFlags(self):
'''Get the USE flags that this check has seen'''
return self.usedUseFlags
+
def _checkGlobal(self, pkg):
for myflag in pkg._metadata["IUSE"].split():
flag_name = myflag.lstrip("+-")
@@ -50,6 +57,7 @@ class USEFlagChecks(object):
if flag_name not in self.globalUseFlags:
self.useFlags.append(flag_name)
+
def _checkMetadata(self, package, ebuild, y_ebuild, localUseFlags):
for mypos in range(len(self.useFlags) - 1, -1, -1):
if self.useFlags[mypos] and (self.useFlags[mypos] in
localUseFlags):
@@ -67,6 +75,7 @@ class USEFlagChecks(object):
"IUSE.invalid",
"%s/%s.ebuild: %s" % (package, y_ebuild,
self.useFlags[mypos]))
+
def _checkRequiredUSE(self, pkg, ebuild):
required_use = pkg._metadata["REQUIRED_USE"]
if required_use:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/
commit: c9075d299c3e1ebaa0b113b2c6ecae58cf6a0a26
Author: Tom Wijsman gentoo org>
AuthorDate: Mon Jun 2 16:24:03 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:47:34 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c9075d29
repoman/checks/ebuild/thirdpartymirrors.py: Fix logic
pym/repoman/checks/ebuilds/thirdpartymirrors.py | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/thirdpartymirrors.py
b/pym/repoman/checks/ebuilds/thirdpartymirrors.py
index cce61f6..f867c19 100644
--- a/pym/repoman/checks/ebuilds/thirdpartymirrors.py
+++ b/pym/repoman/checks/ebuilds/thirdpartymirrors.py
@@ -5,13 +5,15 @@ import portage
class ThirdPartyMirrors(object):
def __init__(self, repoman_settings, qatracker):
- # Build a regex from thirdpartymirrors for the SRC_URI.mirror
check.
+ # TODO: Build a regex instead here, for the SRC_URI.mirror
check.
self.thirdpartymirrors = {}
- for k, v in repoman_settings.thirdpartymirrors().items():
- for v in v:
- if not v.endswith("/"):
- v += "/"
- self.thirdpartymirrors[v] = k
+ profile_thirdpartymirrors =
repoman_settings.thirdpartymirrors().items()
+ for mirror_alias, mirrors in profile_thirdpartymirrors:
+ for mirror in mirrors:
+ if not mirror.endswith("/"):
+ mirror += "/"
+ self.thirdpartymirrors[mirror] = mirror_alias
+
self.qatracker = qatracker
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 276ecb79e7e04b61f9463efc5178c57fc899420b
Author: Brian Dolbec gentoo org>
AuthorDate: Tue Jun 3 18:02:47 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:47:36 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=276ecb79
repoman/main.py: Remove some temporary dubug print()
pym/repoman/main.py | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 58f6b8c..e942dca 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -119,15 +119,11 @@ if options.experimental_inherit == 'y':
can_force = True
portdir, portdir_overlay, mydir = utilities.FindPortdir(repoman_settings)
-print("portdir", portdir)
-print("portdir_overlay", portdir_overlay)
-print("mydir", mydir)
if portdir is None:
sys.exit(1)
myreporoot = os.path.basename(portdir_overlay)
myreporoot += mydir[len(portdir_overlay):]
-print("myreporoot", myreporoot)
##
vcs_settings = VCSSettings(options, repoman_settings)
@@ -292,7 +288,7 @@ for xpkg in effective_scanlist:
checkdir_relative = os.path.join(catdir, checkdir_relative)
checkdir_relative = os.path.join(".", checkdir_relative)
-#^^
+#
manifester = Manifests(options, qatracker, repoman_settings)
if manifester.run(checkdir, portdb):
continue
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/herds/, pym/repoman/modules/commit/
commit: 4ec62135392e08f38aaec5e27ce6392ce5015fef
Author: Tom Wijsman gentoo org>
AuthorDate: Tue Jun 3 11:42:39 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:47:35 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4ec62135
repoman: Fix up pyflakes imports and undefined functions or values
pym/repoman/_xml.py | 5 +
pym/repoman/checks/herds/herdbase.py | 2 ++
pym/repoman/copyrights.py| 10 --
pym/repoman/modules/commit/repochecks.py | 2 --
pym/repoman/profile.py | 3 ++-
5 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/pym/repoman/_xml.py b/pym/repoman/_xml.py
index 1871875..b97c027 100644
--- a/pym/repoman/_xml.py
+++ b/pym/repoman/_xml.py
@@ -55,7 +55,6 @@ class XmlLint(object):
self.binary = None
self._check_capable(options, repolevel, repoman_settings)
-
def _check_capable(self, options, repolevel, repoman_settings):
if options.mode == "manifest":
return
@@ -71,15 +70,13 @@ class XmlLint(object):
# this can be problematic if xmllint changes their
output
self._is_capable = True
-
@property
def capable(self):
return self._is_capable
-
def check(self, checkdir):
if not self.capable:
- return true
+ return True
# xmlint can produce garbage output even on success, so only
dump
# the ouput when it fails.
st, out = repoman_getstatusoutput(
diff --git a/pym/repoman/checks/herds/herdbase.py
b/pym/repoman/checks/herds/herdbase.py
index b1ba671..cfa37e4 100644
--- a/pym/repoman/checks/herds/herdbase.py
+++ b/pym/repoman/checks/herds/herdbase.py
@@ -24,6 +24,8 @@ from portage import _encodings, _unicode_encode
from portage.exception import FileNotFound, ParseError, PermissionDenied
from portage import os
+from repoman.errors import err
+
__all__ = [
"make_herd_base", "get_herd_base"
]
diff --git a/pym/repoman/copyrights.py b/pym/repoman/copyrights.py
index 01ce42f..056cfda 100644
--- a/pym/repoman/copyrights.py
+++ b/pym/repoman/copyrights.py
@@ -87,11 +87,11 @@ def update_copyright(fn_path, year, pretend=False):
new_header.append(line)
difflines = 0
- for line in difflib.unified_diff(
- [_unicode_decode(line) for line in orig_header],
- [_unicode_decode(line) for line in new_header],
+ for diffline in difflib.unified_diff(
+ [_unicode_decode(diffline) for diffline in orig_header],
+ [_unicode_decode(diffline) for diffline in new_header],
fromfile=fn_path, tofile=fn_path, n=0):
- util.writemsg_stdout(line, noiselevel=-1)
+ util.writemsg_stdout(diffline, noiselevel=-1)
difflines += 1
util.writemsg_stdout("\n", noiselevel=-1)
@@ -117,5 +117,3 @@ def update_copyright(fn_path, year, pretend=False):
else:
util.apply_stat_permissions(fn_path, fn_stat)
fn_hdl.close()
-
-
diff --git a/pym/repoman/modules/commit/repochecks.py
b/pym/repoman/modules/commit/repochecks.py
index d0e2f28..2839864 100644
--- a/pym/repoman/modules/commit/repochecks.py
+++ b/pym/repoman/modules/commit/repochecks.py
@@ -1,9 +1,7 @@
-
from portage.output import red
from repoman.errors import err
-from repoman.vcs import vcs
from repoman.vcs.vcs import detect_vcs_conflicts
diff --git a/pym/repoman/profile.py b/pym/repoman/profile.py
index 03e6c24..11b93c7 100644
--- a/pym/repoman/profile.py
+++ b/pym/repoman/profile.py
@@ -1,6 +1,7 @@
-from portage import os
from portage import normalize_path
+from portage import os
+from portage.output import red
class ProfileDesc(object):
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/, pym/repoman/, pym/repoman/vcs/
commit: d02cf32e1a129d3bf00da73da2766e234b5ab95e Author: Brian Dolbec gentoo org> AuthorDate: Tue Jun 3 05:38:19 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Sat Sep 5 21:47:35 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d02cf32e Repoman: Create repoman/_portage.py to centrally import portage for all modules This prevents repository errors when running repoman on non repos.conf repositories. For some reason submodule imports of portage did not contain the repo being scanned. checks.py: sort the imports. argparser.py: fix a lack of a newline at the end of the file. pym/repoman/_portage.py | 26 + pym/repoman/_subprocess.py | 4 +++- pym/repoman/_xml.py | 4 +++- pym/repoman/argparser.py| 5 - pym/repoman/checks/ebuilds/checks.py| 8 ++-- pym/repoman/checks/ebuilds/fetches.py | 4 +++- pym/repoman/checks/ebuilds/isebuild.py | 4 +++- pym/repoman/checks/ebuilds/manifests.py | 10 ++ pym/repoman/checks/ebuilds/misc.py | 3 ++- pym/repoman/checks/ebuilds/pkgmetadata.py | 4 +++- pym/repoman/checks/ebuilds/thirdpartymirrors.py | 3 ++- pym/repoman/main.py | 12 pym/repoman/metadata.py | 4 +++- pym/repoman/qa_data.py | 5 - pym/repoman/repos.py| 4 +++- pym/repoman/utilities.py| 4 +++- pym/repoman/vcs/vcsstatus.py| 4 +++- 17 files changed, 85 insertions(+), 23 deletions(-) diff --git a/pym/repoman/_portage.py b/pym/repoman/_portage.py new file mode 100644 index 000..e72ce9f --- /dev/null +++ b/pym/repoman/_portage.py @@ -0,0 +1,26 @@ + +'''repoman/_portage.py +Central location for the portage import. +There were problems when portage was imported by submodules +due to the portage instance was somehow different that the +initial portage import in main.py. The later portage imports +did not contain the repo it was working on. That repo was my cvs tree +and not listed in those subsequent portage imports. + +All modules should import portage from this one + +from repoman._portage import portage + +Then continue to import the remaining portage modules needed +''' + +import sys + +from os import path as osp +pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__ +sys.path.insert(0, pym_path) + +import portage +portage._internal_caller = True +portage._disable_legacy_globals() + diff --git a/pym/repoman/_subprocess.py b/pym/repoman/_subprocess.py index 3a404ce..5449e64 100644 --- a/pym/repoman/_subprocess.py +++ b/pym/repoman/_subprocess.py @@ -4,7 +4,9 @@ import codecs import subprocess import sys -import portage +# import our initialized portage instance +from repoman._portage import portage + from portage import os from portage.process import find_binary from portage import _encodings, _unicode_encode diff --git a/pym/repoman/_xml.py b/pym/repoman/_xml.py index 513b62a..1871875 100644 --- a/pym/repoman/_xml.py +++ b/pym/repoman/_xml.py @@ -2,7 +2,9 @@ import sys import xml -import portage +# import our initialized portage instance +from repoman._portage import portage + from portage import os from portage.output import red from portage.process import find_binary diff --git a/pym/repoman/argparser.py b/pym/repoman/argparser.py index 45f65fd..1c9bd45 100644 --- a/pym/repoman/argparser.py +++ b/pym/repoman/argparser.py @@ -7,10 +7,13 @@ import logging import sys -import portage +# import our initialized portage instance +from repoman._portage import portage + from portage import util from portage.util._argparse import ArgumentParser + def parse_args(argv, qahelp, repoman_default_opts): """Use a customized optionParser to parse command line arguments for repoman Args: diff --git a/pym/repoman/checks/ebuilds/checks.py b/pym/repoman/checks/ebuilds/checks.py index 694d677..b3c988a 100644 --- a/pym/repoman/checks/ebuilds/checks.py +++ b/pym/repoman/checks/ebuilds/checks.py @@ -11,13 +11,17 @@ import codecs from itertools import chain import re import time -import repoman.checks.ebuilds.errors as errors -import portage + +# 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) +import repoman.checks.ebuilds.errors as errors + class LineCheck(object): """Run a check on a line of an ebuild.""" diff --git a/pym/repoman/checks/ebuilds/fetches.py b/pym/repoman/checks/ebuilds/fetches.py index ccf9ff9..22e89b6 100644 --- a/pym/repoman/checks/ebuilds/fetches.py +++ b/pym/repoman/checks/eb
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/variables/, pym/repoman/
commit: c5a78a6bfae80827bb1ea5e2593dd6ea6bf2e5d0 Author: Tom Wijsman gentoo org> AuthorDate: Fri Jun 6 15:23:33 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Sat Sep 5 21:47:38 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c5a78a6b repoman/main.py: Split RESTRICT checks to checks/ebuild/variables/ pym/repoman/checks/ebuilds/variables/restrict.py | 41 pym/repoman/main.py | 25 --- 2 files changed, 47 insertions(+), 19 deletions(-) diff --git a/pym/repoman/checks/ebuilds/variables/restrict.py b/pym/repoman/checks/ebuilds/variables/restrict.py new file mode 100644 index 000..215b792 --- /dev/null +++ b/pym/repoman/checks/ebuilds/variables/restrict.py @@ -0,0 +1,41 @@ + +'''restrict.py +Perform checks on the RESTRICT variable. +''' + +# import our initialized portage instance +from repoman._portage import portage + +from repoman.qa_data import valid_restrict + + +class RestrictChecks(object): + '''Perform checks on the RESTRICT variable.''' + + def __init__(self, qatracker): + ''' + @param qatracker: QATracker instance + ''' + self.qatracker = qatracker + + def check(self, pkg, package, ebuild, y_ebuild): + myrestrict = None + + try: + myrestrict = portage.dep.use_reduce( + pkg._metadata["RESTRICT"], matchall=1, flat=True) + except portage.exception.InvalidDependString as e: + self. qatracker.add_error( + "RESTRICT.syntax", + "%s: RESTRICT: %s" % (ebuild.relative_path, e)) + del e + + if myrestrict: + myrestrict = set(myrestrict) + mybadrestrict = myrestrict.difference(valid_restrict) + + if mybadrestrict: + for mybad in mybadrestrict: + self.qatracker.add_error( + "RESTRICT.invalid", + package + "/" + y_ebuild + ".ebuild: %s" % mybad) diff --git a/pym/repoman/main.py b/pym/repoman/main.py index fd7baa0..582370e 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -64,6 +64,7 @@ from repoman.checks.ebuilds.use_flags import USEFlagChecks from repoman.checks.ebuilds.variables.description import DescriptionChecks from repoman.checks.ebuilds.variables.eapi import EAPIChecks from repoman.checks.ebuilds.variables.license import LicenseChecks +from repoman.checks.ebuilds.variables.restrict import RestrictChecks from repoman.ebuild import Ebuild from repoman.errors import err from repoman.modules.commit import repochecks @@ -71,7 +72,7 @@ from repoman.profile import check_profiles, dev_keywords, setup_profile from repoman.qa_data import ( format_qa_output, format_qa_output_column, qahelp, qawarnings, qacats, missingvars, - suspect_virtual, suspect_rdepend, valid_restrict) + suspect_virtual, suspect_rdepend) from repoman.qa_tracker import QATracker from repoman.repos import RepoSettings, repo_metadata from repoman.scan import Changes, scan @@ -301,6 +302,7 @@ rubyeclasscheck = RubyEclassChecks(qatracker) eapicheck = EAPIChecks(qatracker, repo_settings) descriptioncheck = DescriptionChecks(qatracker) licensecheck = LicenseChecks(qatracker, liclist, liclist_deprecated) +restrictcheck = RestrictChecks(qatracker) ## for xpkg in effective_scanlist: @@ -623,24 +625,9 @@ for xpkg in effective_scanlist: licensecheck.check(pkg, xpkg, ebuild, y_ebuild) # - # restrict checks - myrestrict = None - try: - myrestrict = portage.dep.use_reduce( - myaux["RESTRICT"], matchall=1, flat=True) - except portage.exception.InvalidDependString as e: - qatracker.add_error( - "RESTRICT.syntax", - "%s: RESTRICT: %s" % (ebuild.relative_path, e)) - del e - if myrestrict: - myrestrict = set(myrestrict) - mybadrestrict = myrestrict.difference(valid_restrict) - if mybadrestrict: - for mybad in mybadrestrict: - qatracker.add_error( - "RESTRICT.invalid", - xpkg + "/" + y_ebuild + ".ebuild: %s" % mybad) + # + restrictcheck.check(pkg, xpkg, ebuild, y_ebuild) + #
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/eclasses/
commit: 6811087cc9520c0d5b7e50350a7c9302ba9c539d
Author: Tom Wijsman gentoo org>
AuthorDate: Wed Jun 4 13:58:31 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:47:37 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=6811087c
repoman/main.py: Split Ruby checks to checks/ebuild/eclass/ruby.py
pym/repoman/checks/ebuilds/eclasses/__init__.py | 0
pym/repoman/checks/ebuilds/eclasses/ruby.py | 32 +
pym/repoman/main.py | 18 --
3 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/eclasses/__init__.py
b/pym/repoman/checks/ebuilds/eclasses/__init__.py
new file mode 100644
index 000..e69de29
diff --git a/pym/repoman/checks/ebuilds/eclasses/ruby.py
b/pym/repoman/checks/ebuilds/eclasses/ruby.py
new file mode 100644
index 000..abfb166
--- /dev/null
+++ b/pym/repoman/checks/ebuilds/eclasses/ruby.py
@@ -0,0 +1,32 @@
+
+'''live.py
+Performs Ruby eclass checks
+'''
+
+from repoman.qa_data import ruby_deprecated
+
+
+class RubyEclassChecks(object):
+ '''Performs checks for the usage of Ruby eclasses in ebuilds'''
+
+ def __init__(self, qatracker):
+ '''
+ @param qatracker: QATracker instance
+ '''
+ self.qatracker = qatracker
+ self.old_ruby_eclasses = ["ruby-ng", "ruby-fakegem", "ruby"]
+
+ def check(self, pkg, ebuild):
+ is_inherited = lambda eclass: eclass in pkg.inherited
+ is_old_ruby_eclass_inherited = filter(
+ is_inherited, self.old_ruby_eclasses)
+
+ if is_old_ruby_eclass_inherited:
+ ruby_intersection =
pkg.iuse.all.intersection(ruby_deprecated)
+
+ if ruby_intersection:
+ for myruby in ruby_intersection:
+ self.qatracker.add_error(
+ "IUSE.rubydeprecated",
+ (ebuild.relative_path + ":
Deprecated ruby target: %s")
+ % myruby)
\ No newline at end of file
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 305e0b1..7795f2f 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -51,6 +51,7 @@ from repoman.argparser import parse_args
from repoman.checks.directories.files import FileChecks
from repoman.checks.ebuilds.checks import run_checks, checks_init
from repoman.checks.ebuilds.eclasses.live import LiveEclassChecks
+from repoman.checks.ebuilds.eclasses.ruby import RubyEclassChecks
from repoman.checks.ebuilds.fetches import FetchChecks
from repoman.checks.ebuilds.keywords import KeywordChecks
from repoman.checks.ebuilds.isebuild import IsEbuild
@@ -67,7 +68,7 @@ from repoman.profile import check_profiles, dev_keywords,
setup_profile
from repoman.qa_data import (
format_qa_output, format_qa_output_column, qahelp,
qawarnings, qacats, max_desc_len, missingvars,
- ruby_deprecated, suspect_virtual, suspect_rdepend, valid_restrict)
+ suspect_virtual, suspect_rdepend, valid_restrict)
from repoman.qa_tracker import QATracker
from repoman.repos import RepoSettings, repo_metadata
from repoman.scan import Changes, scan
@@ -290,6 +291,7 @@ thirdparty = ThirdPartyMirrors(repoman_settings, qatracker)
use_flag_checks = USEFlagChecks(qatracker, uselist)
keywordcheck = KeywordChecks(qatracker, options)
liveeclasscheck = LiveEclassChecks(qatracker)
+rubyeclasscheck = RubyEclassChecks(qatracker)
##
for xpkg in effective_scanlist:
@@ -615,18 +617,8 @@ for xpkg in effective_scanlist:
ebuild_used_useflags = use_flag_checks.getUsedUseFlags()
used_useflags = used_useflags.union(ebuild_used_useflags)
#
-
- # Check for outdated RUBY targets
- old_ruby_eclasses = ["ruby-ng", "ruby-fakegem", "ruby"]
- is_old_ruby_eclass_inherited = filter(
- lambda e: e in inherited, old_ruby_eclasses)
- if is_old_ruby_eclass_inherited:
- ruby_intersection =
pkg.iuse.all.intersection(ruby_deprecated)
- if ruby_intersection:
- for myruby in ruby_intersection:
-
qatracker.add_error("IUSE.rubydeprecated",
- (ebuild.relative_path + ":
Deprecated ruby target: %s")
- % myruby)
+ rubyeclasscheck.check(pkg, ebuild)
+ #
# license checks
if not badlicsyntax:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 7ec83c60eb7e3e667b526f795b79d5917eb7ba88
Author: Brian Dolbec gentoo org>
AuthorDate: Tue Jun 3 18:00:05 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:47:35 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=7ec83c60
Repoman: Refactor repos.RepoSettings class, fix the repoman_settings not being
re-assigned
When the repo is not in the confiig'd repos, it creates a ne repoman_settings
object which contains
the temporaily activated repo. main.py was not re-assigning repoman_settings
to the new object.
Split out _add_repo() to it's own function.
Split out the gpg-sign specific function for git into plugin-ready functions,
for later.
pym/repoman/main.py | 2 +
pym/repoman/repos.py | 119 ---
2 files changed, 77 insertions(+), 44 deletions(-)
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 30487b5..58f6b8c 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -138,6 +138,8 @@ vcs_settings = VCSSettings(options, repoman_settings)
repo_settings = RepoSettings(config_root, portdir, portdir_overlay,
repoman_settings, vcs_settings, options, qawarnings)
+repoman_settings = repo_settings.repoman_settings
+
portdb = repo_settings.portdb
##
diff --git a/pym/repoman/repos.py b/pym/repoman/repos.py
index b79e241..6bd1eb4 100644
--- a/pym/repoman/repos.py
+++ b/pym/repoman/repos.py
@@ -26,75 +26,46 @@ class RepoSettings(object):
def __init__(self, config_root, portdir, portdir_overlay,
repoman_settings=None, vcs_settings=None, options=None,
qawarnings=None):
+ self.repoman_settings = repoman_settings
+ self.vcs_settings = vcs_settings
+
# Ensure that current repository is in the list of enabled
repositories.
self.repodir = os.path.realpath(portdir_overlay)
try:
repoman_settings.repositories.get_repo_for_location(self.repodir)
except KeyError:
- self.repo_conf = portage.repository.config
- self.repo_name =
self.repo_conf.RepoConfig._read_valid_repo_name(portdir_overlay)[0]
- self.layout_conf_data =
self.repo_conf.parse_layout_conf(portdir_overlay)[0]
- if self.layout_conf_data['repo-name']:
- self.repo_name =
self.layout_conf_data['repo-name']
- tmp_conf_file = io.StringIO(textwrap.dedent("""
- [%s]
- location = %s
- """) % (self.repo_name, portdir_overlay))
- # Ensure that the repository corresponding to $PWD
overrides a
- # repository of the same name referenced by the
existing PORTDIR
- # or PORTDIR_OVERLAY settings.
- repoman_settings['PORTDIR_OVERLAY'] = "%s %s" % (
- repoman_settings.get('PORTDIR_OVERLAY', ''),
- portage._shell_quote(portdir_overlay))
- self.repositories =
self.repo_conf.load_repository_config(
- repoman_settings, extra_files=[tmp_conf_file])
- # We have to call the config constructor again so that
attributes
- # dependent on config.repositories are initialized
correctly.
- repoman_settings = portage.config(
- config_root=config_root, local_config=False,
repositories=self.repositories)
+ self._add_repo(config_root, portdir_overlay)
- self.root = repoman_settings['EROOT']
+ self.root = self.repoman_settings['EROOT']
self.trees = {
- self.root: {'porttree':
portage.portagetree(settings=repoman_settings)}
+ self.root: {'porttree':
portage.portagetree(settings=self.repoman_settings)}
}
self.portdb = self.trees[self.root]['porttree'].dbapi
# Constrain dependency resolution to the master(s)
# that are specified in layout.conf.
- self.repo_config =
repoman_settings.repositories.get_repo_for_location(self.repodir)
+ self.repo_config =
self.repoman_settings.repositories.get_repo_for_location(self.repodir)
self.portdb.porttrees =
list(self.repo_config.eclass_db.porttrees)
self.portdir = self.portdb.porttrees[0]
self.commit_env = os.environ.copy()
# list() is for iteration on a copy.
- for repo in list(repoman_settings.repositories):
+ for repo in list(self.repoman_settings.repositories):
# all paths are canonical
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 40d8842c79a236be9f265ad1daeb330a0fd57648
Author: Tom Wijsman gentoo org>
AuthorDate: Mon Jun 2 17:00:53 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:47:34 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=40d8842c
repoman/main.py: Add global_pmaskdict param to has_global_mask call
pym/repoman/main.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 0387214..5aa6ad8 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -481,7 +481,7 @@ for xpkg in effective_scanlist:
(xpkg, y_ebuild, bad_stable_keywords))
del bad_stable_keywords
- if keywords and not has_global_mask(pkg):
+ if keywords and not has_global_mask(pkg,
global_pmaskdict):
qatracker.add_error("LIVEVCS.unmasked",
ebuild.relative_path)
if options.ignore_arches:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/commit/, pym/repoman/
commit: bb73c4c47dc6372d239caa1d4b77769ea916ee33
Author: Tom Wijsman gentoo org>
AuthorDate: Mon Jun 2 18:28:34 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:47:34 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=bb73c4c4
repoman: Fix up commit imports and calls
pym/repoman/argparser.py | 3 ++-
pym/repoman/copyrights.py| 2 +-
pym/repoman/main.py | 24 ++--
pym/repoman/modules/commit/repochecks.py | 3 ++-
4 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/pym/repoman/argparser.py b/pym/repoman/argparser.py
index 5378e36..45f65fd 100644
--- a/pym/repoman/argparser.py
+++ b/pym/repoman/argparser.py
@@ -8,6 +8,7 @@ import logging
import sys
import portage
+from portage import util
from portage.util._argparse import ArgumentParser
def parse_args(argv, qahelp, repoman_default_opts):
@@ -176,7 +177,7 @@ def parse_args(argv, qahelp, repoman_default_opts):
opts, args = parser.parse_known_args(argv[1:])
if not opts.ignore_default_opts:
- default_opts = portage.util.shlex_split(repoman_default_opts)
+ default_opts = util.shlex_split(repoman_default_opts)
if default_opts:
opts, args = parser.parse_known_args(default_opts +
sys.argv[1:])
diff --git a/pym/repoman/copyrights.py b/pym/repoman/copyrights.py
index 231857f..01ce42f 100644
--- a/pym/repoman/copyrights.py
+++ b/pym/repoman/copyrights.py
@@ -83,7 +83,7 @@ def update_copyright(fn_path, year, pretend=False):
new_header.append(line)
break
- line = _update_copyright_year(year, line)
+ line = update_copyright_year(year, line)
new_header.append(line)
difflines = 0
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 5aa6ad8..31d2b77 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -59,7 +59,7 @@ from repoman.checks.ebuilds.misc import bad_split_check,
pkg_invalid
from repoman.checks.ebuilds.pkgmetadata import PkgMetadata
from repoman.ebuild import Ebuild
from repoman.errors import err
-from repoman.modules import commit
+from repoman.modules.commit import repochecks
from repoman.profile import check_profiles, dev_keywords, setup_profile
from repoman.qa_data import (format_qa_output, format_qa_output_column, qahelp,
qawarnings, qacats, max_desc_len, missingvars,
@@ -190,8 +190,8 @@ repolevel = len(reposplit)
###
if options.mode == 'commit':
- commit.repochecks.commit_check(repolevel, reposplit)
- commit.repochecks.conflict_check(vcs_settings, options)
+ repochecks.commit_check(repolevel, reposplit)
+ repochecks.conflict_check(vcs_settings, options)
###
@@ -268,7 +268,8 @@ check_ebuild_notadded = not \
effective_scanlist = scanlist
if options.if_modified == "y":
effective_scanlist = sorted(vcs_files_to_cps(
- chain(changed.changed, changed.new, changed.removed)))
+ chain(changed.changed, changed.new, changed.removed),
+ repolevel, reposplit, categories))
for xpkg in effective_scanlist:
# ebuilds and digests added to cvs respectively.
@@ -1282,7 +1283,8 @@ else:
else:
commitmessage =
utilities.get_commit_message_with_stdin()
except KeyboardInterrupt:
- exithandler()
+ logging.fatal("Interrupted; exiting...")
+ sys.exit(1)
if (not commitmessage or not commitmessage.strip()
or commitmessage.strip() == msg_prefix):
print("* no commit message? aborting commit.")
@@ -1343,7 +1345,8 @@ else:
logging.info("checking for unmodified ChangeLog files")
committer_name =
utilities.get_committer_name(env=repoman_settings)
for x in sorted(vcs_files_to_cps(
- chain(myupdates, mymanifests, myremoved))):
+ chain(myupdates, mymanifests, myremoved),
+ repolevel, reposplit, categories)):
catdir, pkgdir = x.split("/")
checkdir = repo_settings.repodir + "/" + x
checkdir_relative = ""
@@ -1483,7 +1486,7 @@ else:
print("%s have headers that will change." %
green(str(len(myheaders
print(
- "* Files with headers will "
+ "* Files with headers will"
" cause the manifests to be changed and committed
separately.")
logging.info("myupdates: %s", myupdates)
@@ -1637,9 +1640,9 @@ else:
"doing the entire repository.\"\n")
if vcs_settings.vcs in
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/directories/
commit: aef672068e2328cfc94642e41812a4cbb2066bef Author: Tom Wijsman gentoo org> AuthorDate: Mon Jun 2 15:58:38 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Sat Sep 5 21:47:33 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=aef67206 repoman/checks/directories/files.py: Fix to use global vcs_new_changed pym/repoman/checks/directories/files.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pym/repoman/checks/directories/files.py b/pym/repoman/checks/directories/files.py index 5dfca25..87220c0 100644 --- a/pym/repoman/checks/directories/files.py +++ b/pym/repoman/checks/directories/files.py @@ -40,7 +40,7 @@ class FileChecks(object): if index != -1: y_relative = os.path.join(checkdir_relative, y_file) invcs = self.vcs_settings.vcs is not None - inchangeset = self.vcs_new_changed(y_relative, changed, new) + inchangeset = vcs_new_changed(y_relative, changed, new) if invcs and not inchangeset: # If the file isn't in the VCS new or changed set, then # assume that it's an irrelevant temporary file (Manifest
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/vcs/, pym/repoman/, pym/repoman/checks/ebuilds/
commit: 14fc1762a2c3e41c1c812af4a90a1731247bf6fd Author: Brian Dolbec gentoo org> AuthorDate: Tue Jun 3 05:38:19 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Sat Sep 5 21:26:56 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=14fc1762 Repoman: Create repoman/_portage.py to centrally import portage for all modules This prevents repository errors when running repoman on non repos.conf repositories. For some reason submodule imports of portage did not contain the repo being scanned. checks.py: sort the imports. argparser.py: fix a lack of a newline at the end of the file. pym/repoman/_portage.py | 26 + pym/repoman/_subprocess.py | 4 +++- pym/repoman/_xml.py | 4 +++- pym/repoman/argparser.py| 5 - pym/repoman/checks/ebuilds/checks.py| 8 ++-- pym/repoman/checks/ebuilds/fetches.py | 4 +++- pym/repoman/checks/ebuilds/isebuild.py | 4 +++- pym/repoman/checks/ebuilds/manifests.py | 10 ++ pym/repoman/checks/ebuilds/misc.py | 3 ++- pym/repoman/checks/ebuilds/pkgmetadata.py | 4 +++- pym/repoman/checks/ebuilds/thirdpartymirrors.py | 3 ++- pym/repoman/main.py | 12 pym/repoman/metadata.py | 4 +++- pym/repoman/qa_data.py | 5 - pym/repoman/repos.py| 4 +++- pym/repoman/utilities.py| 4 +++- pym/repoman/vcs/vcsstatus.py| 4 +++- 17 files changed, 85 insertions(+), 23 deletions(-) diff --git a/pym/repoman/_portage.py b/pym/repoman/_portage.py new file mode 100644 index 000..e72ce9f --- /dev/null +++ b/pym/repoman/_portage.py @@ -0,0 +1,26 @@ + +'''repoman/_portage.py +Central location for the portage import. +There were problems when portage was imported by submodules +due to the portage instance was somehow different that the +initial portage import in main.py. The later portage imports +did not contain the repo it was working on. That repo was my cvs tree +and not listed in those subsequent portage imports. + +All modules should import portage from this one + +from repoman._portage import portage + +Then continue to import the remaining portage modules needed +''' + +import sys + +from os import path as osp +pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__ +sys.path.insert(0, pym_path) + +import portage +portage._internal_caller = True +portage._disable_legacy_globals() + diff --git a/pym/repoman/_subprocess.py b/pym/repoman/_subprocess.py index 3a404ce..5449e64 100644 --- a/pym/repoman/_subprocess.py +++ b/pym/repoman/_subprocess.py @@ -4,7 +4,9 @@ import codecs import subprocess import sys -import portage +# import our initialized portage instance +from repoman._portage import portage + from portage import os from portage.process import find_binary from portage import _encodings, _unicode_encode diff --git a/pym/repoman/_xml.py b/pym/repoman/_xml.py index 513b62a..1871875 100644 --- a/pym/repoman/_xml.py +++ b/pym/repoman/_xml.py @@ -2,7 +2,9 @@ import sys import xml -import portage +# import our initialized portage instance +from repoman._portage import portage + from portage import os from portage.output import red from portage.process import find_binary diff --git a/pym/repoman/argparser.py b/pym/repoman/argparser.py index 45f65fd..1c9bd45 100644 --- a/pym/repoman/argparser.py +++ b/pym/repoman/argparser.py @@ -7,10 +7,13 @@ import logging import sys -import portage +# import our initialized portage instance +from repoman._portage import portage + from portage import util from portage.util._argparse import ArgumentParser + def parse_args(argv, qahelp, repoman_default_opts): """Use a customized optionParser to parse command line arguments for repoman Args: diff --git a/pym/repoman/checks/ebuilds/checks.py b/pym/repoman/checks/ebuilds/checks.py index 694d677..b3c988a 100644 --- a/pym/repoman/checks/ebuilds/checks.py +++ b/pym/repoman/checks/ebuilds/checks.py @@ -11,13 +11,17 @@ import codecs from itertools import chain import re import time -import repoman.checks.ebuilds.errors as errors -import portage + +# 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) +import repoman.checks.ebuilds.errors as errors + class LineCheck(object): """Run a check on a line of an ebuild.""" diff --git a/pym/repoman/checks/ebuilds/fetches.py b/pym/repoman/checks/ebuilds/fetches.py index ccf9ff9..22e89b6 100644 --- a/pym/repoman/checks/ebuilds/fetches.py +++ b/pym/repoman/checks/eb
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/, pym/repoman/
commit: 1e94e75c15a2f402ba3c9e47bbea60a5d20066f9
Author: Tom Wijsman gentoo org>
AuthorDate: Tue Jun 3 11:15:10 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:26:57 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=1e94e75c
repoman/main.py: Split USE flag checks to checks/ebuilds/use_flags.py
pym/repoman/checks/ebuilds/misc.py | 2 +-
pym/repoman/checks/ebuilds/use_flags.py | 85 +
pym/repoman/main.py | 52
3 files changed, 95 insertions(+), 44 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/misc.py
b/pym/repoman/checks/ebuilds/misc.py
index 3bf61f0..744784a 100644
--- a/pym/repoman/checks/ebuilds/misc.py
+++ b/pym/repoman/checks/ebuilds/misc.py
@@ -39,7 +39,7 @@ def bad_split_check(xpkg, y_ebuild, pkgdir, qatracker):
return False
-def pkg_invalid(pkg, qatracker):
+def pkg_invalid(pkg, qatracker, ebuild):
'''Checks for invalid packages
@param pkg: _emerge.Package instance
diff --git a/pym/repoman/checks/ebuilds/use_flags.py
b/pym/repoman/checks/ebuilds/use_flags.py
new file mode 100644
index 000..bc09ed7
--- /dev/null
+++ b/pym/repoman/checks/ebuilds/use_flags.py
@@ -0,0 +1,85 @@
+
+'''use_flags.py
+Performs USE flag related checks
+'''
+
+# import our centrally initialized portage instance
+from repoman._portage import portage
+
+from portage import eapi
+from portage.eapi import eapi_has_iuse_defaults, eapi_has_required_use
+
+
+class USEFlagChecks(object):
+ '''Performs checks on USE flags listed in the ebuilds and
metadata.xml'''
+
+ def __init__(self, qatracker, globalUseFlags):
+ '''
+ @param qatracker: QATracker instance
+ @param globalUseFlags: Global USE flags
+ '''
+ self.qatracker = qatracker
+ self.useFlags = []
+ self.defaultUseFlags = []
+ self.usedUseFlags = set()
+ self.globalUseFlags = globalUseFlags
+
+ def check(self, pkg, package, ebuild, y_ebuild, localUseFlags):
+ '''Perform the check.
+
+ @param pkg: Package in which we check (object).
+ @param package: Package in which we check (string).
+ @param ebuild: Ebuild which we check (object).
+ @param y_ebuild: Ebuild which we check (string).
+ @param localUseFlags: Local USE flags of the package
+ '''
+ self._checkGlobal(pkg)
+ self._checkMetadata(package, ebuild, y_ebuild, localUseFlags)
+ self._checkRequiredUSE(pkg, ebuild)
+
+ def getUsedUseFlags(self):
+ '''Get the USE flags that this check has seen'''
+ return self.usedUseFlags
+
+ def _checkGlobal(self, pkg):
+ for myflag in pkg._metadata["IUSE"].split():
+ flag_name = myflag.lstrip("+-")
+ self.usedUseFlags.add(flag_name)
+ if myflag != flag_name:
+ self.defaultUseFlags.append(myflag)
+ if flag_name not in self.globalUseFlags:
+ self.useFlags.append(flag_name)
+
+ def _checkMetadata(self, package, ebuild, y_ebuild, localUseFlags):
+ for mypos in range(len(self.useFlags) - 1, -1, -1):
+ if self.useFlags[mypos] and (self.useFlags[mypos] in
localUseFlags):
+ del self.useFlags[mypos]
+
+ if self.defaultUseFlags and not eapi_has_iuse_defaults(eapi):
+ for myflag in self.defaultUseFlags:
+ self.qatracker.add_error(
+ 'EAPI.incompatible', "%s: IUSE defaults"
+ " not supported with EAPI='%s': '%s'" %
(
+ ebuild.relative_path, eapi,
myflag))
+
+ for mypos in range(len(self.useFlags)):
+ self.qatracker.add_error(
+ "IUSE.invalid",
+ "%s/%s.ebuild: %s" % (package, y_ebuild,
self.useFlags[mypos]))
+
+ def _checkRequiredUSE(self, pkg, ebuild):
+ required_use = pkg._metadata["REQUIRED_USE"]
+ if required_use:
+ if not eapi_has_required_use(eapi):
+ self.qatracker.add_error(
+ 'EAPI.incompatible', "%s: REQUIRED_USE"
+ " not supported with EAPI='%s'"
+ % (ebuild.relative_path, eapi,))
+ try:
+ portage.dep.check_required_use(
+ required_use, (),
pkg.iuse.is_valid_flag, eapi=eapi)
+
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 63186f325c2410067c924863446cf5753385e79a
Author: Brian Dolbec gentoo org>
AuthorDate: Tue Jun 3 18:02:47 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:26:58 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=63186f32
repoman/main.py: Remove some temporary dubug print()
pym/repoman/main.py | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 825aa5b..9f7c64b 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -119,15 +119,11 @@ if options.experimental_inherit == 'y':
can_force = True
portdir, portdir_overlay, mydir = utilities.FindPortdir(repoman_settings)
-print("portdir", portdir)
-print("portdir_overlay", portdir_overlay)
-print("mydir", mydir)
if portdir is None:
sys.exit(1)
myreporoot = os.path.basename(portdir_overlay)
myreporoot += mydir[len(portdir_overlay):]
-print("myreporoot", myreporoot)
##
vcs_settings = VCSSettings(options, repoman_settings)
@@ -292,7 +288,7 @@ for xpkg in effective_scanlist:
checkdir_relative = os.path.join(catdir, checkdir_relative)
checkdir_relative = os.path.join(".", checkdir_relative)
-#^^
+#
manifester = Manifests(options, qatracker, repoman_settings)
if manifester.run(checkdir, portdb):
continue
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 44e454562bc07d991f09ac82c7309d91a115bb25
Author: Tom Wijsman gentoo org>
AuthorDate: Tue Jun 3 11:28:44 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:26:57 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=44e45456
repoman/main.py: Refactor "RepoMan Sez"
pym/repoman/main.py | 27 ++-
pym/repoman/utilities.py | 8 ++--
2 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 95af4d4..c183aea 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -981,25 +981,21 @@ if options.mode != 'commit':
if dofull:
print(bold("Note: type \"repoman full\" for a complete
listing."))
if dowarn and not dofail:
- print(
- green("RepoMan sez:"),
+ utilities.repoman_sez(
"\"You're only giving me a partial QA payment?\n"
" I'll take it this time, but I'm not
happy.\"")
elif not dofail:
- print(
- green("RepoMan sez:"),
+ utilities.repoman_sez(
"\"If everyone were like you, I'd be out of
business!\"")
elif dofail:
print(bad("Please fix these important QA issues first."))
- print(
- green("RepoMan sez:"),
+ utilities.repoman_sez(
"\"Make your QA payment on time"
" and you'll never see the likes of me.\"\n")
sys.exit(1)
else:
if dofail and can_force and options.force and not options.pretend:
- print(
- green("RepoMan sez:"),
+ utilities.repoman_sez(
" \"You want to commit even with these QA issues?\n"
" I'll take it this time, but I'm not
happy.\"\n")
elif dofail:
@@ -1008,15 +1004,13 @@ else:
"The --force option has been disabled"
" due to extraordinary issues."))
print(bad("Please fix these important QA issues first."))
- print(
- green("RepoMan sez:"),
+ utilities.repoman_sez(
"\"Make your QA payment on time"
" and you'll never see the likes of me.\"\n")
sys.exit(1)
if options.pretend:
- print(
- green("RepoMan sez:"),
+ utilities.repoman_sez(
"\"So, you want to play it safe. Good call.\"\n")
myunadded = []
@@ -1195,7 +1189,8 @@ else:
if vcs_settings.vcs:
if not (mychanged or mynew or myremoved or (vcs_settings.vcs ==
"hg" and mydeleted)):
- print(green("RepoMan sez:"), "\"Doing nothing is not
always good for QA.\"")
+ utilities.repoman_sez(
+ "\"Doing nothing is not always good for QA.\"")
print()
print("(Didn't find any changed files...)")
print()
@@ -1600,8 +1595,7 @@ else:
portage.util.write_atomic(x, b''.join(mylines),
mode='wb')
if repolevel == 1:
- print(
- green("RepoMan sez:"),
+ utilities.repoman_sez(
"\"You're rather crazy... "
"doing the entire repository.\"\n")
@@ -1718,7 +1712,6 @@ else:
"repoman was too scared"
" by not seeing any familiar version control file"
" that he forgot to commit anything")
- print(
- green("RepoMan sez:"),
+ utilities.repoman_sez(
"\"If everyone were like you, I'd be out of business!\"\n")
sys.exit(0)
diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py
index 93e8840..2a1f4d9 100644
--- a/pym/repoman/utilities.py
+++ b/pym/repoman/utilities.py
@@ -39,9 +39,10 @@ from portage import shutil
from portage import _encodings
from portage import _unicode_decode
from portage import _unicode_encode
+from portage import util
from portage.localization import _
from portage.process import find_binary
-from portage import util
+from portage.output import green
from repoman.copyrights import update_copyright, update_copyright_year
@@ -126,7 +127,6 @@ def FindPackagesToScan(settings, startdir, reposplit):
path = os.path.join(startdir, cat)
if not os.path.isdir(path):
continue
- pkgdirs = os.listdir(path)
scanlist.extend(AddPackagesInDir(path))
elif repolevel == 2: # category level, startdir
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/, pym/repoman/
commit: df0cf443e9edf69a90dc684dd35254c68bf90999
Author: Tom Wijsman gentoo org>
AuthorDate: Wed Jun 4 14:17:49 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:26:59 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=df0cf443
repoman/main.py: More KEYWORDS checks to checks/ebuilds/keywords.py
pym/repoman/checks/ebuilds/keywords.py | 64 ++
pym/repoman/main.py| 32 +
2 files changed, 59 insertions(+), 37 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/keywords.py
b/pym/repoman/checks/ebuilds/keywords.py
index b724269..235c751 100644
--- a/pym/repoman/checks/ebuilds/keywords.py
+++ b/pym/repoman/checks/ebuilds/keywords.py
@@ -21,7 +21,7 @@ class KeywordChecks(object):
def check(
self, pkg, package, ebuild, y_ebuild, keywords, ebuild_archs,
changed,
- live_ebuild):
+ live_ebuild, kwlist, profiles):
'''Perform the check.
@param pkg: Package in which we check (object).
@@ -33,21 +33,32 @@ class KeywordChecks(object):
@param changed: Changes instance
@param slot_keywords: A dictionary of keywords per slot.
@param live_ebuild: A boolean that determines if this is a live
ebuild.
+ @param kwlist: A list of all global keywords.
+ @param profiles: A list of all profiles.
'''
if not self.options.straight_to_stable:
self._checkAddedWithStableKeywords(
package, ebuild, y_ebuild, keywords, changed)
+
self._checkForDroppedKeywords(
pkg, ebuild, ebuild_archs, live_ebuild)
+ self._checkForInvalidKeywords(
+ pkg, package, y_ebuild, kwlist, profiles)
+
+ self._checkForMaskLikeKeywords(
+ package, y_ebuild, keywords, kwlist)
+
self.slot_keywords[pkg.slot].update(ebuild_archs)
+ def _isKeywordStable(self, keyword):
+ return not keyword.startswith("~") and not
keyword.startswith("-")
+
def _checkAddedWithStableKeywords(
self, package, ebuild, y_ebuild, keywords, changed):
catdir, pkgdir = package.split("/")
- is_stable = lambda kw: not kw.startswith("~") and not
kw.startswith("-")
- stable_keywords = list(filter(is_stable, keywords))
+ stable_keywords = list(filter(self._isKeywordStable, keywords))
if stable_keywords:
if ebuild.ebuild_path in changed.new_ebuilds and catdir
!= "virtual":
stable_keywords.sort()
@@ -64,6 +75,47 @@ class KeywordChecks(object):
elif ebuild_archs and "*" not in ebuild_archs and not
live_ebuild:
dropped_keywords =
previous_keywords.difference(ebuild_archs)
if dropped_keywords:
- self.qatracker.add_error("KEYWORDS.dropped",
- "%s: %s" %
- (ebuild.relative_path, "
".join(sorted(dropped_keywords
+ self.qatracker.add_error(
+ "KEYWORDS.dropped", "%s: %s" % (
+ ebuild.relative_path,
+ "
".join(sorted(dropped_keywords
+
+ def _checkForInvalidKeywords(
+ self, pkg, package, y_ebuild, kwlist, profiles):
+ myuse = pkg._metadata["KEYWORDS"].split()
+
+ for mykey in myuse:
+ if mykey not in ("-*", "*", "~*"):
+ myskey = mykey
+
+ if not self._isKeywordStable(myskey[:1]):
+ myskey = myskey[1:]
+
+ if myskey not in kwlist:
+ self.qatracker.add_error(
+ "KEYWORDS.invalid",
+ "%s/%s.ebuild: %s" % (
+ package, y_ebuild,
mykey))
+ elif myskey not in profiles:
+ self.qatracker.add_error(
+ "KEYWORDS.invalid",
+ "%s/%s.ebuild: %s (profile
invalid)" % (
+ package, y_ebuild,
mykey))
+
+ def _checkForMaskLikeKeywords(
+ self, package, y_ebuild, keywords, kwlist):
+
+ # KEYWORDS="-*" is a stupid replacement for package.mask
+ # and screws general KEYWORDS seman
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/eclasses/
commit: aa9ced164ca32e47e590337aee3a2a93453236eb
Author: Tom Wijsman gentoo org>
AuthorDate: Wed Jun 4 13:58:31 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:26:59 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=aa9ced16
repoman/main.py: Split Ruby checks to checks/ebuild/eclass/ruby.py
pym/repoman/checks/ebuilds/eclasses/__init__.py | 0
pym/repoman/checks/ebuilds/eclasses/ruby.py | 32 +
pym/repoman/main.py | 18 --
3 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/eclasses/__init__.py
b/pym/repoman/checks/ebuilds/eclasses/__init__.py
new file mode 100644
index 000..e69de29
diff --git a/pym/repoman/checks/ebuilds/eclasses/ruby.py
b/pym/repoman/checks/ebuilds/eclasses/ruby.py
new file mode 100644
index 000..abfb166
--- /dev/null
+++ b/pym/repoman/checks/ebuilds/eclasses/ruby.py
@@ -0,0 +1,32 @@
+
+'''live.py
+Performs Ruby eclass checks
+'''
+
+from repoman.qa_data import ruby_deprecated
+
+
+class RubyEclassChecks(object):
+ '''Performs checks for the usage of Ruby eclasses in ebuilds'''
+
+ def __init__(self, qatracker):
+ '''
+ @param qatracker: QATracker instance
+ '''
+ self.qatracker = qatracker
+ self.old_ruby_eclasses = ["ruby-ng", "ruby-fakegem", "ruby"]
+
+ def check(self, pkg, ebuild):
+ is_inherited = lambda eclass: eclass in pkg.inherited
+ is_old_ruby_eclass_inherited = filter(
+ is_inherited, self.old_ruby_eclasses)
+
+ if is_old_ruby_eclass_inherited:
+ ruby_intersection =
pkg.iuse.all.intersection(ruby_deprecated)
+
+ if ruby_intersection:
+ for myruby in ruby_intersection:
+ self.qatracker.add_error(
+ "IUSE.rubydeprecated",
+ (ebuild.relative_path + ":
Deprecated ruby target: %s")
+ % myruby)
\ No newline at end of file
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index f8a4993..bcd2174 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -51,6 +51,7 @@ from repoman.argparser import parse_args
from repoman.checks.directories.files import FileChecks
from repoman.checks.ebuilds.checks import run_checks, checks_init
from repoman.checks.ebuilds.eclasses.live import LiveEclassChecks
+from repoman.checks.ebuilds.eclasses.ruby import RubyEclassChecks
from repoman.checks.ebuilds.fetches import FetchChecks
from repoman.checks.ebuilds.keywords import KeywordChecks
from repoman.checks.ebuilds.isebuild import IsEbuild
@@ -67,7 +68,7 @@ from repoman.profile import check_profiles, dev_keywords,
setup_profile
from repoman.qa_data import (
format_qa_output, format_qa_output_column, qahelp,
qawarnings, qacats, max_desc_len, missingvars,
- ruby_deprecated, suspect_virtual, suspect_rdepend, valid_restrict)
+ suspect_virtual, suspect_rdepend, valid_restrict)
from repoman.qa_tracker import QATracker
from repoman.repos import RepoSettings, repo_metadata
from repoman.scan import Changes, scan
@@ -290,6 +291,7 @@ thirdparty = ThirdPartyMirrors(repoman_settings, qatracker)
use_flag_checks = USEFlagChecks(qatracker, uselist)
keywordcheck = KeywordChecks(qatracker, options)
liveeclasscheck = LiveEclassChecks(qatracker)
+rubyeclasscheck = RubyEclassChecks(qatracker)
##
for xpkg in effective_scanlist:
@@ -615,18 +617,8 @@ for xpkg in effective_scanlist:
ebuild_used_useflags = use_flag_checks.getUsedUseFlags()
used_useflags = used_useflags.union(ebuild_used_useflags)
#
-
- # Check for outdated RUBY targets
- old_ruby_eclasses = ["ruby-ng", "ruby-fakegem", "ruby"]
- is_old_ruby_eclass_inherited = filter(
- lambda e: e in inherited, old_ruby_eclasses)
- if is_old_ruby_eclass_inherited:
- ruby_intersection =
pkg.iuse.all.intersection(ruby_deprecated)
- if ruby_intersection:
- for myruby in ruby_intersection:
-
qatracker.add_error("IUSE.rubydeprecated",
- (ebuild.relative_path + ":
Deprecated ruby target: %s")
- % myruby)
+ rubyeclasscheck.check(pkg, ebuild)
+ #
# license checks
if not badlicsyntax:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 7941f999805d7ea1b31a7f400abc98b8a5bacf99
Author: Tom Wijsman gentoo org>
AuthorDate: Mon Jun 2 17:00:53 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:26:56 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=7941f999
repoman/main.py: Add global_pmaskdict param to has_global_mask call
pym/repoman/main.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 7d369ef..57b5b40 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -481,7 +481,7 @@ for xpkg in effective_scanlist:
(xpkg, y_ebuild, bad_stable_keywords))
del bad_stable_keywords
- if keywords and not has_global_mask(pkg):
+ if keywords and not has_global_mask(pkg,
global_pmaskdict):
qatracker.add_error("LIVEVCS.unmasked",
ebuild.relative_path)
if options.ignore_arches:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/variables/
commit: 38c86e616154eae5505781efbc5cb4f380029e24 Author: Tom Wijsman gentoo org> AuthorDate: Fri Jun 6 15:23:33 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Sat Sep 5 21:27:00 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=38c86e61 repoman/main.py: Split RESTRICT checks to checks/ebuild/variables/ pym/repoman/checks/ebuilds/variables/restrict.py | 41 pym/repoman/main.py | 25 --- 2 files changed, 47 insertions(+), 19 deletions(-) diff --git a/pym/repoman/checks/ebuilds/variables/restrict.py b/pym/repoman/checks/ebuilds/variables/restrict.py new file mode 100644 index 000..215b792 --- /dev/null +++ b/pym/repoman/checks/ebuilds/variables/restrict.py @@ -0,0 +1,41 @@ + +'''restrict.py +Perform checks on the RESTRICT variable. +''' + +# import our initialized portage instance +from repoman._portage import portage + +from repoman.qa_data import valid_restrict + + +class RestrictChecks(object): + '''Perform checks on the RESTRICT variable.''' + + def __init__(self, qatracker): + ''' + @param qatracker: QATracker instance + ''' + self.qatracker = qatracker + + def check(self, pkg, package, ebuild, y_ebuild): + myrestrict = None + + try: + myrestrict = portage.dep.use_reduce( + pkg._metadata["RESTRICT"], matchall=1, flat=True) + except portage.exception.InvalidDependString as e: + self. qatracker.add_error( + "RESTRICT.syntax", + "%s: RESTRICT: %s" % (ebuild.relative_path, e)) + del e + + if myrestrict: + myrestrict = set(myrestrict) + mybadrestrict = myrestrict.difference(valid_restrict) + + if mybadrestrict: + for mybad in mybadrestrict: + self.qatracker.add_error( + "RESTRICT.invalid", + package + "/" + y_ebuild + ".ebuild: %s" % mybad) diff --git a/pym/repoman/main.py b/pym/repoman/main.py index 5fe7515..e98520b 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -64,6 +64,7 @@ from repoman.checks.ebuilds.use_flags import USEFlagChecks from repoman.checks.ebuilds.variables.description import DescriptionChecks from repoman.checks.ebuilds.variables.eapi import EAPIChecks from repoman.checks.ebuilds.variables.license import LicenseChecks +from repoman.checks.ebuilds.variables.restrict import RestrictChecks from repoman.ebuild import Ebuild from repoman.errors import err from repoman.modules.commit import repochecks @@ -71,7 +72,7 @@ from repoman.profile import check_profiles, dev_keywords, setup_profile from repoman.qa_data import ( format_qa_output, format_qa_output_column, qahelp, qawarnings, qacats, missingvars, - suspect_virtual, suspect_rdepend, valid_restrict) + suspect_virtual, suspect_rdepend) from repoman.qa_tracker import QATracker from repoman.repos import RepoSettings, repo_metadata from repoman.scan import Changes, scan @@ -301,6 +302,7 @@ rubyeclasscheck = RubyEclassChecks(qatracker) eapicheck = EAPIChecks(qatracker, repo_settings) descriptioncheck = DescriptionChecks(qatracker) licensecheck = LicenseChecks(qatracker, liclist, liclist_deprecated) +restrictcheck = RestrictChecks(qatracker) ## for xpkg in effective_scanlist: @@ -623,24 +625,9 @@ for xpkg in effective_scanlist: licensecheck.check(pkg, xpkg, ebuild, y_ebuild) # - # restrict checks - myrestrict = None - try: - myrestrict = portage.dep.use_reduce( - myaux["RESTRICT"], matchall=1, flat=True) - except portage.exception.InvalidDependString as e: - qatracker.add_error( - "RESTRICT.syntax", - "%s: RESTRICT: %s" % (ebuild.relative_path, e)) - del e - if myrestrict: - myrestrict = set(myrestrict) - mybadrestrict = myrestrict.difference(valid_restrict) - if mybadrestrict: - for mybad in mybadrestrict: - qatracker.add_error( - "RESTRICT.invalid", - xpkg + "/" + y_ebuild + ".ebuild: %s" % mybad) + # + restrictcheck.check(pkg, xpkg, ebuild, y_ebuild) + #
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/
commit: 9888cc7dd9b3bc3c4d2a1efa61c94087451578fe
Author: Brian Dolbec gentoo org>
AuthorDate: Tue Jun 3 19:39:56 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:26:58 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=9888cc7d
repoman.../use_flags.py: Reset state variables for each check() run
Also double space function separations.
pym/repoman/checks/ebuilds/use_flags.py | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/pym/repoman/checks/ebuilds/use_flags.py
b/pym/repoman/checks/ebuilds/use_flags.py
index bc09ed7..d63ae6d 100644
--- a/pym/repoman/checks/ebuilds/use_flags.py
+++ b/pym/repoman/checks/ebuilds/use_flags.py
@@ -19,10 +19,11 @@ class USEFlagChecks(object):
@param globalUseFlags: Global USE flags
'''
self.qatracker = qatracker
+ self.globalUseFlags = globalUseFlags
self.useFlags = []
self.defaultUseFlags = []
self.usedUseFlags = set()
- self.globalUseFlags = globalUseFlags
+
def check(self, pkg, package, ebuild, y_ebuild, localUseFlags):
'''Perform the check.
@@ -33,14 +34,20 @@ class USEFlagChecks(object):
@param y_ebuild: Ebuild which we check (string).
@param localUseFlags: Local USE flags of the package
'''
+ # reset state variables for the run
+ self.useFlags = []
+ self.defaultUseFlags = []
+ self.usedUseFlags = set()
self._checkGlobal(pkg)
self._checkMetadata(package, ebuild, y_ebuild, localUseFlags)
self._checkRequiredUSE(pkg, ebuild)
+
def getUsedUseFlags(self):
'''Get the USE flags that this check has seen'''
return self.usedUseFlags
+
def _checkGlobal(self, pkg):
for myflag in pkg._metadata["IUSE"].split():
flag_name = myflag.lstrip("+-")
@@ -50,6 +57,7 @@ class USEFlagChecks(object):
if flag_name not in self.globalUseFlags:
self.useFlags.append(flag_name)
+
def _checkMetadata(self, package, ebuild, y_ebuild, localUseFlags):
for mypos in range(len(self.useFlags) - 1, -1, -1):
if self.useFlags[mypos] and (self.useFlags[mypos] in
localUseFlags):
@@ -67,6 +75,7 @@ class USEFlagChecks(object):
"IUSE.invalid",
"%s/%s.ebuild: %s" % (package, y_ebuild,
self.useFlags[mypos]))
+
def _checkRequiredUSE(self, pkg, ebuild):
required_use = pkg._metadata["REQUIRED_USE"]
if required_use:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 4aa2ae1f28234e13e4e8cdf918a1765886111564
Author: Brian Dolbec gentoo org>
AuthorDate: Tue Jun 3 18:00:05 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:26:57 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4aa2ae1f
Repoman: Refactor repos.RepoSettings class, fix the repoman_settings not being
re-assigned
When the repo is not in the confiig'd repos, it creates a ne repoman_settings
object which contains
the temporaily activated repo. main.py was not re-assigning repoman_settings
to the new object.
Split out _add_repo() to it's own function.
Split out the gpg-sign specific function for git into plugin-ready functions,
for later.
pym/repoman/main.py | 2 +
pym/repoman/repos.py | 119 ---
2 files changed, 77 insertions(+), 44 deletions(-)
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index c183aea..825aa5b 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -138,6 +138,8 @@ vcs_settings = VCSSettings(options, repoman_settings)
repo_settings = RepoSettings(config_root, portdir, portdir_overlay,
repoman_settings, vcs_settings, options, qawarnings)
+repoman_settings = repo_settings.repoman_settings
+
portdb = repo_settings.portdb
##
diff --git a/pym/repoman/repos.py b/pym/repoman/repos.py
index b79e241..6bd1eb4 100644
--- a/pym/repoman/repos.py
+++ b/pym/repoman/repos.py
@@ -26,75 +26,46 @@ class RepoSettings(object):
def __init__(self, config_root, portdir, portdir_overlay,
repoman_settings=None, vcs_settings=None, options=None,
qawarnings=None):
+ self.repoman_settings = repoman_settings
+ self.vcs_settings = vcs_settings
+
# Ensure that current repository is in the list of enabled
repositories.
self.repodir = os.path.realpath(portdir_overlay)
try:
repoman_settings.repositories.get_repo_for_location(self.repodir)
except KeyError:
- self.repo_conf = portage.repository.config
- self.repo_name =
self.repo_conf.RepoConfig._read_valid_repo_name(portdir_overlay)[0]
- self.layout_conf_data =
self.repo_conf.parse_layout_conf(portdir_overlay)[0]
- if self.layout_conf_data['repo-name']:
- self.repo_name =
self.layout_conf_data['repo-name']
- tmp_conf_file = io.StringIO(textwrap.dedent("""
- [%s]
- location = %s
- """) % (self.repo_name, portdir_overlay))
- # Ensure that the repository corresponding to $PWD
overrides a
- # repository of the same name referenced by the
existing PORTDIR
- # or PORTDIR_OVERLAY settings.
- repoman_settings['PORTDIR_OVERLAY'] = "%s %s" % (
- repoman_settings.get('PORTDIR_OVERLAY', ''),
- portage._shell_quote(portdir_overlay))
- self.repositories =
self.repo_conf.load_repository_config(
- repoman_settings, extra_files=[tmp_conf_file])
- # We have to call the config constructor again so that
attributes
- # dependent on config.repositories are initialized
correctly.
- repoman_settings = portage.config(
- config_root=config_root, local_config=False,
repositories=self.repositories)
+ self._add_repo(config_root, portdir_overlay)
- self.root = repoman_settings['EROOT']
+ self.root = self.repoman_settings['EROOT']
self.trees = {
- self.root: {'porttree':
portage.portagetree(settings=repoman_settings)}
+ self.root: {'porttree':
portage.portagetree(settings=self.repoman_settings)}
}
self.portdb = self.trees[self.root]['porttree'].dbapi
# Constrain dependency resolution to the master(s)
# that are specified in layout.conf.
- self.repo_config =
repoman_settings.repositories.get_repo_for_location(self.repodir)
+ self.repo_config =
self.repoman_settings.repositories.get_repo_for_location(self.repodir)
self.portdb.porttrees =
list(self.repo_config.eclass_db.porttrees)
self.portdir = self.portdb.porttrees[0]
self.commit_env = os.environ.copy()
# list() is for iteration on a copy.
- for repo in list(repoman_settings.repositories):
+ for repo in list(self.repoman_settings.repositories):
# all paths are canonical
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/, pym/repoman/
commit: d692db0bba4377e4127b5900e0a134f7e590a0a1
Author: Tom Wijsman gentoo org>
AuthorDate: Wed Jun 4 09:17:12 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:26:59 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d692db0b
repoman/main.py: Split KEYWORDS checks to checks/ebuilds/keywords.py
pym/repoman/checks/ebuilds/keywords.py | 69 ++
pym/repoman/main.py| 33
2 files changed, 77 insertions(+), 25 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/keywords.py
b/pym/repoman/checks/ebuilds/keywords.py
new file mode 100644
index 000..b724269
--- /dev/null
+++ b/pym/repoman/checks/ebuilds/keywords.py
@@ -0,0 +1,69 @@
+
+'''keywords.py
+Perform KEYWORDS related checks
+'''
+
+
+class KeywordChecks(object):
+ '''Perform checks on the KEYWORDS of an ebuild'''
+
+ def __init__(self, qatracker, options):
+ '''
+ @param qatracker: QATracker instance
+ '''
+ self.qatracker = qatracker
+ self.options = options
+ self.slot_keywords = {}
+
+ def prepare(self):
+ '''Prepare the checks for the next package.'''
+ self.slot_keywords = {}
+
+ def check(
+ self, pkg, package, ebuild, y_ebuild, keywords, ebuild_archs,
changed,
+ live_ebuild):
+ '''Perform the check.
+
+ @param pkg: Package in which we check (object).
+ @param package: Package in which we check (string).
+ @param ebuild: Ebuild which we check (object).
+ @param y_ebuild: Ebuild which we check (string).
+ @param keywords: All the keywords (including -...) of the
ebuild.
+ @param ebuild_archs: Just the architectures (no prefixes) of
the ebuild.
+ @param changed: Changes instance
+ @param slot_keywords: A dictionary of keywords per slot.
+ @param live_ebuild: A boolean that determines if this is a live
ebuild.
+ '''
+ if not self.options.straight_to_stable:
+ self._checkAddedWithStableKeywords(
+ package, ebuild, y_ebuild, keywords, changed)
+ self._checkForDroppedKeywords(
+ pkg, ebuild, ebuild_archs, live_ebuild)
+
+ self.slot_keywords[pkg.slot].update(ebuild_archs)
+
+ def _checkAddedWithStableKeywords(
+ self, package, ebuild, y_ebuild, keywords, changed):
+ catdir, pkgdir = package.split("/")
+
+ is_stable = lambda kw: not kw.startswith("~") and not
kw.startswith("-")
+ stable_keywords = list(filter(is_stable, keywords))
+ if stable_keywords:
+ if ebuild.ebuild_path in changed.new_ebuilds and catdir
!= "virtual":
+ stable_keywords.sort()
+ self.qatracker.add_error(
+ "KEYWORDS.stable",
+ "%s/%s.ebuild added with stable
keywords: %s" %
+ (package, y_ebuild, "
".join(stable_keywords)))
+
+ def _checkForDroppedKeywords(
+ self, pkg, ebuild, ebuild_archs, live_ebuild):
+ previous_keywords = self.slot_keywords.get(pkg.slot)
+ if previous_keywords is None:
+ self.slot_keywords[pkg.slot] = set()
+ elif ebuild_archs and "*" not in ebuild_archs and not
live_ebuild:
+ dropped_keywords =
previous_keywords.difference(ebuild_archs)
+ if dropped_keywords:
+ self.qatracker.add_error("KEYWORDS.dropped",
+ "%s: %s" %
+ (ebuild.relative_path, "
".join(sorted(dropped_keywords
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index a77b2f2..1d2a3fb 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -51,6 +51,7 @@ from repoman.argparser import parse_args
from repoman.checks.directories.files import FileChecks
from repoman.checks.ebuilds.checks import run_checks, checks_init
from repoman.checks.ebuilds.fetches import FetchChecks
+from repoman.checks.ebuilds.keywords import KeywordChecks
from repoman.checks.ebuilds.isebuild import IsEbuild
from repoman.checks.ebuilds.thirdpartymirrors import ThirdPartyMirrors
from repoman.checks.ebuilds.manifests import Manifests
@@ -284,7 +285,7 @@ fetchcheck = FetchChecks(qatracker, repoman_settings,
repo_settings, portdb,
pkgmeta = PkgMetadata(options, qatracker, repoman_settings)
thirdparty = ThirdPartyMirrors(repoman_settings, qatracker)
use_flag_checks = USEFlagChecks(qatracker, uselist)
-
+keywordcheck = KeywordChecks(qatracker, op
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/variables/
commit: 7b2e3e7d0c05321af552fb57eed04b4aaee61f72 Author: Tom Wijsman gentoo org> AuthorDate: Fri Jun 6 14:40:39 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Sat Sep 5 21:27:00 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=7b2e3e7d repoman/main.py: Split EAPI checks to checks/ebuilds/variables/eapi.py pym/repoman/checks/ebuilds/variables/__init__.py | 0 pym/repoman/checks/ebuilds/variables/eapi.py | 44 pym/repoman/main.py | 12 +++ 3 files changed, 49 insertions(+), 7 deletions(-) diff --git a/pym/repoman/checks/ebuilds/variables/__init__.py b/pym/repoman/checks/ebuilds/variables/__init__.py new file mode 100644 index 000..e69de29 diff --git a/pym/repoman/checks/ebuilds/variables/eapi.py b/pym/repoman/checks/ebuilds/variables/eapi.py new file mode 100644 index 000..2f8b1cb --- /dev/null +++ b/pym/repoman/checks/ebuilds/variables/eapi.py @@ -0,0 +1,44 @@ + +'''eapi.py +Perform checks on the EAPI variable. +''' + + +class EAPIChecks(object): + '''Perform checks on the EAPI variable.''' + + def __init__(self, qatracker, repo_settings): + ''' + @param qatracker: QATracker instance + @param repo_settings: Repository settings + ''' + self.qatracker = qatracker + self.repo_settings = repo_settings + + def check(self, pkg, ebuild): + ''' + @param pkg: Package in which we check (object). + @param ebuild: Ebuild which we check (object). + ''' + eapi = pkg._metadata["EAPI"] + + if not self._checkBanned(ebuild, eapi): + self._checkDeprecated(ebuild, eapi) + + def _checkBanned(self, ebuild, eapi): + if self.repo_settings.repo_config.eapi_is_banned(eapi): + self.qatracker.add_error( + "repo.eapi.banned", "%s: %s" % (ebuild.relative_path, eapi)) + + return True + + return False + + def _checkDeprecated(self, ebuild, eapi): + if self.repo_settings.repo_config.eapi_is_deprecated(eapi): + self.qatracker.add_error( + "repo.eapi.deprecated", "%s: %s" % (ebuild.relative_path, eapi)) + + return True + + return False diff --git a/pym/repoman/main.py b/pym/repoman/main.py index 2523544..70d2255 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -61,6 +61,7 @@ from repoman.check_missingslot import check_missingslot from repoman.checks.ebuilds.misc import bad_split_check, pkg_invalid from repoman.checks.ebuilds.pkgmetadata import PkgMetadata from repoman.checks.ebuilds.use_flags import USEFlagChecks +from repoman.checks.ebuilds.variables.eapi import EAPIChecks from repoman.ebuild import Ebuild from repoman.errors import err from repoman.modules.commit import repochecks @@ -295,6 +296,7 @@ use_flag_checks = USEFlagChecks(qatracker, uselist) keywordcheck = KeywordChecks(qatracker, options) liveeclasscheck = LiveEclassChecks(qatracker) rubyeclasscheck = RubyEclassChecks(qatracker) +eapicheck = EAPIChecks(qatracker, repo_settings) ## for xpkg in effective_scanlist: @@ -396,13 +398,9 @@ for xpkg in effective_scanlist: inherited = pkg.inherited live_ebuild = live_eclasses.intersection(inherited) - if repo_settings.repo_config.eapi_is_banned(eapi): - qatracker.add_error( - "repo.eapi.banned", "%s: %s" % (ebuild.relative_path, eapi)) - - elif repo_settings.repo_config.eapi_is_deprecated(eapi): - qatracker.add_error( - "repo.eapi.deprecated", "%s: %s" % (ebuild.relative_path, eapi)) + ### + eapicheck.check(pkg, ebuild) + ### for k, v in myaux.items(): if not isinstance(v, basestring):
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/herds/, pym/repoman/checks/ebuilds/, ...
commit: 98a806fbb269b73953f230f1a4fa4cafdfb522b1 Author: Tom Wijsman gentoo org> AuthorDate: Fri Jun 6 12:24:18 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Sat Sep 5 21:26:59 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=98a806fb repoman: Apply PEP 8 guidelines again (except for W191) pym/repoman/_portage.py | 1 - pym/repoman/_xml.py | 6 -- pym/repoman/checks/directories/files.py | 17 +++-- pym/repoman/checks/ebuilds/checks.py| 2 +- pym/repoman/checks/ebuilds/eclasses/live.py | 2 +- pym/repoman/checks/ebuilds/eclasses/ruby.py | 2 +- pym/repoman/checks/ebuilds/fetches.py | 29 pym/repoman/checks/ebuilds/isebuild.py | 6 +- pym/repoman/checks/ebuilds/manifests.py | 7 +- pym/repoman/checks/ebuilds/misc.py | 11 ++- pym/repoman/checks/ebuilds/pkgmetadata.py | 42 ++- pym/repoman/checks/ebuilds/thirdpartymirrors.py | 8 +- pym/repoman/checks/ebuilds/use_flags.py | 5 -- pym/repoman/checks/herds/metadata.py| 4 - pym/repoman/ebuild.py | 6 +- pym/repoman/errors.py | 2 - pym/repoman/main.py | 97 +++-- pym/repoman/qa_data.py | 2 - pym/repoman/qa_tracker.py | 13 ++-- pym/repoman/repos.py| 35 + pym/repoman/scan.py | 18 ++--- pym/repoman/vcs/vcs.py | 10 ++- pym/repoman/vcs/vcsstatus.py| 17 ++--- 23 files changed, 163 insertions(+), 179 deletions(-) diff --git a/pym/repoman/_portage.py b/pym/repoman/_portage.py index e72ce9f..0f611f7 100644 --- a/pym/repoman/_portage.py +++ b/pym/repoman/_portage.py @@ -23,4 +23,3 @@ sys.path.insert(0, pym_path) import portage portage._internal_caller = True portage._disable_legacy_globals() - diff --git a/pym/repoman/_xml.py b/pym/repoman/_xml.py index d5b5a5e..7bf6698 100644 --- a/pym/repoman/_xml.py +++ b/pym/repoman/_xml.py @@ -15,7 +15,6 @@ from repoman._subprocess import repoman_getstatusoutput class _XMLParser(xml.etree.ElementTree.XMLParser): - def __init__(self, data, **kwargs): xml.etree.ElementTree.XMLParser.__init__(self, **kwargs) self._portage_data = data @@ -27,13 +26,11 @@ class _XMLParser(xml.etree.ElementTree.XMLParser): self.parser.StartDoctypeDeclHandler = \ self._portage_StartDoctypeDeclHandler - def _portage_XmlDeclHandler(self, version, encoding, standalone): if self._base_XmlDeclHandler is not None: self._base_XmlDeclHandler(version, encoding, standalone) self._portage_data["XML_DECLARATION"] = (version, encoding, standalone) - def _portage_StartDoctypeDeclHandler( self, doctypeName, systemId, publicId, has_internal_subset): if self._base_StartDoctypeDeclHandler is not None: @@ -61,7 +58,6 @@ class XmlLint(object): self.binary = None self._check_capable() - def _check_capable(self): if self.options.mode == "manifest": return @@ -74,12 +70,10 @@ class XmlLint(object): # this can be problematic if xmllint changes their output self._is_capable = True - @property def capable(self): return self._is_capable - def check(self, checkdir, repolevel): '''Runs checks on the package metadata.xml file diff --git a/pym/repoman/checks/directories/files.py b/pym/repoman/checks/directories/files.py index 87220c0..b1d77df 100644 --- a/pym/repoman/checks/directories/files.py +++ b/pym/repoman/checks/directories/files.py @@ -13,8 +13,8 @@ from repoman.vcs.vcs import vcs_new_changed class FileChecks(object): - def __init__(self, qatracker, repoman_settings, repo_settings, portdb, - vcs_settings): + def __init__( + self, qatracker, repoman_settings, repo_settings, portdb, vcs_settings): ''' @param qatracker: QATracker instance @param repoman_settings: settings instance @@ -27,7 +27,6 @@ class FileChecks(object): self.repoman_settings = repoman_settings self.vcs_settings = vcs_settings - def check(self, checkdir, checkdirlist, checkdir_relative, changed, new): '''Checks the ebuild sources and files for errors @@ -48,10 +47,12 @@ class FileChecks(object): # prohibited characters). See bug #406877. index = -1 if index != -1: -
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/vcs/
commit: ad7af05dbac5cd201e7f02c797d7a4263fd6ce02
Author: Brian Dolbec gentoo org>
AuthorDate: Tue Jun 3 18:42:37 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:26:58 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ad7af05d
Repoman: Refactor VCSStatus to pass non consistent data to the check()
This will facilitae for the initialization of the class before the big xpkg
loop.
pym/repoman/main.py | 4 ++--
pym/repoman/vcs/vcsstatus.py | 39 ++-
2 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 9f7c64b..db6c468 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -325,8 +325,8 @@ for xpkg in effective_scanlist:
filescheck.check(checkdir, checkdirlist, checkdir_relative,
changed.changed, changed.new)
###
- status_check = VCSStatus(vcs_settings, checkdir, checkdir_relative,
xpkg, qatracker)
- status_check.check(check_ebuild_notadded)
+ status_check = VCSStatus(vcs_settings, qatracker)
+ status_check.check(check_ebuild_notadded, checkdir, checkdir_relative,
xpkg)
eadded.extend(status_check.eadded)
#
diff --git a/pym/repoman/vcs/vcsstatus.py b/pym/repoman/vcs/vcsstatus.py
index 6a81b1b..0517c04 100644
--- a/pym/repoman/vcs/vcsstatus.py
+++ b/pym/repoman/vcs/vcsstatus.py
@@ -13,52 +13,49 @@ class VCSStatus(object):
'''Determines the status of the vcs repositories
to determine if files are not added'''
- def __init__(self, vcs_settings, checkdir, checkdir_relative, xpkg,
qatracker):
+ def __init__(self, vcs_settings, qatracker):
self.vcs_settings = vcs_settings
self.vcs = vcs_settings.vcs
self.eadded = []
- self.checkdir = checkdir
- self.checkdir_relative = checkdir_relative
- self.xpkg = xpkg
self.qatracker = qatracker
- def check(self, check_not_added):
+ def check(self, check_not_added, checkdir, checkdir_relative, xpkg):
if self.vcs and check_not_added:
vcscheck = getattr(self, 'check_%s' % self.vcs)
- vcscheck()
+ vcscheck(checkdir, checkdir_relative, xpkg)
- def post_git_hg(self, myf):
+ def post_git_hg(self, myf, xpkg):
for l in myf:
if l[:-1][-7:] == ".ebuild":
self.qatracker.add_error("ebuild.notadded",
- os.path.join(self.xpkg,
os.path.basename(l[:-1])))
+ os.path.join(xpkg,
os.path.basename(l[:-1])))
myf.close()
- def check_git(self):
+ def check_git(self, checkdir, checkdir_relative, xpkg):
myf = repoman_popen(
"git ls-files --others %s" %
- (portage._shell_quote(self.checkdir_relative),))
- self.post_git_hg(myf)
+ (portage._shell_quote(checkdir_relative),))
+ self.post_git_hg(myf, xpkg)
- def check_hg(self):
+ def check_hg(self, checkdir, checkdir_relative, xpkg):
myf = repoman_popen(
"hg status --no-status --unknown %s" %
- (portage._shell_quote(self.checkdir_relative),))
- self.post_git_hg(myf)
+ (portage._shell_quote(checkdir_relative),))
+ self.post_git_hg(myf, xpkg)
- def check_cvs(self):
+ def check_cvs(self, checkdir, checkdir_relative, xpkg):
try:
- myf = open(self.checkdir + "/CVS/Entries", "r")
+ myf = open(checkdir + "/CVS/Entries", "r")
myl = myf.readlines()
myf.close()
except IOError:
self.qatracker.add_error("CVS/Entries.IO_error",
- self.checkdir + "/CVS/Entries")
+ checkdir + "/CVS/Entries")
return True
for l in myl:
if l[0] != "/":
@@ -71,7 +68,7 @@ class VCSStatus(object):
return True
- def check_svn(self):
+ def check_svn(self, checkdir, checkdir_relative, xpkg):
try:
myf = repoman_popen(
"svn status --depth=files --verbose " +
@@ -92,7 +89,7 @@ class VCSStatus(object):
try:
myf = repoman_popen(
"svn status " +
-
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/variables/, pym/repoman/
commit: 3f78284c30d9f228fcaeef59ee79d67aa2a815ff Author: Tom Wijsman gentoo org> AuthorDate: Fri Jun 6 14:50:26 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Sat Sep 5 21:27:00 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=3f78284c repoman/main.py: Split DESCRIPTION checks to checks/ebuild/variables/ .../checks/ebuilds/variables/description.py| 32 ++ pym/repoman/main.py| 13 - 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/pym/repoman/checks/ebuilds/variables/description.py b/pym/repoman/checks/ebuilds/variables/description.py new file mode 100644 index 000..a2b1057 --- /dev/null +++ b/pym/repoman/checks/ebuilds/variables/description.py @@ -0,0 +1,32 @@ + +'''description.py +Perform checks on the DESCRIPTION variable. +''' + +from repoman.qa_data import max_desc_len + + +class DescriptionChecks(object): + '''Perform checks on the DESCRIPTION variable.''' + + def __init__(self, qatracker): + ''' + @param qatracker: QATracker instance + ''' + self.qatracker = qatracker + + def check(self, pkg, ebuild): + ''' + @param pkg: Package in which we check (object). + @param ebuild: Ebuild which we check (object). + ''' + self._checkTooLong(pkg, ebuild) + + def _checkTooLong(self, pkg, ebuild): + # 14 is the length of DESCRIPTION="" + if len(pkg._metadata['DESCRIPTION']) > max_desc_len: + self.qatracker.add_error( + 'DESCRIPTION.toolong', + "%s: DESCRIPTION is %d characters (max %d)" % + (ebuild.relative_path, len( + pkg._metadata['DESCRIPTION']), max_desc_len)) diff --git a/pym/repoman/main.py b/pym/repoman/main.py index 70d2255..125b390 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -61,6 +61,7 @@ from repoman.check_missingslot import check_missingslot from repoman.checks.ebuilds.misc import bad_split_check, pkg_invalid from repoman.checks.ebuilds.pkgmetadata import PkgMetadata from repoman.checks.ebuilds.use_flags import USEFlagChecks +from repoman.checks.ebuilds.variables.description import DescriptionChecks from repoman.checks.ebuilds.variables.eapi import EAPIChecks from repoman.ebuild import Ebuild from repoman.errors import err @@ -68,7 +69,7 @@ from repoman.modules.commit import repochecks from repoman.profile import check_profiles, dev_keywords, setup_profile from repoman.qa_data import ( format_qa_output, format_qa_output_column, qahelp, - qawarnings, qacats, max_desc_len, missingvars, + qawarnings, qacats, missingvars, suspect_virtual, suspect_rdepend, valid_restrict) from repoman.qa_tracker import QATracker from repoman.repos import RepoSettings, repo_metadata @@ -297,6 +298,7 @@ keywordcheck = KeywordChecks(qatracker, options) liveeclasscheck = LiveEclassChecks(qatracker) rubyeclasscheck = RubyEclassChecks(qatracker) eapicheck = EAPIChecks(qatracker, repo_settings) +descriptioncheck = DescriptionChecks(qatracker) ## for xpkg in effective_scanlist: @@ -436,12 +438,9 @@ for xpkg in effective_scanlist: myqakey = var + ".virtual" qatracker.add_error(myqakey, ebuild.relative_path) - # 14 is the length of DESCRIPTION="" - if len(myaux['DESCRIPTION']) > max_desc_len: - qatracker.add_error( - 'DESCRIPTION.toolong', - "%s: DESCRIPTION is %d characters (max %d)" % - (ebuild.relative_path, len(myaux['DESCRIPTION']), max_desc_len)) + ### + descriptioncheck.check(pkg, ebuild) + ### keywords = myaux["KEYWORDS"].split()
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/, pym/repoman/
commit: 972523f5847d57708725486b08691f46ac29bce1
Author: Brian Dolbec gentoo org>
AuthorDate: Tue Jun 3 19:20:43 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:26:58 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=972523f5
Repoman: Refactor PkgMetadata and XmlLint classes for variable data passed in
Move all non-consistent data to be passed in via the check functions.
Initialize XmlLint once in the PkgMetadata class __init__().
pym/repoman/_xml.py | 33 ++-
pym/repoman/checks/ebuilds/pkgmetadata.py | 12 +--
2 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/pym/repoman/_xml.py b/pym/repoman/_xml.py
index b97c027..d5b5a5e 100644
--- a/pym/repoman/_xml.py
+++ b/pym/repoman/_xml.py
@@ -14,6 +14,8 @@ from repoman._subprocess import repoman_getstatusoutput
class _XMLParser(xml.etree.ElementTree.XMLParser):
+
+
def __init__(self, data, **kwargs):
xml.etree.ElementTree.XMLParser.__init__(self, **kwargs)
self._portage_data = data
@@ -25,11 +27,13 @@ class _XMLParser(xml.etree.ElementTree.XMLParser):
self.parser.StartDoctypeDeclHandler = \
self._portage_StartDoctypeDeclHandler
+
def _portage_XmlDeclHandler(self, version, encoding, standalone):
if self._base_XmlDeclHandler is not None:
self._base_XmlDeclHandler(version, encoding, standalone)
self._portage_data["XML_DECLARATION"] = (version, encoding,
standalone)
+
def _portage_StartDoctypeDeclHandler(
self, doctypeName, systemId, publicId, has_internal_subset):
if self._base_StartDoctypeDeclHandler is not None:
@@ -49,33 +53,44 @@ class
_MetadataTreeBuilder(xml.etree.ElementTree.TreeBuilder):
class XmlLint(object):
- def __init__(self, options, repolevel, repoman_settings):
+ def __init__(self, options, repoman_settings):
self.metadata_dtd = os.path.join(repoman_settings["DISTDIR"],
'metadata.dtd')
+ self.options = options
+ self.repoman_settings = repoman_settings
self._is_capable = False
self.binary = None
- self._check_capable(options, repolevel, repoman_settings)
+ self._check_capable()
+
- def _check_capable(self, options, repolevel, repoman_settings):
- if options.mode == "manifest":
+ def _check_capable(self):
+ if self.options.mode == "manifest":
return
self.binary = find_binary('xmllint')
if not self.binary:
print(red("!!! xmllint not found. Can't check
metadata.xml.\n"))
- if options.xml_parse or repolevel == 3:
- print("%s sorry, xmllint is needed. failing\n"
% red("!!!"))
- sys.exit(1)
else:
- if not fetch_metadata_dtd(self.metadata_dtd,
repoman_settings):
+ if not fetch_metadata_dtd(self.metadata_dtd,
self.repoman_settings):
sys.exit(1)
# this can be problematic if xmllint changes their
output
self._is_capable = True
+
@property
def capable(self):
return self._is_capable
- def check(self, checkdir):
+
+ def check(self, checkdir, repolevel):
+ '''Runs checks on the package metadata.xml file
+
+ @param checkdir: string, path
+ @param repolevel: integer
+ @return boolean, False == bad metadata
+ '''
if not self.capable:
+ if self.options.xml_parse or repolevel == 3:
+ print("%s sorry, xmllint is needed. failing\n"
% red("!!!"))
+ sys.exit(1)
return True
# xmlint can produce garbage output even on success, so only
dump
# the ouput when it fails.
diff --git a/pym/repoman/checks/ebuilds/pkgmetadata.py
b/pym/repoman/checks/ebuilds/pkgmetadata.py
index 0778696..674d32f 100644
--- a/pym/repoman/checks/ebuilds/pkgmetadata.py
+++ b/pym/repoman/checks/ebuilds/pkgmetadata.py
@@ -38,27 +38,28 @@ from repoman._xml import _XMLParser, _MetadataTreeBuilder,
XmlLint
class PkgMetadata(object):
'''Package metadata.xml checks'''
- def __init__(self, options, qatracker, repolevel, repoman_settings):
+ def __init__(self, options, qatracker, repoman_settings):
'''PkgMetadata init function
@param options: ArgumentParser.parse_known_args(argv[1:])
options
@param qatracker: QATracker instance
- @param repolev
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/variables/
commit: c258dfab547502e2213256ff1346ff1f1c4f52a5
Author: Tom Wijsman gentoo org>
AuthorDate: Fri Jun 6 15:09:43 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:27:00 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c258dfab
repoman/main.py: Split LICENSE checks to checks/ebuild/variables/
pym/repoman/checks/ebuilds/variables/license.py | 47 +
pym/repoman/main.py | 21 +++
2 files changed, 52 insertions(+), 16 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/variables/license.py
b/pym/repoman/checks/ebuilds/variables/license.py
new file mode 100644
index 000..bdc859c
--- /dev/null
+++ b/pym/repoman/checks/ebuilds/variables/license.py
@@ -0,0 +1,47 @@
+
+'''description.py
+Perform checks on the LICENSE variable.
+'''
+
+# import our initialized portage instance
+from repoman._portage import portage
+
+
+class LicenseChecks(object):
+ '''Perform checks on the LICENSE variable.'''
+
+ def __init__(self, qatracker, liclist, liclist_deprecated):
+ '''
+ @param qatracker: QATracker instance
+ @param liclist: List of licenses.
+ @param liclist: List of deprecated licenses.
+ '''
+ self.qatracker = qatracker
+ self.liclist = liclist
+ self.liclist_deprecated = liclist_deprecated
+
+ def check(
+ self, pkg, package, ebuild, y_ebuild):
+ '''
+ @param pkg: Package in which we check (object).
+ @param package: Package in which we check (string).
+ @param ebuild: Ebuild which we check (object).
+ @param y_ebuild: Ebuild which we check (string).
+ '''
+
+ # Parse the LICENSE variable, remove USE conditions and flatten
it.
+ licenses = portage.dep.use_reduce(
+ pkg._metadata["LICENSE"], matchall=1, flat=True)
+
+ # Check each entry to ensure that it exists in
${PORTDIR}/licenses/.
+ for lic in licenses:
+ # Need to check for "||" manually as no portage
+ # function will remove it without removing values.
+ if lic not in self.liclist and lic != "||":
+ self.qatracker.add_error(
+ "LICENSE.invalid",
+ package + "/" + y_ebuild + ".ebuild:
%s" % lic)
+ elif lic in self.liclist_deprecated:
+ self.qatracker.add_error(
+ "LICENSE.deprecated",
+ "%s: %s" % (ebuild.relative_path, lic))
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 125b390..5fe7515 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -63,6 +63,7 @@ from repoman.checks.ebuilds.pkgmetadata import PkgMetadata
from repoman.checks.ebuilds.use_flags import USEFlagChecks
from repoman.checks.ebuilds.variables.description import DescriptionChecks
from repoman.checks.ebuilds.variables.eapi import EAPIChecks
+from repoman.checks.ebuilds.variables.license import LicenseChecks
from repoman.ebuild import Ebuild
from repoman.errors import err
from repoman.modules.commit import repochecks
@@ -299,6 +300,7 @@ liveeclasscheck = LiveEclassChecks(qatracker)
rubyeclasscheck = RubyEclassChecks(qatracker)
eapicheck = EAPIChecks(qatracker, repo_settings)
descriptioncheck = DescriptionChecks(qatracker)
+licensecheck = LicenseChecks(qatracker, liclist, liclist_deprecated)
##
for xpkg in effective_scanlist:
@@ -617,22 +619,9 @@ for xpkg in effective_scanlist:
# license checks
if not badlicsyntax:
- # Parse the LICENSE variable, remove USE conditions and
- # flatten it.
- licenses = portage.dep.use_reduce(myaux["LICENSE"],
matchall=1, flat=True)
- # Check each entry to ensure that it exists in PORTDIR's
- # license directory.
- for lic in licenses:
- # Need to check for "||" manually as no portage
- # function will remove it without removing
values.
- if lic not in liclist and lic != "||":
- qatracker.add_error(
- "LICENSE.invalid",
- xpkg + "/" + y_ebuild +
".ebuild: %s" % lic)
- elif lic in liclist_deprecated:
- qatracker.add_error(
- "LICENSE.deprecated",
- "
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/
commit: eb305def1da58b1ad4f027baeff90c4787bdf3d0
Author: Tom Wijsman gentoo org>
AuthorDate: Mon Jun 2 16:24:03 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:26:56 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=eb305def
repoman/checks/ebuild/thirdpartymirrors.py: Fix logic
pym/repoman/checks/ebuilds/thirdpartymirrors.py | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/thirdpartymirrors.py
b/pym/repoman/checks/ebuilds/thirdpartymirrors.py
index cce61f6..f867c19 100644
--- a/pym/repoman/checks/ebuilds/thirdpartymirrors.py
+++ b/pym/repoman/checks/ebuilds/thirdpartymirrors.py
@@ -5,13 +5,15 @@ import portage
class ThirdPartyMirrors(object):
def __init__(self, repoman_settings, qatracker):
- # Build a regex from thirdpartymirrors for the SRC_URI.mirror
check.
+ # TODO: Build a regex instead here, for the SRC_URI.mirror
check.
self.thirdpartymirrors = {}
- for k, v in repoman_settings.thirdpartymirrors().items():
- for v in v:
- if not v.endswith("/"):
- v += "/"
- self.thirdpartymirrors[v] = k
+ profile_thirdpartymirrors =
repoman_settings.thirdpartymirrors().items()
+ for mirror_alias, mirrors in profile_thirdpartymirrors:
+ for mirror in mirrors:
+ if not mirror.endswith("/"):
+ mirror += "/"
+ self.thirdpartymirrors[mirror] = mirror_alias
+
self.qatracker = qatracker
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/herds/, pym/repoman/modules/commit/
commit: 92cd7f757112bf9f356ce2f76757a979b5cb1e92
Author: Tom Wijsman gentoo org>
AuthorDate: Tue Jun 3 11:42:39 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:26:57 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=92cd7f75
repoman: Fix up pyflakes imports and undefined functions or values
pym/repoman/_xml.py | 5 +
pym/repoman/checks/herds/herdbase.py | 2 ++
pym/repoman/copyrights.py| 10 --
pym/repoman/modules/commit/repochecks.py | 2 --
pym/repoman/profile.py | 3 ++-
5 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/pym/repoman/_xml.py b/pym/repoman/_xml.py
index 1871875..b97c027 100644
--- a/pym/repoman/_xml.py
+++ b/pym/repoman/_xml.py
@@ -55,7 +55,6 @@ class XmlLint(object):
self.binary = None
self._check_capable(options, repolevel, repoman_settings)
-
def _check_capable(self, options, repolevel, repoman_settings):
if options.mode == "manifest":
return
@@ -71,15 +70,13 @@ class XmlLint(object):
# this can be problematic if xmllint changes their
output
self._is_capable = True
-
@property
def capable(self):
return self._is_capable
-
def check(self, checkdir):
if not self.capable:
- return true
+ return True
# xmlint can produce garbage output even on success, so only
dump
# the ouput when it fails.
st, out = repoman_getstatusoutput(
diff --git a/pym/repoman/checks/herds/herdbase.py
b/pym/repoman/checks/herds/herdbase.py
index b1ba671..cfa37e4 100644
--- a/pym/repoman/checks/herds/herdbase.py
+++ b/pym/repoman/checks/herds/herdbase.py
@@ -24,6 +24,8 @@ from portage import _encodings, _unicode_encode
from portage.exception import FileNotFound, ParseError, PermissionDenied
from portage import os
+from repoman.errors import err
+
__all__ = [
"make_herd_base", "get_herd_base"
]
diff --git a/pym/repoman/copyrights.py b/pym/repoman/copyrights.py
index 01ce42f..056cfda 100644
--- a/pym/repoman/copyrights.py
+++ b/pym/repoman/copyrights.py
@@ -87,11 +87,11 @@ def update_copyright(fn_path, year, pretend=False):
new_header.append(line)
difflines = 0
- for line in difflib.unified_diff(
- [_unicode_decode(line) for line in orig_header],
- [_unicode_decode(line) for line in new_header],
+ for diffline in difflib.unified_diff(
+ [_unicode_decode(diffline) for diffline in orig_header],
+ [_unicode_decode(diffline) for diffline in new_header],
fromfile=fn_path, tofile=fn_path, n=0):
- util.writemsg_stdout(line, noiselevel=-1)
+ util.writemsg_stdout(diffline, noiselevel=-1)
difflines += 1
util.writemsg_stdout("\n", noiselevel=-1)
@@ -117,5 +117,3 @@ def update_copyright(fn_path, year, pretend=False):
else:
util.apply_stat_permissions(fn_path, fn_stat)
fn_hdl.close()
-
-
diff --git a/pym/repoman/modules/commit/repochecks.py
b/pym/repoman/modules/commit/repochecks.py
index d0e2f28..2839864 100644
--- a/pym/repoman/modules/commit/repochecks.py
+++ b/pym/repoman/modules/commit/repochecks.py
@@ -1,9 +1,7 @@
-
from portage.output import red
from repoman.errors import err
-from repoman.vcs import vcs
from repoman.vcs.vcs import detect_vcs_conflicts
diff --git a/pym/repoman/profile.py b/pym/repoman/profile.py
index 03e6c24..11b93c7 100644
--- a/pym/repoman/profile.py
+++ b/pym/repoman/profile.py
@@ -1,6 +1,7 @@
-from portage import os
from portage import normalize_path
+from portage import os
+from portage.output import red
class ProfileDesc(object):
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/eclasses/, pym/repoman/
commit: c1f364d1c7e7f5a17f612039481b59d9e4f56c37
Author: Tom Wijsman gentoo org>
AuthorDate: Wed Jun 4 13:40:35 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:26:59 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c1f364d1
repoman/main.py: Split "Live" checks to checks/ebuilds/eclass/live.py
pym/repoman/checks/ebuilds/eclasses/live.py | 39 +
pym/repoman/main.py | 45 -
2 files changed, 57 insertions(+), 27 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/eclasses/live.py
b/pym/repoman/checks/ebuilds/eclasses/live.py
new file mode 100644
index 000..20c573e
--- /dev/null
+++ b/pym/repoman/checks/ebuilds/eclasses/live.py
@@ -0,0 +1,39 @@
+
+'''live.py
+Performs Live eclass checks
+'''
+
+from repoman.repos import has_global_mask
+
+
+class LiveEclassChecks(object):
+ '''Performs checks for the usage of Live eclasses in ebuilds'''
+
+ def __init__(self, qatracker):
+ '''
+ @param qatracker: QATracker instance
+ '''
+ self.qatracker = qatracker
+
+ def check(self, pkg, package, ebuild, y_ebuild, keywords,
global_pmaskdict):
+ '''Ebuilds that inherit a "Live" eclass (darcs, subversion,
git, cvs,
+ etc..) should not be allowed to be marked stable
+
+ @param pkg: Package in which we check (object).
+ @param package: Package in which we check (string).
+ @param ebuild: Ebuild which we check (object).
+ @param y_ebuild: Ebuild which we check (string).
+ @param keywords: The keywords of the ebuild.
+ @param global_pmaskdict: A global dictionary of all the masks.
+ '''
+ is_stable = lambda kw: not kw.startswith("~") and not
kw.startswith("-")
+ bad_stable_keywords = list(filter(is_stable, keywords))
+
+ if bad_stable_keywords:
+ self.qatracker.add_error(
+ "LIVEVCS.stable", "%s/%s.ebuild with stable
keywords:%s " % (
+ package, y_ebuild, bad_stable_keywords))
+
+ good_keywords_exist = len(bad_stable_keywords) < len(keywords)
+ if good_keywords_exist and not has_global_mask(pkg,
global_pmaskdict):
+ self.qatracker.add_error("LIVEVCS.unmasked",
ebuild.relative_path)
\ No newline at end of file
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 1d2a3fb..f8a4993 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -50,6 +50,7 @@ from portage.package.ebuild.digestgen import digestgen
from repoman.argparser import parse_args
from repoman.checks.directories.files import FileChecks
from repoman.checks.ebuilds.checks import run_checks, checks_init
+from repoman.checks.ebuilds.eclasses.live import LiveEclassChecks
from repoman.checks.ebuilds.fetches import FetchChecks
from repoman.checks.ebuilds.keywords import KeywordChecks
from repoman.checks.ebuilds.isebuild import IsEbuild
@@ -63,16 +64,17 @@ from repoman.ebuild import Ebuild
from repoman.errors import err
from repoman.modules.commit import repochecks
from repoman.profile import check_profiles, dev_keywords, setup_profile
-from repoman.qa_data import (format_qa_output, format_qa_output_column, qahelp,
+from repoman.qa_data import (
+ format_qa_output, format_qa_output_column, qahelp,
qawarnings, qacats, max_desc_len, missingvars,
ruby_deprecated, suspect_virtual, suspect_rdepend, valid_restrict)
from repoman.qa_tracker import QATracker
-from repoman.repos import has_global_mask, RepoSettings, repo_metadata
+from repoman.repos import RepoSettings, repo_metadata
from repoman.scan import Changes, scan
from repoman._subprocess import repoman_popen, repoman_getstatusoutput
from repoman import utilities
-from repoman.vcs.vcs import (git_supports_gpg_sign, vcs_files_to_cps,
- VCSSettings)
+from repoman.vcs.vcs import (
+ git_supports_gpg_sign, vcs_files_to_cps, VCSSettings)
from repoman.vcs.vcsstatus import VCSStatus
@@ -274,18 +276,21 @@ if options.if_modified == "y":
chain(changed.changed, changed.new, changed.removed),
repolevel, reposplit, categories))
-### initialize our checks classes here before the big xpkg loop
+##
+# initialize our checks classes here before the big xpkg loop
manifester = Manifests(options, qatracker, repoman_settings)
is_ebuild = IsEbuild(repoman_settings, repo_settings, portdb, qatracker)
-filescheck = FileChecks(qatracker, repoman_settings, repo_settings, portdb,
- vcs_settings)
+filescheck = FileChecks(
+ qatracker, repoman_settings, repo_settings, portdb, vcs_settings)
status_check = VCSStatus(vcs_settings, qatracker)
-fetchcheck = FetchChecks(qatracker, repoman_settings
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 2a1de077903e87f7ef9514a270da444f2e4a4885
Author: Brian Dolbec gentoo org>
AuthorDate: Tue Jun 3 19:32:18 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:26:58 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2a1de077
repoman/main.py: Move the check class instantiations out of the xpkg loop
This should help reduce overall run time when doing large repoman full runs.
It instead re-uses the class instances for each pkg checked.
pym/repoman/main.py | 25 ++---
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index db6c468..a77b2f2 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -273,6 +273,19 @@ if options.if_modified == "y":
chain(changed.changed, changed.new, changed.removed),
repolevel, reposplit, categories))
+### initialize our checks classes here before the big xpkg loop
+manifester = Manifests(options, qatracker, repoman_settings)
+is_ebuild = IsEbuild(repoman_settings, repo_settings, portdb, qatracker)
+filescheck = FileChecks(qatracker, repoman_settings, repo_settings, portdb,
+ vcs_settings)
+status_check = VCSStatus(vcs_settings, qatracker)
+fetchcheck = FetchChecks(qatracker, repoman_settings, repo_settings, portdb,
+ vcs_settings)
+pkgmeta = PkgMetadata(options, qatracker, repoman_settings)
+thirdparty = ThirdPartyMirrors(repoman_settings, qatracker)
+use_flag_checks = USEFlagChecks(qatracker, uselist)
+
+
for xpkg in effective_scanlist:
# ebuilds and digests added to cvs respectively.
logging.info("checking package %s" % xpkg)
@@ -289,7 +302,6 @@ for xpkg in effective_scanlist:
checkdir_relative = os.path.join(".", checkdir_relative)
#
- manifester = Manifests(options, qatracker, repoman_settings)
if manifester.run(checkdir, portdb):
continue
if not manifester.generated_manifest:
@@ -302,7 +314,6 @@ for xpkg in effective_scanlist:
checkdirlist = os.listdir(checkdir)
##
- is_ebuild = IsEbuild(repoman_settings, repo_settings, portdb, qatracker)
pkgs, allvalid = is_ebuild.check(checkdirlist, checkdir, xpkg)
if is_ebuild.continue_:
# If we can't access all the metadata then it's totally unsafe
to
@@ -320,26 +331,20 @@ for xpkg in effective_scanlist:
ebuildlist = sorted(pkgs.values())
ebuildlist = [pkg.pf for pkg in ebuildlist]
###
- filescheck = FileChecks(qatracker, repoman_settings, repo_settings,
portdb,
- vcs_settings)
filescheck.check(checkdir, checkdirlist, checkdir_relative,
changed.changed, changed.new)
###
- status_check = VCSStatus(vcs_settings, qatracker)
status_check.check(check_ebuild_notadded, checkdir, checkdir_relative,
xpkg)
eadded.extend(status_check.eadded)
#
- fetchcheck = FetchChecks(qatracker, repoman_settings, repo_settings,
portdb,
- vcs_settings)
fetchcheck.check(xpkg, checkdir, checkdir_relative, changed.changed,
changed.new)
#
if check_changelog and "ChangeLog" not in checkdirlist:
qatracker.add_error("changelog.missing", xpkg + "/ChangeLog")
#
- pkgmeta = PkgMetadata(options, qatracker, repolevel, repoman_settings)
- pkgmeta.check(xpkg, checkdir, checkdirlist)
+ pkgmeta.check(xpkg, checkdir, checkdirlist, repolevel)
muselist = frozenset(pkgmeta.musedict)
#
@@ -397,7 +402,6 @@ for xpkg in effective_scanlist:
if not fetchcheck.src_uri_error:
###
- thirdparty = ThirdPartyMirrors(repoman_settings,
qatracker)
thirdparty.check(myaux, ebuild.relative_path)
###
if myaux.get("PROVIDE"):
@@ -632,7 +636,6 @@ for xpkg in effective_scanlist:
badprovsyntax = badprovsyntax > 0
#
- use_flag_checks = USEFlagChecks(qatracker, uselist)
use_flag_checks.check(pkg, xpkg, ebuild, y_ebuild, muselist)
ebuild_used_useflags = use_flag_checks.getUsedUseFlags()
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: f84b75a0c476da44831b928a7a0cba1a8772ff6f
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Nov 17 02:07:13 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:27:00 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f84b75a0
repoman/main.py: Update dependency.perlcore error to us qatracker
Update the original code added after the re-write had started.
This brings it up to date with teh new stats tracking class instance.
pym/repoman/main.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index e98520b..86ac802 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -560,7 +560,9 @@ for xpkg in effective_scanlist:
qatracker.add_error('dependency.perlcore',
ebuild.relative_path +
": %s: please
use '%s' instead of '%s'" %
- (mytype,
atom.replace("perl-core/","virtual/perl-"), atom))
+ (mytype,
+
atom.replace("perl-core/","virtual/perl-"),
+ atom))
if buildtime and \
not is_blocker and \
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/vcs/
commit: 87cc859878f725dc23224e724d171f823f5670be Author: Tom Wijsman gentoo org> AuthorDate: Mon Jun 2 16:23:20 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Sat Sep 5 21:26:56 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=87cc8598 repoman/vcs/vcsstatus.py: Only check VCS status in a VCS pym/repoman/vcs/vcsstatus.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pym/repoman/vcs/vcsstatus.py b/pym/repoman/vcs/vcsstatus.py index eedf866..f984832 100644 --- a/pym/repoman/vcs/vcsstatus.py +++ b/pym/repoman/vcs/vcsstatus.py @@ -22,7 +22,7 @@ class VCSStatus(object): def check(self, check_not_added): - if check_not_added: + if self.vcs and check_not_added: vcscheck = getattr(self, 'check_%s' % self.vcs) vcscheck()
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/commit/
commit: 05c9780c69ce5b6ccc46ee333ed5b74b733d8965
Author: Tom Wijsman gentoo org>
AuthorDate: Mon Jun 2 18:28:34 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Sep 5 21:26:56 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=05c9780c
repoman: Fix up commit imports and calls
pym/repoman/argparser.py | 3 ++-
pym/repoman/copyrights.py| 2 +-
pym/repoman/main.py | 24 ++--
pym/repoman/modules/commit/repochecks.py | 3 ++-
4 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/pym/repoman/argparser.py b/pym/repoman/argparser.py
index 5378e36..45f65fd 100644
--- a/pym/repoman/argparser.py
+++ b/pym/repoman/argparser.py
@@ -8,6 +8,7 @@ import logging
import sys
import portage
+from portage import util
from portage.util._argparse import ArgumentParser
def parse_args(argv, qahelp, repoman_default_opts):
@@ -176,7 +177,7 @@ def parse_args(argv, qahelp, repoman_default_opts):
opts, args = parser.parse_known_args(argv[1:])
if not opts.ignore_default_opts:
- default_opts = portage.util.shlex_split(repoman_default_opts)
+ default_opts = util.shlex_split(repoman_default_opts)
if default_opts:
opts, args = parser.parse_known_args(default_opts +
sys.argv[1:])
diff --git a/pym/repoman/copyrights.py b/pym/repoman/copyrights.py
index 231857f..01ce42f 100644
--- a/pym/repoman/copyrights.py
+++ b/pym/repoman/copyrights.py
@@ -83,7 +83,7 @@ def update_copyright(fn_path, year, pretend=False):
new_header.append(line)
break
- line = _update_copyright_year(year, line)
+ line = update_copyright_year(year, line)
new_header.append(line)
difflines = 0
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 57b5b40..c75657e 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -59,7 +59,7 @@ from repoman.checks.ebuilds.misc import bad_split_check,
pkg_invalid
from repoman.checks.ebuilds.pkgmetadata import PkgMetadata
from repoman.ebuild import Ebuild
from repoman.errors import err
-from repoman.modules import commit
+from repoman.modules.commit import repochecks
from repoman.profile import check_profiles, dev_keywords, setup_profile
from repoman.qa_data import (format_qa_output, format_qa_output_column, qahelp,
qawarnings, qacats, max_desc_len, missingvars,
@@ -190,8 +190,8 @@ repolevel = len(reposplit)
###
if options.mode == 'commit':
- commit.repochecks.commit_check(repolevel, reposplit)
- commit.repochecks.conflict_check(vcs_settings, options)
+ repochecks.commit_check(repolevel, reposplit)
+ repochecks.conflict_check(vcs_settings, options)
###
@@ -268,7 +268,8 @@ check_ebuild_notadded = not \
effective_scanlist = scanlist
if options.if_modified == "y":
effective_scanlist = sorted(vcs_files_to_cps(
- chain(changed.changed, changed.new, changed.removed)))
+ chain(changed.changed, changed.new, changed.removed),
+ repolevel, reposplit, categories))
for xpkg in effective_scanlist:
# ebuilds and digests added to cvs respectively.
@@ -1278,7 +1279,8 @@ else:
else:
commitmessage =
utilities.get_commit_message_with_stdin()
except KeyboardInterrupt:
- exithandler()
+ logging.fatal("Interrupted; exiting...")
+ sys.exit(1)
if (not commitmessage or not commitmessage.strip()
or commitmessage.strip() == msg_prefix):
print("* no commit message? aborting commit.")
@@ -1339,7 +1341,8 @@ else:
logging.info("checking for unmodified ChangeLog files")
committer_name =
utilities.get_committer_name(env=repoman_settings)
for x in sorted(vcs_files_to_cps(
- chain(myupdates, mymanifests, myremoved))):
+ chain(myupdates, mymanifests, myremoved),
+ repolevel, reposplit, categories)):
catdir, pkgdir = x.split("/")
checkdir = repo_settings.repodir + "/" + x
checkdir_relative = ""
@@ -1479,7 +1482,7 @@ else:
print("%s have headers that will change." %
green(str(len(myheaders
print(
- "* Files with headers will "
+ "* Files with headers will"
" cause the manifests to be changed and committed
separately.")
logging.info("myupdates: %s", myupdates)
@@ -1633,9 +1636,9 @@ else:
"doing the entire repository.\"\n")
if vcs_settings.vcs in
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/directories/
commit: ef08b0f94ace16f9644cb2abed960bf1feffc859 Author: Tom Wijsman gentoo org> AuthorDate: Mon Jun 2 15:58:38 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Sat Sep 5 21:26:55 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ef08b0f9 repoman/checks/directories/files.py: Fix to use global vcs_new_changed pym/repoman/checks/directories/files.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pym/repoman/checks/directories/files.py b/pym/repoman/checks/directories/files.py index 5dfca25..87220c0 100644 --- a/pym/repoman/checks/directories/files.py +++ b/pym/repoman/checks/directories/files.py @@ -40,7 +40,7 @@ class FileChecks(object): if index != -1: y_relative = os.path.join(checkdir_relative, y_file) invcs = self.vcs_settings.vcs is not None - inchangeset = self.vcs_new_changed(y_relative, changed, new) + inchangeset = vcs_new_changed(y_relative, changed, new) if invcs and not inchangeset: # If the file isn't in the VCS new or changed set, then # assume that it's an irrelevant temporary file (Manifest
[gentoo-commits] repo/gentoo:master commit in: dev-python/botocore/
commit: a201951e23bfb92aee71994b51512642d47e796c
Author: Alex Brandt gentoo org>
AuthorDate: Sat Sep 5 21:05:57 2015 +
Commit: Alex Brandt gentoo org>
CommitDate: Sat Sep 5 21:05:57 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a201951e
dev-python/botocore: add version 1.2.0
Package-Manager: portage-2.2.20.1
dev-python/botocore/Manifest | 1 +
dev-python/botocore/botocore-1.2.0.ebuild | 53 +++
2 files changed, 54 insertions(+)
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index d6c5d9a..615875a 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,3 +1,4 @@
DIST 1.1.11.tar.gz 1975224 SHA256
b4e6edc12177dd4f720259aa7027bab00fb9db2029e40e77e67c552ef9f41132 SHA512
b0b10299d93314de582cfd21511987fe210df1618c49f6c706c4341a3a635a85cd48d8848a69f83391a227ab5dc3881509a02b4cc47b1e27d18cf353d4de850b
WHIRLPOOL
21e662fe7f713a98e5e16225e3860585f0abb8e4a47b5f0ae52262a929a32ce563e1108c80602c9c2136180957c1b8bb4b89d8b9fc84415c155212d326f08b90
DIST botocore-1.1.7.tar.gz 1966396 SHA256
50d90705815aff4dd4e2be503ad42c0fb52874053046de9042bc16563a8ecd68 SHA512
4aba7712b7154362a52f46e2c0d28d0ff0d096d7741e99760848a23338420be290b3b91892cb764f4aca21122b208533a5b1e33bf23bce76b09e0bb5560b6764
WHIRLPOOL
9871171175dd88bf69171966c3fe8c410f07b0340381d64925d7c7ccf108664ba97f9785ffd61e3518ff9ce834eee7c405420d37c071acb1c655dd8c38f2ae95
DIST botocore-1.1.8.tar.gz 1969137 SHA256
338fed0119d819a60b2b7cf1a1a38f93603c5f012a2a483b713425816a43a57c SHA512
24c17057ce600873fb37ecd6712defe8339a36cc11cb77afd2417b68bef63e46ebb22dbe320e5c4bb7f948aee6fb3fc90336c021c6adf2d7902cab8ce6d214f2
WHIRLPOOL
54872902565ad7af5932517a554a4577445aa2539c1668f5d672f7e60b84efae6ad0af68e98d9cc3ed2fb4204936c6881bf17cda0ef821a2ee6e8f60b1cf6b20
+DIST botocore-1.2.0.tar.gz 1993122 SHA256
59f2b9109d2cef499679b1676622e653b6a74be8ce20f84104fe631eb5434972 SHA512
8a336c4895e61246f36fdacb7a90c192a6db8b543331b25a6abc153b4b7fd3dd1f06a7c2f64451a12d900ebebb0ae86d1fe0b8011e22a7b09fd6143a6b8a7072
WHIRLPOOL
3bc375a0949ff7a4cb5e97b766681c8a71f65183c36afd9900275ac54ea0bebea94bb655bf8020752ed1f9e85c9cca775fc3f531133ffb7ce535a5bfe1daf246
diff --git a/dev-python/botocore/botocore-1.2.0.ebuild
b/dev-python/botocore/botocore-1.2.0.ebuild
new file mode 100644
index 000..5908e96
--- /dev/null
+++ b/dev-python/botocore/botocore-1.2.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="
+ >=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+ ~dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+
