[gentoo-commits] repo/gentoo:master commit in: dev-ruby/fakefs/
commit: 4aac79c2174839a90aabd42a91a296a6582cee91
Author: Hans de Graaff gentoo org>
AuthorDate: Sat Jan 23 07:41:02 2016 +
Commit: Hans de Graaff gentoo org>
CommitDate: Sat Jan 23 07:47:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aac79c2
dev-ruby/fakefs: add 0.7.0
Package-Manager: portage-2.2.26
dev-ruby/fakefs/Manifest| 1 +
dev-ruby/fakefs/fakefs-0.7.0.ebuild | 44 +
2 files changed, 45 insertions(+)
diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest
index 9c382f4..fbfd41c 100644
--- a/dev-ruby/fakefs/Manifest
+++ b/dev-ruby/fakefs/Manifest
@@ -1,3 +1,4 @@
DIST fakefs-0.6.0.gem 41984 SHA256
43a668e9a436654d66eff7e896793800b4b8d87c3ecd5a6a84e23fb52580150e SHA512
8c0eac75103e1917551e2f5e74a5324d5a606e7692a8e4c49c9b97e2b5005bd381073a5780a8e6d1fb661a1bb4a67e56c29ce98cd2e2e62cce22602c30e4225f
WHIRLPOOL
c1a520c9cf3913e727ef570367d238e2ec88eb8d41789d1d33e9227a5a5dd9c62f4a462374066e1e5b5c5ac8bb0f738e6513b4d4182c20969178a82f90aa2739
DIST fakefs-0.6.5.gem 44032 SHA256
4c3c5378c839bd8f8e94dab767b417c74273cefda703bf338358d8e964bbf9ed SHA512
eef1500627eac9d2df312a74783ee43f3bcc8aaa83824cfb2ccf11bb6d21cc0e6d95d72a4aab78eaa15edbe9a856146ec3ef97408569d5eac56fc4bba2a12f56
WHIRLPOOL
09c03ae8500343ac771f019a21b19494d94e3fd1f114d78c9ba037d214e40a2927b083652a24d044190bb9cb81ded0ac2b1e1ea1dab953fbce462c541184b3da
DIST fakefs-0.6.7.gem 44544 SHA256
2fd9f56aecac9de55db0b4111f4f53d6ebbe00e68dd1cc089cc4c2d8589eb9a1 SHA512
1fe50b7692a153dfc2d48cb0fb4eb545a52c04362154d72a8b887f7d8f9fb5973abc13c685eba0f9cd4dbdf5a783ab8de2bd978747050b72b4f248c1a0d271c2
WHIRLPOOL
cf7a3a96f1efcd70b233fa129f0c5782b6b19bb3039960d2de981c9dc889c60956d313e8b17a21fab31a23013cce2b3fc2fd8f33f2603323c2e315aa85c18370
+DIST fakefs-0.7.0.gem 45568 SHA256
26f222a646ca113c5cb0a7c0adb90a521e5c791a809801270f55c1462769bced SHA512
881342155a153211a0f76b37722e60de08be953a3345fffab9f57f141d3e5443636e5d82a97620487319fb61b9932051ff73e9fc8aa9f12fb7acaf02ea31e4e4
WHIRLPOOL
8ed1060a9ac3fbe8b334f5dc7ab23371d156faa0afcae76eb069b365df7a3e2e8b723931358ab065cd1e5bd9fae384abadc77b385c239847f2a09c9ca00b4440
diff --git a/dev-ruby/fakefs/fakefs-0.7.0.ebuild
b/dev-ruby/fakefs/fakefs-0.7.0.ebuild
new file mode 100644
index 000..a3072e9
--- /dev/null
+++ b/dev-ruby/fakefs/fakefs-0.7.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# requires sdoc
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.markdown"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="A fake filesystem. Use it in your tests"
+HOMEPAGE="https://github.com/defunkt/fakefs";
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+ test? (
+ >=dev-ruby/rspec-3.1:3
+ >=dev-ruby/minitest-5.5
+ )"
+
+all_ruby_prepare() {
+ # Remove bundler
+ rm Gemfile || die
+
+ # Avoid unneeded minitest-rg dependency.
+ sed -i -e '1igem "minitest", "~>5.5"' \
+ -e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_test() {
+ RSPEC_VERSION=3 ruby-ng_rspec
+ ${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}'
|| die
+}
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/rubyntlm/
commit: 7f7b0b0622631cf4ce1f53589ac304a66320713e
Author: Hans de Graaff gentoo org>
AuthorDate: Sat Jan 23 07:46:04 2016 +
Commit: Hans de Graaff gentoo org>
CommitDate: Sat Jan 23 07:47:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f7b0b06
dev-ruby/rubyntlm: add 0.5.3
Package-Manager: portage-2.2.26
dev-ruby/rubyntlm/Manifest | 1 +
dev-ruby/rubyntlm/rubyntlm-0.5.3.ebuild | 25 +
2 files changed, 26 insertions(+)
diff --git a/dev-ruby/rubyntlm/Manifest b/dev-ruby/rubyntlm/Manifest
index 0095622..0eed512 100644
--- a/dev-ruby/rubyntlm/Manifest
+++ b/dev-ruby/rubyntlm/Manifest
@@ -1,2 +1,3 @@
DIST rubyntlm-0.4.0.gem 21504 SHA256
bd10dcab5f1166e10049f0649a28f49bcc56c0592683d094a2852dd62b8ab50f SHA512
33a845b3b898d5e45ef51d4c3ab9a928789d2506c9854dedac2afb71b639abd91054c89357a0f33f975984172b8b7bf58c22a6ec50e4ab423d3269910284151e
WHIRLPOOL
a67927dde3fc3b539640d5d346e239c4fd0db4c0f3e7af1836c619ee942920a9f5f7c26e7035d0dfe9ef98de610fefb945ab6ed480403437e94af4ac6a64e59f
DIST rubyntlm-0.5.2.gem 27648 SHA256
a78d87ad0c3642e523fa509f4bd23116391629f8cb6aa6484f02010a0d328812 SHA512
29a29756b6788257f2ed9a3a7ef5cbdcd4b7871922658d922c46ee127a89848232450cb17b23d8f7fda023399d4ec9b1029c51f7a2fb7cdc635028e56e340aa5
WHIRLPOOL
2ca8f47da195826ae1762ffbc5d9ce2f60f5c9ff40a846136eeb61104ab43ebafecb2ecda3500b5a9fbb03ae002df6a219d866fff1c63448351b30901aca72d3
+DIST rubyntlm-0.5.3.gem 27648 SHA256
67b102621103d59f80553c5f9924c7def90ae3c98b404495dd3411d557d1bb48 SHA512
d7a86bc3e66aed77285e0a065c13e1a4211a7148d90e4f14da308c49dc080bab000cd77d1ae89149f5b671f111ac65ead1363e08944b6aff54e35b096f0a
WHIRLPOOL
d396cc6307b0118dda9034b4801275f7bb348daa56f309c6e4f2636564f1903d9a11375b338a3f9299295404a2f70f25063bdc023137611e7a5795c3e2f05a09
diff --git a/dev-ruby/rubyntlm/rubyntlm-0.5.3.ebuild
b/dev-ruby/rubyntlm/rubyntlm-0.5.3.ebuild
new file mode 100644
index 000..97f93d8
--- /dev/null
+++ b/dev-ruby/rubyntlm/rubyntlm-0.5.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby/NTLM provides message creator and parser for the NTLM
authentication."
+HOMEPAGE="https://github.com/winrb/rubyntlm";
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+ sed -i -e '/simplecov/ s:^:#:' spec/spec_helper.rb || die
+}
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/arel-helpers/
commit: a6d6de6a081c45c5dc6228d0648a2f8707701a7c
Author: Hans de Graaff gentoo org>
AuthorDate: Sat Jan 23 07:37:55 2016 +
Commit: Hans de Graaff gentoo org>
CommitDate: Sat Jan 23 07:47:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6d6de6a
dev-ruby/arel-helpers: add 2.2.0
Package-Manager: portage-2.2.26
dev-ruby/arel-helpers/Manifest | 1 +
dev-ruby/arel-helpers/arel-helpers-2.2.0.ebuild | 33 +
2 files changed, 34 insertions(+)
diff --git a/dev-ruby/arel-helpers/Manifest b/dev-ruby/arel-helpers/Manifest
index 4844ddb..6b667b0 100644
--- a/dev-ruby/arel-helpers/Manifest
+++ b/dev-ruby/arel-helpers/Manifest
@@ -1 +1,2 @@
DIST arel-helpers-2.1.1.gem 10752 SHA256
692fa104b211ca97c1215ddbfb21710d9b581434a5f37062c9d7d8cbfaaa80d9 SHA512
e9a607f2fb34dfdaf447fa306378aa3c59d31695946f09fdf978101f2218f50dc2ba14483b958644c77a0c03705f4cf05a696b2c280bfd28766ad015d83d72fb
WHIRLPOOL
00b71849305660a21e40e9975f2966984ee01c944efee80a71feda66e7ac09937a69c17ea1e25cafe6135969ba87160155e991a8c41a87b3bdd523b39c61fa04
+DIST arel-helpers-2.2.0.gem 11264 SHA256
9af47bee4c9db4aaefaee39583ac281abc3cf3702fa93d27978fd3630d7da56e SHA512
bd2f97975c408301a3bf5c02d8455ad584b26602f29fc4363e029590e1875b086138d2b383762bbac372e5e12183967eadd8b46952272aa90f48c15d21fad06b
WHIRLPOOL
ceaae68d580a13d71e9ebd84d37cbd1655b2c0e9c6e5fcaf8f9351ac9918b96ecb850e37541e9ef10524bdec5f1557a3ecfc9f3089b037ab9b4539603c4416bc
diff --git a/dev-ruby/arel-helpers/arel-helpers-2.2.0.ebuild
b/dev-ruby/arel-helpers/arel-helpers-2.2.0.ebuild
new file mode 100644
index 000..869e498
--- /dev/null
+++ b/dev-ruby/arel-helpers/arel-helpers-2.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools to help construct database queries"
+HOMEPAGE="https://github.com/camertron/arel-helpers";
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "|| ( dev-ruby/activerecord:3.2
+ dev-ruby/activerecord:4.0
+ dev-ruby/activerecord:4.1
+ dev-ruby/activerecord:4.2 )"
+
+ruby_add_bdepend "test? (
+ dev-ruby/rr
+ dev-ruby/activerecord[sqlite]
+)"
+
+all_ruby_prepare() {
+ sed -i -e '/pry-nav/ s:^:#:' spec/spec_helper.rb || die
+}
[gentoo-commits] repo/gentoo:master commit in: app-i18n/freewnn/
commit: 6d1843af1bc9b8cfc2c7324df799820f88b87b50
Author: Jeroen Roovers gentoo org>
AuthorDate: Sat Jan 23 07:05:21 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sat Jan 23 07:25:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d1843af
app-i18n/freewnn: Stable for HPPA (bug #566386).
Package-Manager: portage-2.2.27
RepoMan-Options: --ignore-arches
app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild
b/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild
index 4a972ce..643bda1 100644
--- a/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild
+++ b/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild
@@ -15,7 +15,7 @@
SRC_URI="mirror://sourceforge.jp/freewnn/59257/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86"
IUSE="X ipv6"
DEPEND="X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt )"
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 4e92bfae3baf7a4bb59bd410473d3d9692ea1b91
Author: Jeroen Roovers gentoo org>
AuthorDate: Sat Jan 23 07:18:08 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sat Jan 23 07:25:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e92bfae
app-office/scribus: Stable for HPPA PPC64 (bug #550040).
Package-Manager: portage-2.2.27
RepoMan-Options: --ignore-arches
app-office/scribus/scribus-1.4.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/scribus/scribus-1.4.5.ebuild
b/app-office/scribus/scribus-1.4.5.ebuild
index 2a9e903..e41e96c 100644
--- a/app-office/scribus/scribus-1.4.5.ebuild
+++ b/app-office/scribus/scribus-1.4.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 hppa ppc ppc64 ~sparc ~x86"
IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"
# a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk
'{print $2}'); echo ${a}
[gentoo-commits] repo/gentoo:master commit in: dev-util/debootstrap/
commit: 2a045e779def26303c629cb8d7bb6f3f4fa3db05
Author: Jeroen Roovers gentoo org>
AuthorDate: Sat Jan 23 07:08:15 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sat Jan 23 07:25:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a045e77
dev-util/debootstrap: Stable for HPPA (bug #570806).
Package-Manager: portage-2.2.27
RepoMan-Options: --ignore-arches
dev-util/debootstrap/debootstrap-1.0.75.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/debootstrap/debootstrap-1.0.75.ebuild
b/dev-util/debootstrap/debootstrap-1.0.75.ebuild
index 59a9926..1b7d8ee 100644
--- a/dev-util/debootstrap/debootstrap-1.0.75.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.75.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86
~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86
~amd64-linux ~x86-linux"
RDEPEND="
app-arch/dpkg
[gentoo-commits] repo/gentoo:master commit in: net-libs/libmicrohttpd/
commit: 31cc8310c00a5fc20db691d9db2546ac31aacb25
Author: Jeroen Roovers gentoo org>
AuthorDate: Sat Jan 23 07:00:58 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sat Jan 23 07:25:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31cc8310
net-libs/libmicrohttpd: Stable for HPPA (bug #568708).
Package-Manager: portage-2.2.27
RepoMan-Options: --ignore-arches
net-libs/libmicrohttpd/libmicrohttpd-0.9.47.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.47.ebuild
b/net-libs/libmicrohttpd/libmicrohttpd-0.9.47.ebuild
index 99d7f1c..b18f80b 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.47.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.47.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/12"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 sparc x86"
IUSE="epoll messages ssl static-libs test"
RDEPEND="ssl? (
[gentoo-commits] repo/gentoo:master commit in: media-libs/exiftool/
commit: 427a3a0e444e3fff26aca9f76db3e32039375585
Author: Tim Harder gentoo org>
AuthorDate: Sat Jan 23 07:03:51 2016 +
Commit: Tim Harder gentoo org>
CommitDate: Sat Jan 23 07:04:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=427a3a0e
media-libs/exiftool: version bump to 10.10
media-libs/exiftool/Manifest | 1 +
media-libs/exiftool/exiftool-10.10.ebuild | 24
2 files changed, 25 insertions(+)
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 5e41e26..2e16ad1 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,4 +1,5 @@
DIST Image-ExifTool-10.00.tar.gz 4013694 SHA256
7b573331eba3921b56339018e95dd5e6f5a1e4634e4fc7bad91e5778da3571f4 SHA512
4ab96f830b48dbde4c9a5c00df57ff638d7d7c458f4c87ded1b6274d844af1dcf41dd1d0c88117be8189f8ae0d3926673095327d9f972235f38b83177e67867c
WHIRLPOOL
4a44882b21e4e5878dc7a5a650f224cff08024fa8f315c2036758afb7d7ebcc10c33d3267541cc5f0c346bd636dd54cf6dcbe9bd7b59ba8592fcaa15b588bad6
DIST Image-ExifTool-10.07.tar.gz 4035921 SHA256
012ac8bf1b48b78d3f09b17d172765956968423f0ded737f8e0a6cf3f3316218 SHA512
3a93902a6b1bcc72b425c76ad1b34ea8d8e681787421bdb37130825cd9222758196acdd453ac63858d228da019e70c738417088b5f0139704d0e299331f72c09
WHIRLPOOL
a2904e08e156f331a1bb8249494c798c2d6cf16434974a341c73374303e7f1756753f435fd108e8104026c5a0f87e94629566d321b1d329132cee056ab9017d5
DIST Image-ExifTool-10.09.tar.gz 4041349 SHA256
b6e621bfd2de6ea6c16bd7ee709f6c7ec47344c70de39b8c5c911e4ac930cad5 SHA512
cc814850ab01d1eaf00614355c689682d04dffa88f65f75308861954a9c4f1bf4a347624b1068b81050ecafa9043701941e6d53914b2a5892f2e336a18c24e5d
WHIRLPOOL
2d7ad180004dadd7cced67f438e6d75f7697072770e2e4530131e31ca75e45acc0d28d6c4459681ee11eca5a0e86afe7dafd518c293a3fe9c0ababbd0e72bd61
+DIST Image-ExifTool-10.10.tar.gz 4056189 SHA256
f9fcecf8954cfd6b1f5658e1fc82801e8b98f891c88a60adbd6bc5c716471e09 SHA512
c18963020f02f196c68d89d22126834dbde31b2e13da0b56509d1d25f9adb6248f8e4ea9ec7cba7f144a44d6c81e966e9aafd36d4e2d76d92e3b7a0c7e4fdacd
WHIRLPOOL
e5bd0791dfc7fa4b16d4ee770d866626a119cf68b8e2736cda1181a2fcb7a32e96ad885a706d25da0241bd9ba1c0637c23be49e5662fe813fa8fb48b4100768c
DIST Image-ExifTool-9.98.tar.gz 4002089 SHA256
cf7e89b40e942ff582b06b958edfce2e2c7ba2986a650212a96fa74cf5bbc74b SHA512
138bcf0aeab6fe893df3f051ca9d5d2e7fabbfb19e6b68ee0529515c1e6f6d89d75ca8aacabfb7edc2e380caa04f8bb97536ef284b0bf140edfcf9c8363a482c
WHIRLPOOL
edb5c4799079b27a008ebb95e2ae13ec2c37cb123f3664582f6ddc8a0b3cb351410d12b2c1d5352a10a4213c8e7fcc591f64fb514c83bbecdf582780f27a0237
diff --git a/media-libs/exiftool/exiftool-10.10.ebuild
b/media-libs/exiftool/exiftool-10.10.ebuild
new file mode 100644
index 000..0d48581
--- /dev/null
+++ b/media-libs/exiftool/exiftool-10.10.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN=Image-ExifTool
+MY_P=${MY_PN}-${PV}
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="http://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
+SRC_URI="http://www.sno.phy.queensu.ca/~phil/exiftool/${MY_P}.tar.gz";
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc"
+
+SRC_TEST="do"
+
+src_install() {
+ perl-module_src_install
+ use doc && dohtml -r html/
+}
[gentoo-commits] repo/gentoo:master commit in: dev-python/shortuuid/
commit: 1ddc07eed736e619ba51f3f226f1bdfba03fa234
Author: Johann Schmitz gentoo org>
AuthorDate: Sat Jan 23 07:00:53 2016 +
Commit: Johann Schmitz gentoo org>
CommitDate: Sat Jan 23 07:01:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ddc07ee
dev-python/shortuuid: Version bump to 0.4.3; added support for test
Package-Manager: portage-2.2.26
dev-python/shortuuid/Manifest | 1 +
dev-python/shortuuid/shortuuid-0.4.3.ebuild | 26 ++
2 files changed, 27 insertions(+)
diff --git a/dev-python/shortuuid/Manifest b/dev-python/shortuuid/Manifest
index e1e1920..427fb3c 100644
--- a/dev-python/shortuuid/Manifest
+++ b/dev-python/shortuuid/Manifest
@@ -1 +1,2 @@
DIST shortuuid-0.4.2.tar.gz 5367 SHA256
47fa452b53fcf15427e539efd9fee8e625a9aebeb81db9339df7aeede52c2b61 SHA512
c60122bffdf458fb6aaf8ff4883d15f121ce8e5c0b24b99609171cc7bb103a1dbbf876b39e84129b50cc6ebfc1310740ffe684f7dfd93c750d0ff55d483273a3
WHIRLPOOL
648a63a48ecc2b8609b6d83cff41314b90b78488d85cfa2eed4b363029905d0d0238e52dad4f014dc419a6e8ed72fe1cdfc48f02d6e363aaf0ef1ac5b387a7f9
+DIST shortuuid-0.4.3.tar.gz 6096 SHA256
4606dbb19124d98109c00e2cafae2df8117aec02115623e18fb2abe3f766d293 SHA512
409bcaaff421a392640e39a7d25d4eaa320826971dca9d13270b61f21c78f65c617c302b3f7db5d0a3400c8ed4380a3a8eda90d1e9ad13d0a3a7eca53440ea7e
WHIRLPOOL
3b9494b9332ab6fb04bdc6ab50271bc192a6c93fdbddab9d58ebee5d4e33f9823db389b1318dddb9518eb10b57ff30e74328c5ad109684310a8aa22465cb2503
diff --git a/dev-python/shortuuid/shortuuid-0.4.3.ebuild
b/dev-python/shortuuid/shortuuid-0.4.3.ebuild
new file mode 100644
index 000..a746f39
--- /dev/null
+++ b/dev-python/shortuuid/shortuuid-0.4.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A generator library for concise, unambiguous and URL-safe UUIDs"
+HOMEPAGE="https://pypi.python.org/pypi/shortuuid";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pep8[${PYTHON_USEDEP}] )"
+
+python_test() {
+ ${EPYTHON} ${PN}/tests.py || die "Tests failed with ${EPYTHON}"
+}
\ No newline at end of file
[gentoo-commits] repo/gentoo:master commit in: sys-apps/pkgcore/
commit: 213392853be45174c017fa37c20a5b0f0dd5121e
Author: Tim Harder gentoo org>
AuthorDate: Sat Jan 23 06:52:20 2016 +
Commit: Tim Harder gentoo org>
CommitDate: Sat Jan 23 06:52:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21339285
sys-apps/pkgcore: simplify docs build/install
sys-apps/pkgcore/pkgcore-.ebuild | 21 -
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/sys-apps/pkgcore/pkgcore-.ebuild
b/sys-apps/pkgcore/pkgcore-.ebuild
index 2d2c135..0cf4962 100644
--- a/sys-apps/pkgcore/pkgcore-.ebuild
+++ b/sys-apps/pkgcore/pkgcore-.ebuild
@@ -41,15 +41,8 @@ pkg_setup() {
}
python_compile_all() {
- if [[ ${PV} == * ]]; then
- esetup.py build_man
- ln -s "${BUILD_DIR}/sphinx/man" man || die
- fi
-
- if use doc; then
- esetup.py build_docs
- ln -s "${BUILD_DIR}/sphinx/html" html || die
- fi
+ [[ ${PV} == * ]] && esetup.py build_man
+ use doc && esetup.py build_docs
}
python_test() {
@@ -57,14 +50,8 @@ python_test() {
}
python_install_all() {
- local cmds=(
- install_man
- )
- use doc && cmds+=(
- install_docs --path="${ED%/}"/usr/share/doc/${PF}/html
- )
-
- distutils-r1_python_install "${cmds[@]}"
+ distutils-r1_python_install install_man \
+ $(usex doc "install_docs
--path="${ED%/}"/usr/share/doc/${PF}/html" "")
distutils-r1_python_install_all
}
[gentoo-commits] repo/gentoo:master commit in: app-admin/vault/
commit: b59b7f4c09821fe30584c5c7ca9ff3abf64d4133
Author: Zac Medico gentoo org>
AuthorDate: Sat Jan 23 06:48:35 2016 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Jan 23 06:48:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b59b7f4c
app-admin/vault: remove old version
Package-Manager: portage-2.2.27
app-admin/vault/vault-0.1.2.ebuild | 108 -
1 file changed, 108 deletions(-)
diff --git a/app-admin/vault/vault-0.1.2.ebuild
b/app-admin/vault/vault-0.1.2.ebuild
deleted file mode 100644
index a910cd9..000
--- a/app-admin/vault/vault-0.1.2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils fcaps golang-build systemd user
-
-GO_PN="github.com/hashicorp/${PN}"
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/";
-SRC_URI="
- https://${GO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/mitchellh/gox/archive/v0.3.0.tar.gz ->
gox-0.3.0.tar.gz
-
https://github.com/mitchellh/iochan/archive/b584a329b193e206025682ae6c10cdbe03b0cd77.tar.gz
-> iochan-b584a329b193e206025682ae6c10cdbe03b0cd77.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND="dev-go/go-oauth2"
-RDEPEND=""
-
-STRIP_MASK="*.a"
-
-S="${WORKDIR}/src/${GO_PN}"
-
-FILECAPS=(
- -m 755 'cap_ipc_lock=+ei' usr/bin/${PN}
-)
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_unpack() {
- local x
-
- default
- mkdir -p src/${GO_PN%/*} || die
- mv ${P} src/${GO_PN} || die
-
- # Create a writable GOROOT in order to avoid sandbox violations.
- export GOROOT="${WORKDIR}/goroot"
- cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
- rm -rf "${GOROOT}/src/${GO_PN}" || die
-
- export
GOPATH=${WORKDIR}:${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace:$(get_golibdir_gopath)
-
- while read -r -d '' x; do
- rm -rf "${GOROOT}/src/${x}"
"${GOROOT}/pkg/${KERNEL}_${ARCH}/${x}"{,.a} || die
- done < <(find
"${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace/src" -maxdepth 3
-mindepth 3 -type d -print0)
-
- mkdir -p "${GOROOT}/src/github.com/mitchellh" || die
- rm -rf "${GOROOT}/src/github.com/mitchellh/gox" || die
- mv gox-0.3.0 "${GOROOT}/src/github.com/mitchellh/gox" || die
- rm -rf "${GOROOT}/src/github.com/mitchellh/iochan" || die
- mv iochan-* "${GOROOT}/src/github.com/mitchellh/iochan" || die
-}
-
-src_prepare() {
- # Avoid the need to have a git checkout
- sed -e 's:^GIT.*::' \
- -e 's:-ldflags.*:\\:' \
- -i scripts/build.sh || die
-}
-
-src_compile() {
- go install -v -x github.com/mitchellh/gox || die
- PATH=${GOROOT}/bin:${PATH} emake dev
-}
-
-src_install() {
- local x
-
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- keepdir /etc/${PN}.d
- insinto /etc/${PN}.d
- doins "${FILESDIR}/"*.json.example
-
- keepdir /var/log/${PN}
- fowners ${PN}:${PN} /var/log/${PN}
-
- dobin bin/${PN}
-
- egit_clean "${WORKDIR}"/{pkg,src}
-
- find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete
|| die
-
- while read -r -d '' x; do
- x=${x#${WORKDIR}/src}
- [[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} ||
- -f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] &&
continue
- rm -rf "${WORKDIR}"/src/${x}
- done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d
-print0)
- insopts -m0644 -p # preserve timestamps for bug 551486
- insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*}
- doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN}
- insinto /usr/lib/go/src/${GO_PN%/*}
- doins -r "${WORKDIR}"/src/${GO_PN}
-}
[gentoo-commits] repo/gentoo:master commit in: app-admin/consul-template/
commit: f019d94e8989acd6c41bce3bbc95aeee73224cf1
Author: Zac Medico gentoo org>
AuthorDate: Sat Jan 23 06:43:40 2016 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Jan 23 06:44:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f019d94e
app-admin/consul-template: remove old version
Package-Manager: portage-2.2.27
.../consul-template/consul-template-0.9.0.ebuild | 103 -
1 file changed, 103 deletions(-)
diff --git a/app-admin/consul-template/consul-template-0.9.0.ebuild
b/app-admin/consul-template/consul-template-0.9.0.ebuild
deleted file mode 100644
index 80a3de8..000
--- a/app-admin/consul-template/consul-template-0.9.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit golang-base systemd user
-
-KEYWORDS="~amd64"
-DESCRIPTION="Generic template rendering and notifications with Consul"
-GO_PN="github.com/hashicorp/${PN}"
-HOMEPAGE="http://${GO_PN}";
-LICENSE="MPL-2.0"
-SLOT="0"
-IUSE="test"
-
-DEPEND=">=dev-lang/go-1.4
- test? ( dev-go/go-tools )
- app-admin/consul
- app-admin/vault"
-RDEPEND=""
-
-SRC_URI="https://${GO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/hashicorp/go-multierror/archive/fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz
-> go-multierror-fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz
-https://github.com/armon/go-radix/archive/0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz
-> go-radix-0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz
-https://github.com/hashicorp/errwrap/archive/7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz
-> errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz
-https://github.com/armon/go-metrics/archive/a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz
-> go-metrics-a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz
-https://github.com/hashicorp/go-msgpack/archive/71c2886f5a673a35f909803f38ece5810165097b.tar.gz
-> go-msgpack-71c2886f5a673a35f909803f38ece5810165097b.tar.gz
-https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz
-> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz
-https://github.com/hashicorp/golang-lru/archive/995efda3e073b6946b175ed93901d729ad47466a.tar.gz
-> golang-lru-995efda3e073b6946b175ed93901d729ad47466a.tar.gz
-https://github.com/hashicorp/hcl/archive/513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz
-> hcl-513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz
-https://github.com/hashicorp/logutils/archive/367a65d59043b4f846d179341d138f01f988c186.tar.gz
-> logutils-367a65d59043b4f846d179341d138f01f988c186.tar.gz
-https://github.com/mitchellh/copystructure/archive/6fc66267e9da7d155a9d3bd489e00dad02666dc6.tar.gz
-> copystructure-6fc66267e9da7d155a9d3bd489e00dad02666dc6.tar.gz
-https://github.com/mitchellh/mapstructure/archive/442e588f213303bec7936deba67901f8fc8f18b1.tar.gz
-> mapstructure-442e588f213303bec7936deba67901f8fc8f18b1.tar.gz
-https://github.com/mitchellh/reflectwalk/archive/242be0c275dedfba00a616563e6db75ab8f279ec.tar.gz
-> reflectwalk-242be0c275dedfba00a616563e6db75ab8f279ec.tar.gz
-https://github.com/samuel/go-zookeeper/archive/d0e0d8e11f318e000a8cc434616d69e329edc374.tar.gz
-> go-zookeeper-d0e0d8e11f318e000a8cc434616d69e329edc374.tar.gz"
-STRIP_MASK="*.a"
-S="${WORKDIR}/src/${GO_PN}"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-get_archive_go_package() {
- local archive=${1} uri x
- for x in ${SRC_URI}; do
- if [[ ${x} == http* ]]; then
- uri=${x}
- elif [[ ${x} == ${archive} ]]; then
- break
- fi
- done
- uri=${uri#https://}
- echo ${uri%/archive/*}
-}
-
-unpack_go_packages() {
- local go_package x
- # Unpack packages to appropriate locations for GOPATH
- for x in ${A}; do
- unpack ${x}
- go_package=$(get_archive_go_package ${x})
- mkdir -p src/${go_package%/*}
- mv ${go_package##*/}-* src/${go_package} || die
- done
-}
-
-src_unpack() {
- unpack_go_packages
- export GOPATH=${WORKDIR}:$(get_golibdir_gopath)
-}
-
-src_prepare() {
- sed -e 's|build: deps|build:|' -e 's|test: deps|test:|' \
- -i Makefile || die
-
- # Disable tests that fail under network-sandbox
- sed -e 's:TestRun_onceFlag(:_\0:' -i cli_test.go || die
- sed -e 's:TestRunner_quiescence(:_\0:' -i runner_test.go || die
-}
-
-src_compile() {
- emake build
-}
-
-src_install() {
- local x
-
- dobin bin/${PN}
- dodoc README.md
-
- keepdir /var/log/${PN}
- fowners ${PN}:${PN} /var/log/${PN}
-
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- keepdir /etc
[gentoo-commits] repo/gentoo:master commit in: dev-python/py2neo/
commit: 8e6fce32b27cabfbccd5706f1108f43b5e4a7e41
Author: Johann Schmitz gentoo org>
AuthorDate: Sat Jan 23 06:43:44 2016 +
Commit: Johann Schmitz gentoo org>
CommitDate: Sat Jan 23 06:43:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e6fce32
dev-python/py2neo: Dropped 2.0.6
Package-Manager: portage-2.2.26
dev-python/py2neo/Manifest| 1 -
dev-python/py2neo/py2neo-2.0.6.ebuild | 24
2 files changed, 25 deletions(-)
diff --git a/dev-python/py2neo/Manifest b/dev-python/py2neo/Manifest
index 723cd26..c6f03d5 100644
--- a/dev-python/py2neo/Manifest
+++ b/dev-python/py2neo/Manifest
@@ -1,2 +1 @@
-DIST py2neo-2.0.6.tar.gz 251448 SHA256
6bb828d6d3e48b4d095b3f7d79dbb690a47633f0a9812eb62f141b042bab3186 SHA512
93f94ff678ce34e7a9754330939379e9e4211ddf932484d748215c49548a48997a90bcf384a7bd3713ea341db68f0400eeaac40afc686336a144ee20fa09c8cf
WHIRLPOOL
c7cbba6f9b3f5a8c039817286bb1027c984cc3c1d48c7f17ea6c3770f0fc5d02811885955b854cac174bc2cbf579610642362c7e1955fcb958ffa905c6a2affa
DIST py2neo-2.0.8.tar.gz 860564 SHA256
57b4a1c4aa800e03904b2adfd7c8ec467b072bae2d24baf150fd580916255f2e SHA512
77f18a86ccd16d0152b814fa0e10d7a5629ade5a76f027aa13c856a7d4ac7d51861e87c04a9f9012c87b533f202774c0c84d16b4c65435406114f70bb59a7e1b
WHIRLPOOL
e779abb6de768205076783adf0f7816cdcfefc77cb5d52162485c69bdeed6df2fd2bdd3f28539567c480d97ff3783e7711f9b6ddec9c193f5ea19a98aff7d799
diff --git a/dev-python/py2neo/py2neo-2.0.6.ebuild
b/dev-python/py2neo/py2neo-2.0.6.ebuild
deleted file mode 100644
index 5460323..000
--- a/dev-python/py2neo/py2neo-2.0.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple and pragmatic library which accesses the Neo4j graph
database"
-HOMEPAGE="http://py2neo.org";
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-python_compile() {
- # https://github.com/nigelsmall/py2neo/issues/380
- python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
- distutils-r1_python_compile
-}
[gentoo-commits] repo/gentoo:master commit in: dev-python/py2neo/
commit: 9274d380913d1dc2a5b4a6f5a11dc3ddce0c8653
Author: Johann Schmitz gentoo org>
AuthorDate: Sat Jan 23 06:42:41 2016 +
Commit: Johann Schmitz gentoo org>
CommitDate: Sat Jan 23 06:42:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9274d380
dev-python/py2neo: Version bump wrt #572520
Package-Manager: portage-2.2.26
dev-python/py2neo/Manifest | 2 +-
.../py2neo/{py2neo-2.0.7.ebuild => py2neo-2.0.8.ebuild} | 13 ++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/dev-python/py2neo/Manifest b/dev-python/py2neo/Manifest
index 604e6fe..723cd26 100644
--- a/dev-python/py2neo/Manifest
+++ b/dev-python/py2neo/Manifest
@@ -1,2 +1,2 @@
DIST py2neo-2.0.6.tar.gz 251448 SHA256
6bb828d6d3e48b4d095b3f7d79dbb690a47633f0a9812eb62f141b042bab3186 SHA512
93f94ff678ce34e7a9754330939379e9e4211ddf932484d748215c49548a48997a90bcf384a7bd3713ea341db68f0400eeaac40afc686336a144ee20fa09c8cf
WHIRLPOOL
c7cbba6f9b3f5a8c039817286bb1027c984cc3c1d48c7f17ea6c3770f0fc5d02811885955b854cac174bc2cbf579610642362c7e1955fcb958ffa905c6a2affa
-DIST py2neo-2.0.7.tar.gz 251601 SHA256
9b154053eb93c7f5fb3ebd48b6a5b99df450d3f2e9c6682153c6f8d59369378c SHA512
02506433b50074ed098fbaee76eb072db386584ca818f322e370847058139e625318453fbcd9e099653f0d9a1041dd55be520e042d62f4e117f45a690e69bc08
WHIRLPOOL
53210f434d6a372f33c5b2e08df935bf6dd878dc42fee72760baa72b3a4f865f16d782a1d6c08424861cd1778c7a25029b7f2672cf9a3b4371bef51513b8a490
+DIST py2neo-2.0.8.tar.gz 860564 SHA256
57b4a1c4aa800e03904b2adfd7c8ec467b072bae2d24baf150fd580916255f2e SHA512
77f18a86ccd16d0152b814fa0e10d7a5629ade5a76f027aa13c856a7d4ac7d51861e87c04a9f9012c87b533f202774c0c84d16b4c65435406114f70bb59a7e1b
WHIRLPOOL
e779abb6de768205076783adf0f7816cdcfefc77cb5d52162485c69bdeed6df2fd2bdd3f28539567c480d97ff3783e7711f9b6ddec9c193f5ea19a98aff7d799
diff --git a/dev-python/py2neo/py2neo-2.0.7.ebuild
b/dev-python/py2neo/py2neo-2.0.8.ebuild
similarity index 65%
rename from dev-python/py2neo/py2neo-2.0.7.ebuild
rename to dev-python/py2neo/py2neo-2.0.8.ebuild
index 5460323..e17aff6 100644
--- a/dev-python/py2neo/py2neo-2.0.7.ebuild
+++ b/dev-python/py2neo/py2neo-2.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -6,11 +6,11 @@ EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-inherit distutils-r1
+inherit distutils-r1 vcs-snapshot
DESCRIPTION="A simple and pragmatic library which accesses the Neo4j graph
database"
HOMEPAGE="http://py2neo.org";
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/nigelsmall/py2neo/archive/${P}.tar.gz";
LICENSE="Apache-2.0"
SLOT="0"
@@ -22,3 +22,10 @@ python_compile() {
python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
distutils-r1_python_compile
}
+
+#DEPEND="doc? ( dev-python/sphinx )"
+#src_compile() {
+# distutils-r1_src_compile
+#
+# use doc && emake -C book html
+#}
\ No newline at end of file
[gentoo-commits] proj/gkey-seeds:master commit in: /
commit: 17b50abf4ff0b94ef1614714d4118905994167f0
Author: Brian Dolbec gentoo org>
AuthorDate: Sat Jan 23 06:38:07 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Jan 23 06:38:07 2016 +
URL:https://gitweb.gentoo.org/proj/gkey-seeds.git/commit/?id=17b50abf
Gentoo-keys: Update gentoo-devs.seeds
gentoo-devs.seeds | 8
gentoo-devs.seeds.sig | Bin 639 -> 639 bytes
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gentoo-devs.seeds b/gentoo-devs.seeds
index 37d7f3b..57c69a2 100644
--- a/gentoo-devs.seeds
+++ b/gentoo-devs.seeds
@@ -1495,11 +1495,11 @@
},
"jsbronder": {
"fingerprint": [
-"8B912373DE6701B0DA5E848AE0CAEF044D7043C9"
+"3C5F3FC09C20E9870BE45AB21DECCB56718E4344"
],
"keydir": "jsbronder",
"keys": [
-"8B912373DE6701B0DA5E848AE0CAEF044D7043C9"
+"3C5F3FC09C20E9870BE45AB21DECCB56718E4344"
],
"name": "Justin Bronder",
"nick": "jsbronder",
@@ -1649,11 +1649,11 @@
},
"leio": {
"fingerprint": [
-"4E38C5E3E82518A8AC16D8CC91E61BEA89451C97"
+"93A56F193C261368CD7F056904DA8079BE94C646"
],
"keydir": "leio",
"keys": [
-"4E38C5E3E82518A8AC16D8CC91E61BEA89451C97"
+"93A56F193C261368CD7F056904DA8079BE94C646"
],
"name": "Mart Raudsepp",
"nick": "leio",
diff --git a/gentoo-devs.seeds.sig b/gentoo-devs.seeds.sig
index df71021..e817237 100644
Binary files a/gentoo-devs.seeds.sig and b/gentoo-devs.seeds.sig differ
[gentoo-commits] data/api:master commit in: files/gentoo-keys/seeds/
commit: b0ca412fd3e2e503d7cec7ffddd23b92ff01f517
Author: Brian Dolbec gentoo org>
AuthorDate: Sat Jan 23 06:38:11 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Jan 23 06:38:11 2016 +
URL:https://gitweb.gentoo.org/data/api.git/commit/?id=b0ca412f
Gentoo-keys: Update gentoo-devs.seeds
files/gentoo-keys/seeds/gentoo-devs.seeds | 8
files/gentoo-keys/seeds/gentoo-devs.seeds.sig | Bin 639 -> 639 bytes
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/files/gentoo-keys/seeds/gentoo-devs.seeds
b/files/gentoo-keys/seeds/gentoo-devs.seeds
index 37d7f3b..57c69a2 100644
--- a/files/gentoo-keys/seeds/gentoo-devs.seeds
+++ b/files/gentoo-keys/seeds/gentoo-devs.seeds
@@ -1495,11 +1495,11 @@
},
"jsbronder": {
"fingerprint": [
-"8B912373DE6701B0DA5E848AE0CAEF044D7043C9"
+"3C5F3FC09C20E9870BE45AB21DECCB56718E4344"
],
"keydir": "jsbronder",
"keys": [
-"8B912373DE6701B0DA5E848AE0CAEF044D7043C9"
+"3C5F3FC09C20E9870BE45AB21DECCB56718E4344"
],
"name": "Justin Bronder",
"nick": "jsbronder",
@@ -1649,11 +1649,11 @@
},
"leio": {
"fingerprint": [
-"4E38C5E3E82518A8AC16D8CC91E61BEA89451C97"
+"93A56F193C261368CD7F056904DA8079BE94C646"
],
"keydir": "leio",
"keys": [
-"4E38C5E3E82518A8AC16D8CC91E61BEA89451C97"
+"93A56F193C261368CD7F056904DA8079BE94C646"
],
"name": "Mart Raudsepp",
"nick": "leio",
diff --git a/files/gentoo-keys/seeds/gentoo-devs.seeds.sig
b/files/gentoo-keys/seeds/gentoo-devs.seeds.sig
index df71021..e817237 100644
Binary files a/files/gentoo-keys/seeds/gentoo-devs.seeds.sig and
b/files/gentoo-keys/seeds/gentoo-devs.seeds.sig differ
[gentoo-commits] proj/musl:master commit in: sys-apps/sandbox/, sys-apps/sandbox/files/
commit: 08bccead891bc2e2adb5c26393d1a184e9087a35 Author: Anthony G. Basile gentoo org> AuthorDate: Sat Jan 23 04:37:20 2016 + Commit: Anthony G. Basile gentoo org> CommitDate: Sat Jan 23 04:37:20 2016 + URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=08bccead sys-apps/sandbox: expand visibility, bug #549108 comment #11. Package-Manager: portage-2.2.26 sys-apps/sandbox/Manifest| 3 ++- .../sandbox/files/sandbox-2.10-fix-visibility-musl.patch | 12 sys-apps/sandbox/sandbox-2.10-r99.ebuild | 3 ++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest index 4c3a3bd..8a1341e 100644 --- a/sys-apps/sandbox/Manifest +++ b/sys-apps/sandbox/Manifest @@ -1,5 +1,6 @@ AUX 09sandbox 37 SHA256 73e9e9d12ba54f1c649813ec86107924050528852c890a8ba1e2853796781bbe SHA512 4e8a9c58debde6480224a45559c5f2db4765213d151e47937f9142f110cac3681bf6402acaf21249a37bb17398e7bc00ae7feee68ecdb5b9363c432eac1b052a WHIRLPOOL 80d55a34d3faf3314f2b9de2200d4b46a800128514be9e30eb59e5f03fb7a0a5197a9e5b5ab33d6b68d35bf83c86a1bd7ba734a33ccd382fe0af3b2c2a11d0bd AUX sandbox-2.10-disable-same.patch 2547 SHA256 09a11cf077ae69684080d1f0fd8fe83683fdf5f061e0a7a5261ca03463fd554a SHA512 bf005fbde7b6ba88df36bb75064658764e488dd2f3c96a6f92c69ad3f2e8d2db12ba2c7bafa9656326b7fde73301c330f68bd064efa0fce2a7eb28fff6ce0a1e WHIRLPOOL 27f0df961dcedc70819ecd1d0f105fb7176ecd77127ab187025d9aa52df9faa43941314c71a998dd72658105dfec4c5c6d3341dbae18e18b409af7dc6d9c31d6 +AUX sandbox-2.10-fix-visibility-musl.patch 573 SHA256 67f70fa39867e45b343db78c73fdb6e63b8a1b52d3dc288894402239dd12 SHA512 a740e0b1a68c0609dc3080e88ab8ab87885fe05f5e0864d10ed76e8e7000f7879cb206342c38d4097c691a7c85d1936e98802b206084eb2af9f78bd43158d759 WHIRLPOOL 0c226daa4b6d36c2df001d3d67b9e4023944c5b010d1bc311d731c121dd94b533546479a7b1b77bcb8be608ecf70508fb7dd65b22bafdb2d13a2860c9c0659da AUX sandbox-2.10-memory-corruption.patch 1515 SHA256 4876cc9962d56d3c5fc5418fe12ef1a399e34ff0272f12640c4a5c5b775e SHA512 1eb650824cc7a876fabef382cafb451a507326a8422fb7bb5014699046b64ea8f4cf2bba9efcb75d7a2eac4eff493d06153422f85c119f49635ac0840071660c WHIRLPOOL db2c834119c7887ed746154e73e88cc09bf2a31184b3cda2732b70cb43dd8bc7f59f1072a4cc56ebcf593ba67330b932dc186ee55e009428d607f62293ab AUX sandbox-2.6-check-empty-paths-at.patch 7454 SHA256 a48759a4d3e9a70713473b6fad59bdd750b5cd37e7d632c786205ff20004ae2c SHA512 5eba7915dedf57f44c37881e9c6b48db8733d1493779a33127d08bb9ea77056d788ec9ace72c13eb101f42f01c95309c7cebca6c76212a8c99a8655372c0b7d7 WHIRLPOOL 46eb3a8ef8f22030cd793f3b16adc190b5750019c0df83e161c6918f08555a8ad890c1425b03cbf7e53ebcd34a07a9dd9b594d0c0fe31834656ffce3d58fa284 AUX sandbox-2.6-desktop.patch 875 SHA256 2eecf67790aeac210f9aa899a86f7664776ed65d9b55159e1b359162dfb9ff74 SHA512 b72ec7f414d19bf513dfb1aea10523fa5dc07a1375d8f08f664d204b64b23c891a79ca14987528c595936f441e1f595b366aabbc57313667c7639d73d089ed9a WHIRLPOOL 7f787b8be9b5712eb2b2a0cd2ff825df1045ebf1cc4e73a50f610e620d30752045690a5c28835465d0ab0c3c4a9eaf8b92a5c123cd741ad69dfedb31aa457fa0 @@ -12,6 +13,6 @@ AUX sandbox-2.6-static-close-fd.patch 2945 SHA256 807eb4dc1ba6543c94a90a9a53bb89 AUX sandbox-2.6-trace-hppa.patch 850 SHA256 20688b2f33162f95af4af5e3c7d3700f2e7776e454b785ac1398f0870f84efa9 SHA512 fb7bf2202f960e952edc1e52fe4b6b085042158223d96b9baa899e871abcdef711ede3122c971120f55f71cc1aad71496a6079222dbaaa6c14b0c6f7ea182454 WHIRLPOOL 80f7fb529b912d19d81b9d71ee4a648db7b217583f2e8f2054cc666839030ea7d0112d69d52a2bf35c4d3549ffbd81dbd0cd39d5993bfabbb43bcb6a4455ade4 DIST sandbox-2.10.tar.xz 417068 SHA256 019d6a2646b3a5f9b6fc3fcb6ff99332901017eb845442bec8573b9901506fa6 SHA512 178b3b8fcb54e6ff67df1c8101866739b49e4d31a66717c21ef502dd2ab609fca70f1a0c662b913e207bfc1ba6994cefdcf5c92ff32add9dd98bd9707f301305 WHIRLPOOL 5d6cffa7317cafeba02af75de9ae914d4365a62b54d3dfcc14cb272e621f2f76a60a945591ccb57dd59d6750152087cb2f21e43ded3ec181d6b42df173147192 DIST sandbox-2.6.tar.xz 366356 SHA256 95615c5879dfc419713f22ba5506a2802a50ea0ce8a2f57c656354f2e50b1c4d SHA512 32ba7fb675c67fdc8bc52da1db7ed6878e5fea8753accb30d9aca00f708e0dde03287b5962caf5ef031bea6934d6ef3e18404b015c70ebd551d3fd8109ad2371 WHIRLPOOL bab2d015fb0de92a2266408ca7941c8fb66b599179040cfc727ffce5b2424a9722dc55ba89d198e3361044d8cb357314205488d2a980c7b8af063fd8940f0c03 -EBUILD sandbox-2.10-r99.ebuild 2840 SHA256 338358721cd45193b40b8d9338b57e579dbcee412091dd2e2ed6652dc0d214ff SHA512 88f8e227c670c96f3c9bda50d6c92bd08821112b77d05274e4a96e8aa11007b5dffd4564d89b27b6f68b2afa8937e78a4a71ee9eec2d7320cc07a88e8a2b2986 WHIRLPOOL bf0ed5ba0a94d2cffb73b8b8a799dee99543b36c89ff643d7fc9dab6cb4c7638df879419987a78e60b6e812d2e5e986e02b1278b23e9e8c40272cf0755f66c2f +EBUILD sandbox-2.10-r99.ebuild 2893 SHA256 f712e1579b98cd446eeb6d0bd64f6e6520d75b320461443c88c3b607e25b622b SHA512 ca0012cbcf7d30e4904f98637c634cff54daeb6738794
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-imagick/
commit: b515ac34741c5d8ab19f8b69ff0ede8543342e30
Author: Michael Orlitzky gentoo org>
AuthorDate: Sat Jan 23 03:36:11 2016 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Sat Jan 23 03:36:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b515ac34
dev-php/pecl-imagick: version bump 3.4.0_rc2 -> 3.4.0_rc5.
Package-Manager: portage-2.2.26
dev-php/pecl-imagick/Manifest | 2 +-
.../{pecl-imagick-3.4.0_rc2.ebuild => pecl-imagick-3.4.0_rc5.ebuild} | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-php/pecl-imagick/Manifest b/dev-php/pecl-imagick/Manifest
index 230115b..2e7fe9f 100644
--- a/dev-php/pecl-imagick/Manifest
+++ b/dev-php/pecl-imagick/Manifest
@@ -1,3 +1,3 @@
DIST imagick-3.1.2.tgz 94657 SHA256
528769ac304a0bbe9a248811325042188c9d16e06de16f111fee317c85a36c93 SHA512
d30e129cc4b61e34830b34261671bf92579c355f36924a802952524119bf07b0e0d59fe2ad361a4caa0322f959bed669b82d1f12a531b106648ccf9d22b4fba3
WHIRLPOOL
99309fb01a43d369d6a348c623afedfa291470ff0299b38faa949ff9da4654af0ceef6d67d7b7889b6b50bcaf17c4893a6b719b3c7afaa4fc1c87eef79ea4dc9
DIST imagick-3.3.0.tgz 179978 SHA256
bd69ebadcedda1d87592325b893fa78a5710a0ca7307f8e18c5e593949b1db2d SHA512
1f5f1f6c6ce8ac71384b39c53b1befafd3160deaf75554efd6098f56173484be8c6493a04ec00cb124c002dc9cebc31aaacabb4b6e2713916b8b119f4504c811
WHIRLPOOL
860d1ebb3b4a008a119bd55541b27973b3026475c84d8808f064e700a5fcb82d7ab154b2b711f7a5c51ec6d966c11f81b904f0c845cf3973fcf56b8726e0a567
-DIST imagick-3.4.0RC2.tgz 230995 SHA256
5c9391d673f97b11c42bc8b05c4a096d659f1d7d38890d43fe7447fcf5f629d2 SHA512
233a8b13ecd02936f72935e895f23d6caeeb6a576050a95a7dccbcf039f61602a1d1e409b74eb7f4c3ee5293271f8e1fb128daab9b33f554b3abacaec1f7f9bd
WHIRLPOOL
fc5a3306eb3bb05419db1dc0061d433ddf5882dd3273c1ff92237147774e9883c42587440e9797ef2a13143055b75ac5ba360726746ab25f520f69f896888c89
+DIST imagick-3.4.0RC5.tgz 233495 SHA256
5a1cbac4877dcff354f87ec25d53ebc9e25904e9cc39af8b73371cfb2abbd2d2 SHA512
a7976eb4ab544f639bed90ca26a53ebf6f12d32d00df1674a4728ab8bb68387c27600ceffd19ec9367d0cc074dd130f3e565b705adeb9e5616dc9937306ad9e0
WHIRLPOOL
88bf46909eb39384285159398252a171768175867d785c59e0c34460349082390d7213abc972f1dae1656789cf1ac1b9f61d33082c086f120a7ec39ab19367d8
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.4.0_rc2.ebuild
b/dev-php/pecl-imagick/pecl-imagick-3.4.0_rc5.ebuild
similarity index 88%
rename from dev-php/pecl-imagick/pecl-imagick-3.4.0_rc2.ebuild
rename to dev-php/pecl-imagick/pecl-imagick-3.4.0_rc5.ebuild
index cb1dd65..0a04982 100644
--- a/dev-php/pecl-imagick/pecl-imagick-3.4.0_rc2.ebuild
+++ b/dev-php/pecl-imagick/pecl-imagick-3.4.0_rc5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -6,7 +6,7 @@ EAPI=5
MY_PV="${PV/rc/RC}"
-USE_PHP="php7-0 php5-6 php5-5"
+USE_PHP="php5-5 php5-6 php7-0"
inherit php-ext-pecl-r2
[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/
commit: 824097f4c1c36cc4afea4b45f052d1788204dde9
Author: Michael Orlitzky gentoo org>
AuthorDate: Sat Jan 23 03:26:30 2016 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Sat Jan 23 03:27:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=824097f4
dev-lang/php: revision the 5.6 and 7.0 series to set --localstatedir.
The php-fpm.conf file uses the @localstatedir passed to ./configure
as its default prefix for some settings. The econf default for
localstatedir is ${EPREFIX}/var/lib, but php-fpm.conf is expecting
${EPREFIX}/var, so we pass that instead. This ensures that the default
log location (e.g. /var/log) actually exists.
Gentoo-Bug: 572002
Package-Manager: portage-2.2.26
.../php/{php-7.0.2.ebuild => php-5.6.17-r1.ebuild} | 73 +-
.../php/{php-7.0.2.ebuild => php-7.0.2-r1.ebuild} | 5 +-
2 files changed, 46 insertions(+), 32 deletions(-)
diff --git a/dev-lang/php/php-7.0.2.ebuild b/dev-lang/php/php-5.6.17-r1.ebuild
similarity index 93%
copy from dev-lang/php/php-7.0.2.ebuild
copy to dev-lang/php/php-5.6.17-r1.ebuild
index 76a0c13..8addecc 100644
--- a/dev-lang/php/php-7.0.2.ebuild
+++ b/dev-lang/php/php-5.6.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ function php_get_uri ()
{
case "${1}" in
"php-pre")
- echo "http://downloads.php.net/ab/${2}";
+ echo "http://downloads.php.net/dsp/${2}";
;;
"php")
echo "http://www.php.net/distributions/${2}";
@@ -56,7 +56,7 @@ LICENSE="PHP-3"
S="${WORKDIR}/${PHP_P}"
# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
+SAPIS="embed cli cgi fpm apache2"
# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
IUSE="${IUSE}
@@ -68,15 +68,15 @@ IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
enchant exif frontbase +fileinfo +filter firebird
flatfile ftp gd gdbm gmp +hash +iconv imap inifile
intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
- mysql mysqli nls
+ mssql mysql libmysqlclient mysqli nls
oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
readline recode selinux +session sharedmem
+simplexml snmp soap sockets spell sqlite ssl
- sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
+ sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
DEPEND="
- >=app-eselect/eselect-php-0.8.2[apache2?,fpm?]
+ >=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
>=dev-libs/libpcre-8.32[unicode]
apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
=app-text/aspell-0.50 )
sqlite? ( >=dev-db/sqlite-3.7.6.3 )
ssl? ( dev-libs/openssl:0 )
+ sybase-ct? ( dev-db/freetds )
tidy? ( app-text/htmltidy )
truetype? (
=media-libs/freetype-2*
+ >=media-libs/t1lib-5.0.0
!gd? (
virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
)
@@ -174,15 +181,18 @@ REQUIRED_USE="
ldap-sasl? ( ldap )
mhash? ( hash )
phar? ( hash )
+ libmysqlclient? ( || (
+ mysql
+ mysqli
+ pdo
+ ) )
qdbm? ( !gdbm )
readline? ( !libedit )
- recode? ( !imap !mysqli )
+ recode? ( !imap !mysql !mysqli )
sharedmem? ( !threads )
- mysql? ( || ( mysqli pdo ) )
-
- || ( cli cgi fpm apache2 embed phpdbg )"
+ !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
RDEPEND="${DEPEND}"
@@ -253,11 +263,9 @@ php_install_ini() {
# SAPI-specific handling
if [[ "${sapi}" == "fpm" ]] ; then
- einfo "Installing FPM config files php-fpm.conf and www.conf"
+ einfo "Installing FPM config file php-fpm.conf"
insinto "${PHP_INI_DIR#${EPREFIX}}"
doins sapi/fpm/php-fpm.conf
- insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
- doins sapi/fpm/www.conf
fi
dodoc php.ini-development
@@ -280,6 +288,14 @@ src_prepare() {
sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v |
xargs`/g' \
-i configure.in || die "Failed to fix server platform name"
+ # Prevent PHP from activating the Apache config,
+ # as we will do that ourselves
+ sed -i \
+ -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+ -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+ configure sapi/apache2filter/config.m4
sapi/apache2handler/config.m4 \
+
[gentoo-commits] repo/gentoo:master commit in: app-text/glosung/, app-text/glosung/files/
commit: 64db96ccd892c0cf7cec5949908220776328d22d
Author: Chris Reffett gentoo org>
AuthorDate: Sat Jan 23 03:19:40 2016 +
Commit: Chris Reffett gentoo org>
CommitDate: Sat Jan 23 03:19:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64db96cc
app-text/glosung: Version bump
Gentoo-Bug: 571144
Package-Manager: portage-2.2.26
app-text/glosung/Manifest | 1 +
.../files/glosung-3.6.4-scons-respectflags.patch | 61 ++
app-text/glosung/glosung-3.6.4.ebuild | 44
3 files changed, 106 insertions(+)
diff --git a/app-text/glosung/Manifest b/app-text/glosung/Manifest
index ac78040..02da73a 100644
--- a/app-text/glosung/Manifest
+++ b/app-text/glosung/Manifest
@@ -1 +1,2 @@
DIST glosung-3.6.2.tar.bz2 65089 SHA256
5b46cd776b51ea3ace6ef901512c4100e79ce5225f7d7cf910b69d930b7df4c9 SHA512
a9e16f9202092e6b73ca640787785fd6985ea1ba914260b783bf8f4b6ebbd6ed807cbdec5381059a2f905fae31b7aa844844ae2f9df0379c60e1251140760b11
WHIRLPOOL
91bb6e08f149430edb41b901072b5fe4993590f7ef173b99f313d857539e1be40dd00797b8623312da8a2909be7577d39b5804523e3b79bce00eccf919ee5a8c
+DIST glosung-3.6.4.tar.bz2 71887 SHA256
1104e61f04d1e9be5e7aa0ede7e9f7a415974b97222164e410d9828a81b233cc SHA512
c4f51d2569e0c74bddf6806551c314a337d573cd10ab1b6dc04c735c24e4e3e679af35b5d7340d7917e6f4c1fd2b4dec283205c5f744b8c020630ba428738349
WHIRLPOOL
fd1643b0e602a8f38a0c64566b798e922b117bed50f46183faca0ec11696fc0567903af0ed9becd0d189571777968c5606b234ac9f9cb7972fcf9b6f9cf392e6
diff --git a/app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch
b/app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch
new file mode 100644
index 000..9adece9
--- /dev/null
+++ b/app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch
@@ -0,0 +1,61 @@
+diff -ruN glosung-3.6.4-original/SConstruct glosung-3.6.4/SConstruct
+--- glosung-3.6.4-original/SConstruct 2016-01-22 22:11:00.785053522 -0500
glosung-3.6.4/SConstruct 2016-01-22 22:14:04.434058592 -0500
+@@ -17,6 +17,7 @@
+
+
+ import os
++import SCons.Util
+
+ version = '3.6.4'
+
+@@ -32,14 +33,23 @@
+ (this option is only for packaging)''')
+
+ env = Environment (
+- LINK = 'gcc',
+- CC= 'gcc',
+ CPPPATH = '',
+ LINKFLAGS = '',
+ CCFLAGS = '',
+ ENV = os.environ,
+ TARFLAGS = '-c -j')
+
++if os.environ.has_key('CC'):
++ env['CC'] = os.environ['CC']
++if os.environ.has_key('CFLAGS'):
++ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++if os.environ.has_key('CXX'):
++ env['CXX'] = os.environ['CXX']
++if os.environ.has_key('CXXFLAGS'):
++ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++if os.environ.has_key('LDFLAGS'):
++ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
++
+ if env['PLATFORM'] == 'win32':
+ prefix = ARGUMENTS.get ('PREFIX', '')
+ install_dir = ARGUMENTS.get ('DESTDIR', '')
+@@ -57,21 +67,18 @@
+ VariantDir('build', 'src')
+
+ cpppath = ['#', '#build']
+-ccflags = ['-O2', '-std=c99', '-Wall', '-g',
++ccflags = ['-std=c99',
+ # '-DLIBXML_STATIC',
+ '-DVERSION=\\"' + version + '\\"',
+ '-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
+ '-DPACKAGE_PIXMAPS_DIR=\\"' + pixmap_dir + '\\"']
+
+-linkflags = ['-L.']
++linkflags = []
+
+ if ARGUMENTS.get ('profile'):
+ ccflags.append ('-pg', '-fprofile-arcs')
+ linkflags.append ('-pg', '-fprofile-arcs', '-Wl,--export-dynamic')
+
+-if env['PLATFORM'] != 'win32':
+-linkflags.append ('-Wl,--as-needed')
+-
+ #if not (ARGUMENTS.get ('dev')):
+ if (ARGUMENTS.get ('dev')):
+ ccflags += [
diff --git a/app-text/glosung/glosung-3.6.4.ebuild
b/app-text/glosung/glosung-3.6.4.ebuild
new file mode 100644
index 000..9eb8319
--- /dev/null
+++ b/app-text/glosung/glosung-3.6.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+DESCRIPTION="Watch word program for the GNOME2 desktop (watch word (german):
losung)"
+HOMEPAGE="http://www.godehardt.org/losung.html";
+SRC_URI="mirror://sourceforge/glosung/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+PATCHES=("${FILESDIR}/${PN}-3.6.4-scons-respectflags.patch")
+
+RDEPEND="
+ dev-libs/libxml2
+ >=gnome-base/gconf-2.0:2
+ >=gnome-base/libgnome-2
+ >=gnome-base/libgnomeui-2
+ net-misc/curl
+ >=x11-libs/gtk+-2.10:2
+"
+
+DEPEND="${RDEPEND}
+ >=dev-util/scons-0.93
+ >=dev-util/intltool-0.22
+ >=sys-devel/gettext-0.10
+ virtual/pkgconfig
+"
+
+src_compile() {
+ tc-export CC
+ scons ${MAKEOPTS} || die "scons make died"
+}
+
+src_install() {
+ scons install DESTDIR="${D}" || die "scons install died"
+
[gentoo-commits] repo/gentoo:master commit in: games-roguelike/dwarf-fortress/
commit: abf8c7bc8ccd2c33fbc29ac319b2b84fd3f5bd44
Author: Chris Reffett gentoo org>
AuthorDate: Sat Jan 23 03:02:29 2016 +
Commit: Chris Reffett gentoo org>
CommitDate: Sat Jan 23 03:02:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abf8c7bc
games-roguelike/dwarf-fortress: Version bump
Package-Manager: portage-2.2.26
games-roguelike/dwarf-fortress/Manifest | 2 +-
.../{dwarf-fortress-0.42.04.ebuild => dwarf-fortress-0.42.05.ebuild}| 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-roguelike/dwarf-fortress/Manifest
b/games-roguelike/dwarf-fortress/Manifest
index f4f8e16..9a42258 100644
--- a/games-roguelike/dwarf-fortress/Manifest
+++ b/games-roguelike/dwarf-fortress/Manifest
@@ -1,2 +1,2 @@
DIST df_40_24_linux.tar.bz2 12921246 SHA256
da37c6263a679123e6ac57fe0dd6def11f1d61efee3c5913de09495c88ce9234 SHA512
2242e471b7dbc996e819e2f74b2bbfda30a9a301755bc025ddcccdffdd3afe2e48bbedca31a332283ef829d023069398e57d6a87e26c582ddbce4a67ff7fd755
WHIRLPOOL
03cb652a2564d2b0c809be8252f7754d893f69ac1b95124ea108ed0fde9ac742c498d9e369339775695861e430a2ded0741b018f85551d48731730f98303dc69
-DIST df_42_04_linux.tar.bz2 13776171 SHA256
f281f7e8b477abe37cc1423258be2ea56b5c1d12b0843ed3a66994ce0e7924ce SHA512
d0b3bf0311e70c6f823d216e002d2acc62ebdeb540cfd79c5cf91d53612f6acee802321c65b3926db688b055f5b865aa1256f29a82ef769c5fab65bd42c383b5
WHIRLPOOL
859a2fddf9a72ac2c05d64cff01fdd3c9658ce57eecb34991fbd9cbd51ae007c56bc61e9aac76ec837734593c89d822868c15c641416a82f142af40425ef666b
+DIST df_42_05_linux.tar.bz2 13794886 SHA256
9ab33ef4ad0f73ce90109c59e13200fa2d9366f6088b00bbcf49624dc506f93c SHA512
6c2b12dddadb8cffce4ed2077302f36e0bdfbb1f847a72eafb9bcf36ac3da2fc973573f23090a7f1211d3d756688640334116c6ee5148228ee37966ae5cdb562
WHIRLPOOL
fc8dd05e704f3853c07aff0d03004ce6fab03d5c9af0b0ef22cc588934d723b886247099261c528a03f5426df1b006c3c9ea4a6b8589225e1f1cb637ef489f22
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.42.04.ebuild
b/games-roguelike/dwarf-fortress/dwarf-fortress-0.42.05.ebuild
similarity index 100%
rename from games-roguelike/dwarf-fortress/dwarf-fortress-0.42.04.ebuild
rename to games-roguelike/dwarf-fortress/dwarf-fortress-0.42.05.ebuild
[gentoo-commits] proj/qt:master commit in: eclass/
commit: 4009c796c455439b48d47dc8d04b2af3d5b4b1ed
Author: Davide Pesavento gentoo org>
AuthorDate: Sat Jan 23 01:11:39 2016 +
Commit: Davide Pesavento gentoo org>
CommitDate: Sat Jan 23 01:12:40 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=4009c796
qt5-build.eclass: warn about -g/-ggdb in qtwebengine too
eclass/qt5-build.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index a148793..600f2f9 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -139,7 +139,7 @@ qt5-build_src_unpack() {
ewarn
fi
- if [[ ${PN} == qtwebkit ]]; then
+ if [[ ${PN} == qtwebengine || ${PN} == qtwebkit ]]; then
eshopts_push -s extglob
if is-flagq '-g?(gdb)?([1-9])'; then
ewarn
[gentoo-commits] proj/qt:master commit in: eclass/
commit: 8ed3b65dd6316568c74cad5485936abd7f4f36a4
Author: Davide Pesavento gentoo org>
AuthorDate: Sat Jan 23 01:31:31 2016 +
Commit: Davide Pesavento gentoo org>
CommitDate: Sat Jan 23 01:31:31 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=8ed3b65d
qt5-build.eclass: update gcc version check for 5.7 and qtwebengine
eclass/qt5-build.eclass | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 600f2f9..a1ad3fb 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -133,9 +133,14 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure
src_compile src_install sr
# @DESCRIPTION:
# Unpacks the sources.
qt5-build_src_unpack() {
- if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 &&
$(gcc-minor-version) -lt 5 ]]; then
+ local min_gcc4_minor_version=5
+ if [[ ${QT5_MINOR_VERSION} -ge 7 || ${PN} == qtwebengine ]]; then
+ min_gcc4_minor_version=7
+ fi
+ if [[ $(gcc-major-version) -lt 4 ]] || \
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt
${min_gcc4_minor_version} ]]; then
ewarn
- ewarn "Using a GCC version lower than 4.5 is not supported."
+ ewarn "Using a GCC version lower than
4.${min_gcc4_minor_version} is not supported."
ewarn
fi
[gentoo-commits] proj/qt:master commit in: eclass/
commit: 91839540e97eb22f0ac218aa174b06a01870f3f5
Author: Davide Pesavento gentoo org>
AuthorDate: Sat Jan 23 02:02:29 2016 +
Commit: Davide Pesavento gentoo org>
CommitDate: Sat Jan 23 02:02:29 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=91839540
qt5-build.eclass: make gcc version check fatal starting with Qt 5.6
eclass/qt5-build.eclass | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index a1ad3fb..72e60e9 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -133,15 +133,21 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure
src_compile src_install sr
# @DESCRIPTION:
# Unpacks the sources.
qt5-build_src_unpack() {
+ local gcc_version_check_fatal=false
local min_gcc4_minor_version=5
+ if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
+ gcc_version_check_fatal=true
+ fi
if [[ ${QT5_MINOR_VERSION} -ge 7 || ${PN} == qtwebengine ]]; then
min_gcc4_minor_version=7
fi
if [[ $(gcc-major-version) -lt 4 ]] || \
[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt
${min_gcc4_minor_version} ]]; then
- ewarn
- ewarn "Using a GCC version lower than
4.${min_gcc4_minor_version} is not supported."
- ewarn
+ if ${gcc_version_check_fatal}; then
+ die "GCC version 4.${min_gcc4_minor_version} or later
is required to build this package"
+ else
+ ewarn "Using a GCC version lower than
4.${min_gcc4_minor_version} is not supported"
+ fi
fi
if [[ ${PN} == qtwebengine || ${PN} == qtwebkit ]]; then
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/, pym/repoman/, pym/repoman/modules/scan/ebuild/
commit: 77ca09470710db8cf98adfd3b2d39c546a03db67
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jan 4 04:44:05 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Jan 23 01:34:02 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=77ca0947
repoman: Create a new MultiCheck class plugin
Move ebuilds/ checks.py and errors.py to the scan/ebuild plugin
Remove the checks_init from main(), initialize it in the MultiCheck
class where it is needed.
pym/repoman/checks/ebuilds/__init__.py | 0
pym/repoman/main.py| 2 -
pym/repoman/modules/scan/ebuild/__init__.py| 9 +
.../ebuilds => modules/scan/ebuild}/checks.py | 2 +-
.../ebuilds => modules/scan/ebuild}/errors.py | 0
pym/repoman/modules/scan/ebuild/multicheck.py | 43 ++
pym/repoman/scanner.py | 21 +--
7 files changed, 54 insertions(+), 23 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/__init__.py
b/pym/repoman/checks/ebuilds/__init__.py
deleted file mode 100644
index e69de29..000
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 8784685..890e034 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -26,7 +26,6 @@ from portage.util import formatter
from repoman.actions import Actions
from repoman.argparser import parse_args
-from repoman.checks.ebuilds.checks import checks_init
from repoman.qa_data import (
format_qa_output, format_qa_output_column, qahelp,
qawarnings, qacats)
@@ -65,7 +64,6 @@ def repoman_main(argv):
if options.experimental_inherit == 'y':
# This is experimental, so it's non-fatal.
qawarnings.add("inherit.missing")
- checks_init(experimental_inherit=True)
# Set this to False when an extraordinary issue (generally
# something other than a QA issue) makes it impossible to
diff --git a/pym/repoman/modules/scan/ebuild/__init__.py
b/pym/repoman/modules/scan/ebuild/__init__.py
index a22e736..e712e4b 100644
--- a/pym/repoman/modules/scan/ebuild/__init__.py
+++ b/pym/repoman/modules/scan/ebuild/__init__.py
@@ -28,6 +28,15 @@ module_spec = {
'func_desc': {
},
},
+ 'multicheck-module': {
+ 'name': "multicheck",
+ 'sourcefile': "multicheck",
+ 'class': "MultiCheck",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_kwargs': {
+ },
+ },
}
}
diff --git a/pym/repoman/checks/ebuilds/checks.py
b/pym/repoman/modules/scan/ebuild/checks.py
similarity index 99%
rename from pym/repoman/checks/ebuilds/checks.py
rename to pym/repoman/modules/scan/ebuild/checks.py
index 5420e51..be59b05 100644
--- a/pym/repoman/checks/ebuilds/checks.py
+++ b/pym/repoman/modules/scan/ebuild/checks.py
@@ -21,7 +21,7 @@ from portage.eapi import (
eapi_has_src_prepare_and_src_configure, eapi_has_dosed_dohard,
eapi_exports_AA, eapi_has_pkg_pretend)
-import repoman.checks.ebuilds.errors as errors
+from . import errors
class LineCheck(object):
diff --git a/pym/repoman/checks/ebuilds/errors.py
b/pym/repoman/modules/scan/ebuild/errors.py
similarity index 100%
rename from pym/repoman/checks/ebuilds/errors.py
rename to pym/repoman/modules/scan/ebuild/errors.py
diff --git a/pym/repoman/modules/scan/ebuild/multicheck.py
b/pym/repoman/modules/scan/ebuild/multicheck.py
new file mode 100644
index 000..989d695
--- /dev/null
+++ b/pym/repoman/modules/scan/ebuild/multicheck.py
@@ -0,0 +1,43 @@
+
+import io
+
+from portage import _encodings, _unicode_encode
+
+from .checks import run_checks, checks_init
+
+
+class MultiCheck(object):
+ '''Class to run multiple different checks on an ebuild'''
+
+ def __init__(self, **kwargs):
+ self.qatracker = kwargs.get('qatracker')
+ self.options = kwargs.get('options')
+ checks_init(self.options.experimental_inherit == 'y')
+
+ def check(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
+ pkg = kwargs.get('pkg')
+ try:
+ # All ebuilds should have utf_8 encoding.
+ f = io.open(
+ _unicode_encode(ebuild.full_path,
encoding=_encodings['fs'],
+ errors='strict'),
+ mode='r', encoding=_encodings['repo.content'])
+ try:
+ for check_name, e in run_checks(f, pkg):
+ self.qatracker.add_error(
+ check_name,
ebuild.relative_path + ': %s' % e)
+ finally:
+
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/options/, pym/repoman/
commit: f433f39038dc27807dcb99fc94f12ea0fcb380ec
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jan 4 07:55:55 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Jan 23 01:35:17 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f433f390
repoman: Create a new Options class plugin
This handles an options.force bypass using the is_forced() from withing the
plugin system.
pym/repoman/modules/scan/options/__init__.py | 24
pym/repoman/modules/scan/options/options.py | 22 ++
pym/repoman/scanner.py | 10 ++
3 files changed, 48 insertions(+), 8 deletions(-)
diff --git a/pym/repoman/modules/scan/options/__init__.py
b/pym/repoman/modules/scan/options/__init__.py
new file mode 100644
index 000..2d3d9d2
--- /dev/null
+++ b/pym/repoman/modules/scan/options/__init__.py
@@ -0,0 +1,24 @@
+# Copyright 2015-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+doc = """Options plug-in module for repoman.
+Performs option related actions on ebuilds."""
+__doc__ = doc[:]
+
+
+module_spec = {
+ 'name': 'options',
+ 'description': doc,
+ 'provides':{
+ 'options-module': {
+ 'name': "options",
+ 'sourcefile': "options",
+ 'class': "Options",
+ 'description': doc,
+ 'functions': ['is_forced'],
+ 'func_desc': {
+ },
+ },
+ }
+}
+
diff --git a/pym/repoman/modules/scan/options/options.py
b/pym/repoman/modules/scan/options/options.py
new file mode 100644
index 000..b592884
--- /dev/null
+++ b/pym/repoman/modules/scan/options/options.py
@@ -0,0 +1,22 @@
+
+
+class Options(object):
+
+ def __init__(self, **kwargs):
+ self.options = kwargs.get('options')
+
+ def is_forced(self, **kwargs):
+ if self.options.force:
+ # The dep_check() calls are the most expensive QA test.
If --force
+ # is enabled, there's no point in wasting time on these
since the
+ # user is intent on forcing the commit anyway.
+ return {'continue': True}
+ return {'continue': False}
+
+ @property
+ def runInPkgs(self):
+ return (False, [])
+
+ @property
+ def runInEbuilds(self):
+ return (True, [self.is_forced])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 6603bd2..cb2a7c0 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -290,6 +290,8 @@ class Scanner(object):
('use_flags', 'USEFlagChecks'), ('ruby',
'RubyEclassChecks'),
('license', 'LicenseChecks'), ('restrict',
'RestrictChecks'),
('mtime', 'MtimeChecks'), ('multicheck',
'MultiCheck'),
+ # Options.is_forced() is used to bypass further
checks
+ ('options', 'Options'),
]:
if mod[0]:
mod_class =
MODULE_CONTROLLER.get_class(mod[0])
@@ -317,14 +319,6 @@ class Scanner(object):
if y_ebuild_continue:
continue
- # Syntax Checks
-
- if self.options.force:
- # The dep_check() calls are the most expensive
QA test. If --force
- # is enabled, there's no point in wasting time
on these since the
- # user is intent on forcing the commit anyway.
- continue
-
relevant_profiles = []
for keyword, arch, groups in dynamic_data['arches']:
if arch not in self.profiles:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/metadata/, pym/repoman/
commit: 24aa36db0fcd5cddd2ed58e0c5735413a535e1bc
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jan 4 08:37:22 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Jan 23 01:37:59 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=24aa36db
repoman: Create a metadata UnusedCheck and final pkg checks
Create a plugin loop for any final pkg checks.
Create the one plugin for the unused use-descriptions in mteadata.xml
pym/repoman/modules/scan/metadata/__init__.py | 9 +++
pym/repoman/modules/scan/metadata/unused.py | 32
pym/repoman/scanner.py| 36 ---
3 files changed, 68 insertions(+), 9 deletions(-)
diff --git a/pym/repoman/modules/scan/metadata/__init__.py
b/pym/repoman/modules/scan/metadata/__init__.py
index 4f376e1..f619764 100644
--- a/pym/repoman/modules/scan/metadata/__init__.py
+++ b/pym/repoman/modules/scan/metadata/__init__.py
@@ -55,6 +55,15 @@ module_spec = {
'func_desc': {
},
},
+ 'unused-metadata': {
+ 'name': "unused",
+ 'sourcefile': "unused",
+ 'class': "UnusedCheck",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
}
}
diff --git a/pym/repoman/modules/scan/metadata/unused.py
b/pym/repoman/modules/scan/metadata/unused.py
new file mode 100644
index 000..5eb6716
--- /dev/null
+++ b/pym/repoman/modules/scan/metadata/unused.py
@@ -0,0 +1,32 @@
+
+
+class UnusedCheck(object):
+
+ def __init__(self, **kwargs):
+ self.qatracker = kwargs.get('qatracker')
+
+ def check(self, **kwargs):
+ xpkg = kwargs.get('xpkg')
+ muselist = kwargs.get('muselist')
+ used_useflags = kwargs.get('used_useflags')
+ # check if there are unused local USE-descriptions in
metadata.xml
+ # (unless there are any invalids, to avoid noise)
+ if kwargs.get('allvalid'):
+ for myflag in muselist.difference(used_useflags):
+ self.qatracker.add_error(
+ "metadata.warning",
+ "%s/metadata.xml: unused local
USE-description: '%s'"
+ % (xpkg, myflag))
+ return {'continue': False}
+
+ @property
+ def runInPkgs(self):
+ return (False, [])
+
+ @property
+ def runInEbuilds(self):
+ return (False, [])
+
+ @property
+ def runInFinal(self):
+ return (True, [self.check])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 1cd37d0..4cc2e67 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -269,7 +269,6 @@ class Scanner(object):
def _scan_ebuilds(self, ebuildlist, dynamic_data):
- xpkg = dynamic_data['xpkg']
# detect unused local USE-descriptions
dynamic_data['used_useflags'] = set()
@@ -317,11 +316,30 @@ class Scanner(object):
if y_ebuild_continue:
continue
- # check if there are unused local USE-descriptions in
metadata.xml
- # (unless there are any invalids, to avoid noise)
- if dynamic_data['allvalid']:
- for myflag in
dynamic_data['muselist'].difference(dynamic_data['used_useflags']):
- self.qatracker.add_error(
- "metadata.warning",
- "%s/metadata.xml: unused local
USE-description: '%s'"
- % (xpkg, myflag))
+ # Final checks
+ # initialize per pkg plugin final checks here
+ # need to set it up for ==> self.modules_list or some other
ordered list
+ xpkg_complete = False
+ for mod in [('unused', 'UnusedChecks')]:
+ if mod[0]:
+ mod_class = MODULE_CONTROLLER.get_class(mod[0])
+ print("Initializing class name:",
mod_class.__name__)
+ self.modules[mod[1]] = mod_class(**self.kwargs)
+ print("scan_ebuilds final checks: module:", mod[1])
+ do_it, functions = self.modules[mod[1]].runInFinal
+ # print("do_it", do_it, "functions", functions)
+ if do_it:
+ for func in functions:
+ print("\tRunning function:", func)
+ rdata = func(**dynamic_data)
+
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/, pym/repoman/modules/scan/use/
commit: 2428968c18c19e7c24e90c30205a06d362953b97
Author: Brian Dolbec gentoo org>
AuthorDate: Fri Jan 8 01:37:39 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Jan 23 01:29:29 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2428968c
repoman: Create USEFlagChecks class plugin
pym/repoman/modules/scan/use/__init__.py | 24 +++
.../ebuilds => modules/scan/use}/use_flags.py | 36 ++
pym/repoman/scanner.py | 8 ++---
3 files changed, 50 insertions(+), 18 deletions(-)
diff --git a/pym/repoman/modules/scan/use/__init__.py
b/pym/repoman/modules/scan/use/__init__.py
new file mode 100644
index 000..80fa213
--- /dev/null
+++ b/pym/repoman/modules/scan/use/__init__.py
@@ -0,0 +1,24 @@
+# Copyright 2015-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+doc = """Use plug-in module for repoman.
+Performs use flag checks on ebuilds."""
+__doc__ = doc[:]
+
+
+module_spec = {
+ 'name': 'use',
+ 'description': doc,
+ 'provides':{
+ 'use-module': {
+ 'name': "use_flags",
+ 'sourcefile': "use_flags",
+ 'class': "USEFlagChecks",
+ 'description': doc,
+ 'functions': ['check', 'getUsedUseFlags'],
+ 'func_desc': {
+ },
+ },
+ }
+}
+
diff --git a/pym/repoman/checks/ebuilds/use_flags.py
b/pym/repoman/modules/scan/use/use_flags.py
similarity index 74%
rename from pym/repoman/checks/ebuilds/use_flags.py
rename to pym/repoman/modules/scan/use/use_flags.py
index ac21b47..acc7dd3 100644
--- a/pym/repoman/checks/ebuilds/use_flags.py
+++ b/pym/repoman/modules/scan/use/use_flags.py
@@ -9,31 +9,39 @@ from repoman._portage import portage
from portage import eapi
from portage.eapi import eapi_has_iuse_defaults, eapi_has_required_use
+from repoman.modules.scan.scanbase import ScanBase
-class USEFlagChecks(object):
+class USEFlagChecks(ScanBase):
'''Performs checks on USE flags listed in the ebuilds and
metadata.xml'''
- def __init__(self, qatracker, globalUseFlags):
- '''
+ def __init__(self, **kwargs):
+ '''Class init
+
@param qatracker: QATracker instance
@param globalUseFlags: Global USE flags
'''
- self.qatracker = qatracker
- self.globalUseFlags = globalUseFlags
+ super(USEFlagChecks, self).__init__(**kwargs)
+ self.qatracker = kwargs.get('qatracker')
+ self.globalUseFlags = kwargs.get('uselist')
self.useFlags = []
self.defaultUseFlags = []
self.usedUseFlags = set()
- def check(self, pkg, package, ebuild, y_ebuild, localUseFlags):
+ def check(self, **kwargs):
'''Perform the check.
@param pkg: Package in which we check (object).
- @param package: Package in which we check (string).
+ @param xpkg: Package in which we check (string).
@param ebuild: Ebuild which we check (object).
@param y_ebuild: Ebuild which we check (string).
- @param localUseFlags: Local USE flags of the package
+ @param muselist: Local USE flags of the package
'''
+ pkg = kwargs.get('pkg')
+ package = kwargs.get('xpkg')
+ ebuild = kwargs.get('ebuild')
+ y_ebuild = kwargs.get('y_ebuild')
+ localUseFlags = kwargs.get('muselist')
# reset state variables for the run
self.useFlags = []
self.defaultUseFlags = []
@@ -41,10 +49,9 @@ class USEFlagChecks(object):
self._checkGlobal(pkg)
self._checkMetadata(package, ebuild, y_ebuild, localUseFlags)
self._checkRequiredUSE(pkg, ebuild)
-
- def getUsedUseFlags(self):
- '''Get the USE flags that this check has seen'''
- return self.usedUseFlags
+ used_useflags =
kwargs.get('used_useflags').union(self.usedUseFlags)
+ return {'continue': False, 'ebuild_UsedUseFlags':
self.usedUseFlags,
+ 'used_useflags': used_useflags}
def _checkGlobal(self, pkg):
for myflag in pkg._metadata["IUSE"].split():
@@ -88,3 +95,8 @@ class USEFlagChecks(object):
"REQUIRED_USE.syntax",
"%s: REQUIRED_USE: %s" %
(ebuild.relative_path, e))
del e
+
+ @property
+ def runInEbuilds(self):
+ '''Ebuild level scans'''
+ return (True, [self.check])
diff --git a/pym/repoman/scanner.py b/pym/repo
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/ebuild/
commit: 33b77931355773c827eacf0267cff345754cdca7
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 17:33:26 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Jan 23 01:30:34 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=33b77931
repoman: Move ebuild_archs to the Ebuild class
pym/repoman/modules/scan/ebuild/ebuild.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/pym/repoman/modules/scan/ebuild/ebuild.py
b/pym/repoman/modules/scan/ebuild/ebuild.py
index 5db5d72..1d5dc9e 100644
--- a/pym/repoman/modules/scan/ebuild/ebuild.py
+++ b/pym/repoman/modules/scan/ebuild/ebuild.py
@@ -36,6 +36,7 @@ class Ebuild(ScanBase):
self.eapi = None
self.inherited = None
self.keywords = None
+ self.archs = None
def _set_paths(self, **kwargs):
repolevel = kwargs.get('repolevel')
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/fix/, pym/repoman/modules/manifest/, ...
commit: 0e929262c716d1f07871d08e9152fc727d6ad082 Author: Brian Dolbec gentoo org> AuthorDate: Wed Jan 6 03:08:08 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Sat Jan 23 01:38:03 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0e929262 repoman: Delete unused subpkgs pym/repoman/checks/ebuilds/variables/__init__.py | 0 pym/repoman/modules/fix/__init__.py | 0 pym/repoman/modules/full/__init__.py | 0 pym/repoman/modules/manifest/__init__.py | 0 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/pym/repoman/checks/ebuilds/variables/__init__.py b/pym/repoman/checks/ebuilds/variables/__init__.py deleted file mode 100644 index e69de29..000 diff --git a/pym/repoman/modules/fix/__init__.py b/pym/repoman/modules/fix/__init__.py deleted file mode 100644 index e69de29..000 diff --git a/pym/repoman/modules/full/__init__.py b/pym/repoman/modules/full/__init__.py deleted file mode 100644 index e69de29..000 diff --git a/pym/repoman/modules/manifest/__init__.py b/pym/repoman/modules/manifest/__init__.py deleted file mode 100644 index e69de29..000
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 5b06bca70834c10867e8ca98dc65d1b6ef973c39 Author: Brian Dolbec gentoo org> AuthorDate: Sun Jan 3 21:55:33 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Sat Jan 23 01:30:35 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=5b06bca7 repoman: Migrate additional dynamic data setting to the USEFlagsChecks pym/repoman/scanner.py | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 6d5416b..d5faded 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -283,7 +283,7 @@ class Scanner(object): def _scan_ebuilds(self, ebuildlist, dynamic_data): xpkg = dynamic_data['xpkg'] # detect unused local USE-descriptions - used_useflags = set() + dynamic_data['used_useflags'] = set() for y_ebuild in ebuildlist: dynamic_data['y_ebuild'] = y_ebuild @@ -324,8 +324,6 @@ class Scanner(object): if y_ebuild_continue: continue - used_useflags = used_useflags.union(dynamic_data['ebuild_UsedUseFlags']) - # license checks if not dynamic_data['badlicsyntax']: self.licensecheck.check(dynamic_data['pkg'], xpkg, dynamic_data['ebuild'], y_ebuild) @@ -535,7 +533,7 @@ class Scanner(object): # check if there are unused local USE-descriptions in metadata.xml # (unless there are any invalids, to avoid noise) if dynamic_data['allvalid']: - for myflag in dynamic_data['muselist'].difference(used_useflags): + for myflag in dynamic_data['muselist'].difference(dynamic_data['used_useflags']): self.qatracker.add_error( "metadata.warning", "%s/metadata.xml: unused local USE-description: '%s'"
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/depend/, pym/repoman/
commit: 3399926a9ef8fc1e0f702c5c6b95f44edf3e67f8
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 21:19:59 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Jan 23 01:30:34 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=3399926a
repoman: Migrate some additional Dependency code to the plugin
pym/repoman/modules/scan/depend/depend.py | 13 -
pym/repoman/scanner.py| 22 +++---
2 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/pym/repoman/modules/scan/depend/depend.py
b/pym/repoman/modules/scan/depend/depend.py
index 8a0ff48..7f1d007 100644
--- a/pym/repoman/modules/scan/depend/depend.py
+++ b/pym/repoman/modules/scan/depend/depend.py
@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+
from _emerge.Package import Package
@@ -121,7 +123,16 @@ class DependChecks(object):
qacat = m + ".syntax"
self.qatracker.add_error(
qacat, "%s: %s: %s" % (ebuild.relative_path, m,
b))
- return {'continue': False, 'unknown_pkgs': unknown_pkgs,
'type_list': type_list}
+
+ # data required for some other tests
+ badlicsyntax = len([z for z in type_list if z == "LICENSE"])
+ badprovsyntax = len([z for z in type_list if z == "PROVIDE"])
+ baddepsyntax = len(type_list) != badlicsyntax + badprovsyntax
+ badlicsyntax = badlicsyntax > 0
+ #badprovsyntax = badprovsyntax > 0
+
+ return {'continue': False, 'unknown_pkgs': unknown_pkgs,
'type_list': type_list,
+ 'badlicsyntax': badlicsyntax, 'baddepsyntax':
baddepsyntax}
@property
def runInPkgs(self):
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index d42fd33..6d5416b 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -324,26 +324,10 @@ class Scanner(object):
if y_ebuild_continue:
continue
- if dynamic_data['live_ebuild'] and
self.repo_settings.repo_config.name == "gentoo":
- self.liveeclasscheck.check(
- dynamic_data['pkg'], xpkg,
dynamic_data['ebuild'], y_ebuild, dynamic_data['ebuild'].keywords,
self.repo_metadata['pmaskdict'])
-
- unknown_pkgs = set()
- baddepsyntax = False
- badlicsyntax = False
- badprovsyntax = False
- # catpkg = catdir + "/" + y_ebuild
-
- badlicsyntax = len([z for z in
dynamic_data['type_list'] if z == "LICENSE"])
- badprovsyntax = len([z for z in
dynamic_data['type_list'] if z == "PROVIDE"])
- baddepsyntax = len(dynamic_data['type_list']) !=
badlicsyntax + badprovsyntax
- badlicsyntax = badlicsyntax > 0
- badprovsyntax = badprovsyntax > 0
-
used_useflags =
used_useflags.union(dynamic_data['ebuild_UsedUseFlags'])
# license checks
- if not badlicsyntax:
+ if not dynamic_data['badlicsyntax']:
self.licensecheck.check(dynamic_data['pkg'],
xpkg, dynamic_data['ebuild'], y_ebuild)
self.restrictcheck.check(dynamic_data['pkg'], xpkg,
dynamic_data['ebuild'], y_ebuild)
@@ -449,7 +433,7 @@ class Scanner(object):
dep_settings.usemask =
dep_settings._use_manager.getUseMask(
dynamic_data['pkg'],
stable=dep_settings._parent_stable)
- if not baddepsyntax:
+ if not dynamic_data['baddepsyntax']:
ismasked = not
dynamic_data['ebuild'].archs or \
dynamic_data['pkg'].cpv not in
self.portdb.xmatch("match-visible",
Atom("%s::%s" %
(dynamic_data['pkg'].cp, self.repo_settings.repo_config.name)))
@@ -539,7 +523,7 @@ class Scanner(object):
%
(dynamic_data['ebuild'].relative_path, mytype, keyword,
prof, pformat(atoms, indent=6)))
- if not baddepsyntax and dynamic_data['unknown_pkgs']:
+ if not dynamic_data['baddepsyntax'] and
dynamic_data['unknown_pkgs']:
type_map = {}
for mytype, atom in
dynamic_data['unknown_pkgs']:
type_map.setdefault(mytype,
set()).add(atom)
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/variables/, pym/repoman/modules/scan/metadata/, ...
commit: 4515c25be6359b7fa76b1b56df46b823c52cfd63
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 23:09:27 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Jan 23 01:31:15 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4515c25b
repoman: Migrate license checks to a plugin module
pym/repoman/checks/ebuilds/variables/license.py | 47 --
pym/repoman/modules/scan/metadata/__init__.py | 9 +
pym/repoman/modules/scan/metadata/license.py| 53 +
pym/repoman/scanner.py | 7 +---
4 files changed, 63 insertions(+), 53 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/variables/license.py
b/pym/repoman/checks/ebuilds/variables/license.py
deleted file mode 100644
index bdc859c..000
--- a/pym/repoman/checks/ebuilds/variables/license.py
+++ /dev/null
@@ -1,47 +0,0 @@
-
-'''description.py
-Perform checks on the LICENSE variable.
-'''
-
-# import our initialized portage instance
-from repoman._portage import portage
-
-
-class LicenseChecks(object):
- '''Perform checks on the LICENSE variable.'''
-
- def __init__(self, qatracker, liclist, liclist_deprecated):
- '''
- @param qatracker: QATracker instance
- @param liclist: List of licenses.
- @param liclist: List of deprecated licenses.
- '''
- self.qatracker = qatracker
- self.liclist = liclist
- self.liclist_deprecated = liclist_deprecated
-
- def check(
- self, pkg, package, ebuild, y_ebuild):
- '''
- @param pkg: Package in which we check (object).
- @param package: Package in which we check (string).
- @param ebuild: Ebuild which we check (object).
- @param y_ebuild: Ebuild which we check (string).
- '''
-
- # Parse the LICENSE variable, remove USE conditions and flatten
it.
- licenses = portage.dep.use_reduce(
- pkg._metadata["LICENSE"], matchall=1, flat=True)
-
- # Check each entry to ensure that it exists in
${PORTDIR}/licenses/.
- for lic in licenses:
- # Need to check for "||" manually as no portage
- # function will remove it without removing values.
- if lic not in self.liclist and lic != "||":
- self.qatracker.add_error(
- "LICENSE.invalid",
- package + "/" + y_ebuild + ".ebuild:
%s" % lic)
- elif lic in self.liclist_deprecated:
- self.qatracker.add_error(
- "LICENSE.deprecated",
- "%s: %s" % (ebuild.relative_path, lic))
diff --git a/pym/repoman/modules/scan/metadata/__init__.py
b/pym/repoman/modules/scan/metadata/__init__.py
index 83aac7f..c8f3609 100644
--- a/pym/repoman/modules/scan/metadata/__init__.py
+++ b/pym/repoman/modules/scan/metadata/__init__.py
@@ -37,6 +37,15 @@ module_spec = {
'func_desc': {
},
},
+ 'license-metadata': {
+ 'name': "license",
+ 'sourcefile': "license",
+ 'class': "LicenseChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
}
}
diff --git a/pym/repoman/modules/scan/metadata/license.py
b/pym/repoman/modules/scan/metadata/license.py
new file mode 100644
index 000..b022b20
--- /dev/null
+++ b/pym/repoman/modules/scan/metadata/license.py
@@ -0,0 +1,53 @@
+
+'''license.py
+Perform checks on the LICENSE variable.
+'''
+
+# import our initialized portage instance
+from repoman._portage import portage
+
+
+class LicenseChecks(object):
+ '''Perform checks on the LICENSE variable.'''
+
+ def __init__(self, **kwargs):
+ '''
+ @param qatracker: QATracker instance
+ @param repo_metadata: dictionary of various repository items.
+ '''
+ self.qatracker = kwargs.get('qatracker')
+ self.repo_metadata = kwargs.get('repo_metadata')
+
+ def check(self, **kwargs):
+ '''
+ @param xpkg: Package in which we check (string).
+ @param ebuild: Ebuild which we check (object).
+ @param y_ebuild: Ebuild which we check (string).
+ '''
+ xpkg = kwargs.get('xpkg')
+ ebuild = kwargs.get('ebuild')
+ y_ebuild = kwargs.get('y_ebuild')
+ if not kwargs.get('badlicsyntax'):
+ # Parse the L
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/keywords/
commit: 925db7edeb1fcd78b9f68bc4eda54e01d63fd9db
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 18:28:58 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Jan 23 01:25:27 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=925db7ed
repoman: Complete KeywordChecks migration
pym/repoman/modules/scan/keywords/keywords.py | 47 ---
pym/repoman/scanner.py| 3 +-
2 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/pym/repoman/modules/scan/keywords/keywords.py
b/pym/repoman/modules/scan/keywords/keywords.py
index 484d7d5..e34c891 100644
--- a/pym/repoman/modules/scan/keywords/keywords.py
+++ b/pym/repoman/modules/scan/keywords/keywords.py
@@ -19,6 +19,8 @@ class KeywordChecks(ScanBase):
super(KeywordChecks, self).__init__(**kwargs)
self.qatracker = kwargs.get('qatracker')
self.options = kwargs.get('options')
+ self.repo_metadata = kwargs.get('repo_metadata')
+ self.profiles = kwargs.get('profiles')
self.slot_keywords = {}
def prepare(self, **kwargs):
@@ -45,21 +47,19 @@ class KeywordChecks(ScanBase):
live_ebuild = kwargs.get('live_ebuild')
if not self.options.straight_to_stable:
self._checkAddedWithStableKeywords(
- package, ebuild, y_ebuild, keywords, changed)
+ xpkg, ebuild, y_ebuild, ebuild.keywords,
changed)
- self._checkForDroppedKeywords(
- pkg, ebuild, ebuild_archs, live_ebuild)
+ self._checkForDroppedKeywords(pkg, ebuild, ebuild.archs,
live_ebuild)
- self._checkForInvalidKeywords(
- pkg, package, y_ebuild, kwlist, profiles)
+ self._checkForInvalidKeywords(ebuild, xpkg, y_ebuild)
- self._checkForMaskLikeKeywords(
- package, y_ebuild, keywords, kwlist)
+ self._checkForMaskLikeKeywords(xpkg, y_ebuild, ebuild.keywords)
- self.slot_keywords[pkg.slot].update(ebuild_archs)
+ self.slot_keywords[pkg.slot].update(ebuild.archs)
return {'continue': False}
- def _isKeywordStable(self, keyword):
+ @staticmethod
+ def _isKeywordStable(keyword):
return not keyword.startswith("~") and not
keyword.startswith("-")
def _checkAddedWithStableKeywords(
@@ -88,9 +88,8 @@ class KeywordChecks(ScanBase):
ebuild.relative_path,
"
".join(sorted(dropped_keywords
- def _checkForInvalidKeywords(
- self, pkg, package, y_ebuild, kwlist, profiles):
- myuse = pkg._metadata["KEYWORDS"].split()
+ def _checkForInvalidKeywords(self, ebuild, xpkg, y_ebuild):
+ myuse = ebuild.keywords
for mykey in myuse:
if mykey not in ("-*", "*", "~*"):
@@ -99,20 +98,16 @@ class KeywordChecks(ScanBase):
if not self._isKeywordStable(myskey[:1]):
myskey = myskey[1:]
- if myskey not in kwlist:
+ if myskey not in self.repo_metadata['kwlist']:
+
self.qatracker.add_error("KEYWORDS.invalid",
+ "%s/%s.ebuild: %s" % (xpkg,
y_ebuild, mykey))
+ elif myskey not in self.profiles:
self.qatracker.add_error(
"KEYWORDS.invalid",
- "%s/%s.ebuild: %s" % (
- package, y_ebuild,
mykey))
- elif myskey not in profiles:
- self.qatracker.add_error(
- "KEYWORDS.invalid",
- "%s/%s.ebuild: %s (profile
invalid)" % (
- package, y_ebuild,
mykey))
-
- def _checkForMaskLikeKeywords(
- self, package, y_ebuild, keywords, kwlist):
+ "%s/%s.ebuild: %s (profile
invalid)"
+ % (xpkg, y_ebuild,
mykey))
+ def _checkForMaskLikeKeywords(self, xpkg, y_ebuild, keywords):
# KEYWORDS="-*" is a stupid replacement for package.mask
# and screws general KEYWORDS semantics
if "-*" in keywords:
@@ -121,12 +116,12 @@ class KeywordChecks(ScanBase):
for kw in keywords:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 4b1a24644a94f5d2aebe27572e0b4c374ab19f57
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 05:33:17 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Jan 23 01:38:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4b1a2464
repoman: Enable verbosity option to be useful for setting the logging level
Verbosity option was not being used internally.
Convert debug print's added to proper debug messages.
pym/repoman/main.py| 13 ++---
pym/repoman/scanner.py | 35 +++
2 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 890e034..6921005 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -19,7 +19,6 @@ from portage import os
import portage.checksum
import portage.const
import portage.repository.config
-from portage import util
from portage.output import create_color_func, nocolor
from portage.output import ConsoleStyleFile, StyleWriter
from portage.util import formatter
@@ -37,13 +36,14 @@ from repoman.modules.vcs.settings import VCSSettings
if sys.hexversion >= 0x300:
basestring = str
-util.initialize_logger()
-
bad = create_color_func("BAD")
# A sane umask is needed for files that portage creates.
os.umask(0o22)
+LOGLEVEL = logging.WARNING
+portage.util.initialize_logger(LOGLEVEL)
+
def repoman_main(argv):
config_root = os.environ.get("PORTAGE_CONFIGROOT")
@@ -61,6 +61,13 @@ def repoman_main(argv):
print("Portage", portage.VERSION)
sys.exit(0)
+ logger = logging.getLogger()
+
+ if options.verbosity > 0:
+ logger.setLevel(LOGLEVEL - 10 * options.verbosity)
+ else:
+ logger.setLevel(LOGLEVEL)
+
if options.experimental_inherit == 'y':
# This is experimental, so it's non-fatal.
qawarnings.add("inherit.missing")
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 4cc2e67..c30c94e 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -19,13 +19,13 @@ from portage.module import Modules
MODULES_PATH = os.path.join(os.path.dirname(__file__), "modules", "scan")
# initial development debug info
-#print("module path:", path)
+logging.debug("module path: %s", MODULES_PATH)
MODULE_CONTROLLER = Modules(path=MODULES_PATH, namepath="repoman.modules.scan")
-# initial development debug info
-#print(module_controller.module_names)
MODULE_NAMES = MODULE_CONTROLLER.module_names[:]
+# initial development debug info
+logging.debug("module_names: %s", MODULE_NAMES)
class Scanner(object):
@@ -197,7 +197,7 @@ class Scanner(object):
for mod in ['manifests', 'isebuild', 'keywords', 'files',
'vcsstatus',
'fetches', 'pkgmetadata']:
mod_class = MODULE_CONTROLLER.get_class(mod)
- print("Initializing class name:", mod_class.__name__)
+ logging.debug("Initializing class name: %s",
mod_class.__name__)
self.modules[mod_class.__name__] =
mod_class(**self.kwargs)
# initialize our checks classes here before the big xpkg loop
@@ -207,7 +207,7 @@ class Scanner(object):
for xpkg in self.effective_scanlist:
xpkg_continue = False
# ebuilds and digests added to cvs respectively.
- logging.info("checking package %s" % xpkg)
+ logging.info("checking package %s", xpkg)
# save memory by discarding xmatch caches from previous
package(s)
self.caches['arch_xmatch'].clear()
self.eadded = []
@@ -235,7 +235,7 @@ class Scanner(object):
# need to set it up for ==> self.modules or some other
ordered list
for mod in ['Manifests', 'IsEbuild', 'KeywordChecks',
'FileChecks',
'VCSStatus', 'FetchChecks',
'PkgMetadata']:
- print("scan_pkgs(): module:", mod)
+ logging.debug("scan_pkgs; module: %s", mod)
do_it, functions = self.modules[mod].runInPkgs
if do_it:
for func in functions:
@@ -299,7 +299,7 @@ class Scanner(object):
logging.debug("do_it: %s, functions: %s",
do_it, [x.__name__ for x in functions])
if do_it:
for func in functions:
- print("\tRunning function:",
func)
+ logging.debug("\tRunning
function: %s", func)
rdata = func(**dynamic_data)
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/directories/
commit: fa18c717e961e4c1660a24fc04fd82f529e297d3
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 23:23:52 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Jan 23 01:33:12 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=fa18c717
repoman: Migrate code to a new MtimeChecks class in directories plugin
pym/repoman/modules/scan/directories/__init__.py | 9 +
pym/repoman/modules/scan/directories/mtime.py| 24
pym/repoman/scanner.py | 5 +
3 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/pym/repoman/modules/scan/directories/__init__.py
b/pym/repoman/modules/scan/directories/__init__.py
index bcc6eca..ec18d30 100644
--- a/pym/repoman/modules/scan/directories/__init__.py
+++ b/pym/repoman/modules/scan/directories/__init__.py
@@ -19,6 +19,15 @@ module_spec = {
'func_kwargs': {
},
},
+ 'mtime-module': {
+ 'name': "mtime",
+ 'sourcefile': "mtime",
+ 'class': "MtimeChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_kwargs': {
+ },
+ },
}
}
diff --git a/pym/repoman/modules/scan/directories/mtime.py
b/pym/repoman/modules/scan/directories/mtime.py
new file mode 100644
index 000..e113cdd
--- /dev/null
+++ b/pym/repoman/modules/scan/directories/mtime.py
@@ -0,0 +1,24 @@
+
+
+class MtimeChecks(object):
+
+ def __init__(self, **kwargs):
+ self.vcs_settings = kwargs.get('vcs_settings')
+
+ def check(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
+ changed = kwargs.get('changed')
+ pkg = kwargs.get('pkg')
+ if not self.vcs_settings.vcs_preserves_mtime:
+ if ebuild.ebuild_path not in changed.new_ebuilds and \
+ ebuild.ebuild_path not in
changed.ebuilds:
+ pkg.mtime = None
+ return {'continue': False}
+
+ @property
+ def runInPkgs(self):
+ return (False, [])
+
+ @property
+ def runInEbuilds(self):
+ return (True, [self.check])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 8657c73..b00dbd9 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -293,6 +293,7 @@ class Scanner(object):
('arches', 'ArchChecks'), ('depend',
'DependChecks'),
('use_flags', 'USEFlagChecks'), ('ruby',
'RubyEclassChecks'),
('license', 'LicenseChecks'), ('restrict',
'RestrictChecks'),
+ ('mtime', 'MtimeChecks'),
]:
if mod[0]:
mod_class =
MODULE_CONTROLLER.get_class(mod[0])
@@ -321,10 +322,6 @@ class Scanner(object):
continue
# Syntax Checks
- if not self.vcs_settings.vcs_preserves_mtime:
- if dynamic_data['ebuild'].ebuild_path not in
self.changed.new_ebuilds and \
- dynamic_data['ebuild'].ebuild_path not
in self.changed.ebuilds:
- dynamic_data['pkg'].mtime = None
try:
# All ebuilds should have utf_8 encoding.
f = io.open(
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/eclasses/, pym/repoman/checks/ebuilds/eclasses/, ...
commit: a4d34a66ff329073ec72d1aa9fbe347f6b8d8def
Author: Brian Dolbec gentoo org>
AuthorDate: Fri Jan 8 08:46:01 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Jan 23 01:30:29 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a4d34a66
repoman: Create RubyEclassChecks class plugin
pym/repoman/checks/ebuilds/eclasses/__init__.py| 0
pym/repoman/modules/scan/eclasses/__init__.py | 9 +
.../{checks/ebuilds => modules/scan}/eclasses/ruby.py | 18 ++
pym/repoman/scanner.py | 9 ++---
4 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/eclasses/__init__.py
b/pym/repoman/checks/ebuilds/eclasses/__init__.py
deleted file mode 100644
index e69de29..000
diff --git a/pym/repoman/modules/scan/eclasses/__init__.py
b/pym/repoman/modules/scan/eclasses/__init__.py
index ed9a7c7..126f2a6 100644
--- a/pym/repoman/modules/scan/eclasses/__init__.py
+++ b/pym/repoman/modules/scan/eclasses/__init__.py
@@ -19,6 +19,15 @@ module_spec = {
'func_kwargs': {
},
},
+ 'ruby-module': {
+ 'name': "ruby",
+ 'sourcefile': "ruby",
+ 'class': "RubyEclassChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_kwargs': {
+ },
+ },
}
}
diff --git a/pym/repoman/checks/ebuilds/eclasses/ruby.py
b/pym/repoman/modules/scan/eclasses/ruby.py
similarity index 62%
rename from pym/repoman/checks/ebuilds/eclasses/ruby.py
rename to pym/repoman/modules/scan/eclasses/ruby.py
index e8d36ea..4dc5d62 100644
--- a/pym/repoman/checks/ebuilds/eclasses/ruby.py
+++ b/pym/repoman/modules/scan/eclasses/ruby.py
@@ -4,19 +4,23 @@ Performs Ruby eclass checks
'''
from repoman.qa_data import ruby_deprecated
+from repoman.modules.scan.scanbase import ScanBase
-class RubyEclassChecks(object):
+class RubyEclassChecks(ScanBase):
'''Performs checks for the usage of Ruby eclasses in ebuilds'''
- def __init__(self, qatracker):
+ def __init__(self, **kwargs):
'''
@param qatracker: QATracker instance
'''
- self.qatracker = qatracker
+ super(RubyEclassChecks, self).__init__(**kwargs)
+ self.qatracker = kwargs.get('qatracker')
self.old_ruby_eclasses = ["ruby-ng", "ruby-fakegem", "ruby"]
- def check(self, pkg, ebuild):
+ def check(self, **kwargs):
+ pkg = kwargs.get('pkg')
+ ebuild = kwargs.get('ebuild')
is_inherited = lambda eclass: eclass in pkg.inherited
is_old_ruby_eclass_inherited = filter(
is_inherited, self.old_ruby_eclasses)
@@ -30,3 +34,9 @@ class RubyEclassChecks(object):
"IUSE.rubydeprecated",
(ebuild.relative_path + ":
Deprecated ruby target: %s")
% myruby)
+ return {'continue': False}
+
+ @property
+ def runInEbuilds(self):
+ '''Ebuild level scans'''
+ return (True, [self.check])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 0227a93..e6a17cd 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -18,7 +18,6 @@ from portage import _unicode_encode
from portage.dep import Atom
from portage.output import green
from repoman.checks.ebuilds.checks import run_checks
-from repoman.checks.ebuilds.eclasses.ruby import RubyEclassChecks
from repoman.checks.ebuilds.variables.license import LicenseChecks
from repoman.checks.ebuilds.variables.restrict import RestrictChecks
from repoman.modules.commit import repochecks
@@ -211,7 +210,6 @@ class Scanner(object):
self.modules[mod_class.__name__] =
mod_class(**self.kwargs)
# initialize our checks classes here before the big xpkg loop
- self.rubyeclasscheck = RubyEclassChecks(self.qatracker)
self.licensecheck = LicenseChecks(self.qatracker, liclist,
liclist_deprecated)
self.restrictcheck = RestrictChecks(self.qatracker)
@@ -298,7 +296,7 @@ class Scanner(object):
('thirdpartymirrors', 'ThirdPartyMirrors'),
('description', 'DescriptionChecks'), (None,
'KeywordChecks'),
('arches', 'ArchChecks'), ('depend',
'DependChecks'),
- ('use_flags', 'USEFlagChecks'),
+ ('use_flags', 'USEFlagChecks'), ('ruby',
'RubyEclassChecks'),
]:
if m
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/metadata/, pym/repoman/, ...
commit: 7dfb4ff8da3870591cd28bea9380f9dbb5bd0e9a
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 23:10:48 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Jan 23 01:32:22 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=7dfb4ff8
repoman: Migrate RestrictChecks to a plugin module
pym/repoman/modules/scan/metadata/__init__.py | 9 +++
.../scan/metadata}/restrict.py | 29 +++---
pym/repoman/scanner.py | 7 +-
3 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/pym/repoman/modules/scan/metadata/__init__.py
b/pym/repoman/modules/scan/metadata/__init__.py
index c8f3609..4f376e1 100644
--- a/pym/repoman/modules/scan/metadata/__init__.py
+++ b/pym/repoman/modules/scan/metadata/__init__.py
@@ -46,6 +46,15 @@ module_spec = {
'func_desc': {
},
},
+ 'restrict-metadata': {
+ 'name': "restrict",
+ 'sourcefile': "restrict",
+ 'class': "RestrictChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
}
}
diff --git a/pym/repoman/checks/ebuilds/variables/restrict.py
b/pym/repoman/modules/scan/metadata/restrict.py
similarity index 54%
rename from pym/repoman/checks/ebuilds/variables/restrict.py
rename to pym/repoman/modules/scan/metadata/restrict.py
index 215b792..93ca298 100644
--- a/pym/repoman/checks/ebuilds/variables/restrict.py
+++ b/pym/repoman/modules/scan/metadata/restrict.py
@@ -12,21 +12,23 @@ from repoman.qa_data import valid_restrict
class RestrictChecks(object):
'''Perform checks on the RESTRICT variable.'''
- def __init__(self, qatracker):
+ def __init__(self, **kwargs):
'''
@param qatracker: QATracker instance
'''
- self.qatracker = qatracker
+ self.qatracker = kwargs.get('qatracker')
- def check(self, pkg, package, ebuild, y_ebuild):
+ def check(self, **kwargs):
+ xpkg = kwargs.get('xpkg')
+ ebuild = kwargs.get('ebuild')
+ y_ebuild = kwargs.get('y_ebuild')
myrestrict = None
try:
myrestrict = portage.dep.use_reduce(
- pkg._metadata["RESTRICT"], matchall=1,
flat=True)
+ ebuild.metadata["RESTRICT"], matchall=1,
flat=True)
except portage.exception.InvalidDependString as e:
- self. qatracker.add_error(
- "RESTRICT.syntax",
+ self.qatracker.add_error("RESTRICT.syntax",
"%s: RESTRICT: %s" % (ebuild.relative_path, e))
del e
@@ -36,6 +38,15 @@ class RestrictChecks(object):
if mybadrestrict:
for mybad in mybadrestrict:
- self.qatracker.add_error(
- "RESTRICT.invalid",
- package + "/" + y_ebuild +
".ebuild: %s" % mybad)
+
self.qatracker.add_error("RESTRICT.invalid",
+ "%s/%s.ebuild: %s" % (xpkg,
y_ebuild, mybad))
+ return {'continue': False}
+
+ @property
+ def runInPkgs(self):
+ return (False, [])
+
+ @property
+ def runInEbuilds(self):
+ return (True, [self.check])
+
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 1f792bd..8657c73 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -18,7 +18,6 @@ from portage import _unicode_encode
from portage.dep import Atom
from portage.output import green
from repoman.checks.ebuilds.checks import run_checks
-from repoman.checks.ebuilds.variables.restrict import RestrictChecks
from repoman.modules.commit import repochecks
from repoman.profile import check_profiles, dev_profile_keywords, setup_profile
from repoman.repos import repo_metadata
@@ -209,8 +208,6 @@ class Scanner(object):
self.modules[mod_class.__name__] =
mod_class(**self.kwargs)
# initialize our checks classes here before the big xpkg loop
- self.restrictcheck = RestrictChecks(self.qatracker)
-
def scan_pkgs(self, can_force):
dynamic_data = {'can_force': can_force}
@@ -295,7 +292,7 @@ class Scanner(object):
('description', 'DescriptionChecks'), (None,
'KeywordChecks'),
('arches', 'ArchChecks'), ('depend',
'DependChecks'),
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/depend/
commit: 3a9da2c96c9b30c2406405ceb0f527b1c779e404
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jan 4 07:57:36 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Jan 23 01:36:20 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=3a9da2c9
repoman: Move the large depency checks loop to a new plugin
ProfileDependsChecks class
pym/repoman/modules/scan/depend/__init__.py | 9 ++
pym/repoman/modules/scan/depend/profile.py | 211
pym/repoman/repos.py| 1 +
pym/repoman/scanner.py | 181 +---
4 files changed, 228 insertions(+), 174 deletions(-)
diff --git a/pym/repoman/modules/scan/depend/__init__.py
b/pym/repoman/modules/scan/depend/__init__.py
index ebc716c..cddb7f1 100644
--- a/pym/repoman/modules/scan/depend/__init__.py
+++ b/pym/repoman/modules/scan/depend/__init__.py
@@ -19,6 +19,15 @@ module_spec = {
'func_desc': {
},
},
+ 'profile-module': {
+ 'name': "profile",
+ 'sourcefile': "profile",
+ 'class': "ProfileDependsChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
}
}
diff --git a/pym/repoman/modules/scan/depend/profile.py
b/pym/repoman/modules/scan/depend/profile.py
new file mode 100644
index 000..91c52cc
--- /dev/null
+++ b/pym/repoman/modules/scan/depend/profile.py
@@ -0,0 +1,211 @@
+# -*- coding:utf-8 -*-
+
+
+import copy
+from pprint import pformat
+
+from _emerge.Package import Package
+
+# import our initialized portage instance
+from repoman._portage import portage
+from portage.dep import Atom
+
+
+def sort_key(item):
+ return item[2].sub_path
+
+
+class ProfileDependsChecks(object):
+
+ def __init__(self, **kwargs):
+ self.qatracker = kwargs.get('qatracker')
+ self.portdb = kwargs.get('portdb')
+ self.profiles = kwargs.get('profiles')
+ self.options = kwargs.get('options')
+ self.repo_settings = kwargs.get('repo_settings')
+ self.include_arches = kwargs.get('include_arches')
+ self.caches = kwargs.get('caches')
+ self.repoman_incrementals = kwargs.get('repoman_incrementals')
+ self.env = kwargs.get('env')
+ self.have = kwargs.get('have')
+ self.dev_keywords = kwargs.get('dev_keywords')
+
+ def check(self, **kwargs):
+ arches = kwargs.get('arches')
+ ebuild = kwargs.get('ebuild')
+ pkg = kwargs.get('pkg')
+ baddepsyntax = kwargs.get('baddepsyntax')
+ unknown_pkgs = kwargs.get('unknown_pkgs')
+
+ relevant_profiles = []
+ for keyword, arch, groups in arches:
+ if arch not in self.profiles:
+ # A missing profile will create an error
further down
+ # during the KEYWORDS verification.
+ continue
+
+ if self.include_arches is not None:
+ if arch not in self.include_arches:
+ continue
+
+ relevant_profiles.extend(
+ (keyword, groups, prof) for prof in
self.profiles[arch])
+
+ relevant_profiles.sort(key=sort_key)
+
+ for keyword, groups, prof in relevant_profiles:
+
+ is_stable_profile = prof.status == "stable"
+ is_dev_profile = prof.status == "dev" and \
+ self.options.include_dev
+ is_exp_profile = prof.status == "exp" and \
+ self.options.include_exp_profiles == 'y'
+ if not (is_stable_profile or is_dev_profile or
is_exp_profile):
+ continue
+
+ dep_settings = self.caches['arch'].get(prof.sub_path)
+ if dep_settings is None:
+ dep_settings = portage.config(
+ config_profile_path=prof.abs_path,
+
config_incrementals=self.repoman_incrementals,
+
config_root=self.repo_settings.config_root,
+ local_config=False,
+
_unmatched_removal=self.options.unmatched_removal,
+ env=self.env,
repositories=self.repo_settings.repoman_settings.repositories)
+ dep_settings.categories =
self.repo_settings.repoman_settings.catego
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/metadata/
commit: c342a863e6e7825e695380d54a8f201319494129
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 11:56:25 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Jan 23 01:30:34 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c342a863
repoman: Migrate more metadata checks to ebuild_metadata.py
.../modules/scan/metadata/ebuild_metadata.py | 32 --
pym/repoman/scanner.py | 17
2 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/pym/repoman/modules/scan/metadata/ebuild_metadata.py
b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
index 2dc1db2..77c947e 100644
--- a/pym/repoman/modules/scan/metadata/ebuild_metadata.py
+++ b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
@@ -5,6 +5,8 @@
import re
import sys
+from repoman.qa_data import missingvars
+
if sys.hexversion >= 0x300:
basestring = str
@@ -16,7 +18,7 @@ class EbuildMetadata(object):
def __init__(self, **kwargs):
self.qatracker = kwargs.get('qatracker')
- def check(self, **kwargs):
+ def invalidchar(self, **kwargs):
ebuild = kwargs.get('ebuild')
for k, v in ebuild.metadata.items():
if not isinstance(v, basestring):
@@ -28,9 +30,35 @@ class EbuildMetadata(object):
"%s: %s variable contains non-ASCII "
"character at position %s" %
(ebuild.relative_path, k, m.start() +
1))
+ return {'continue': False}
+
+ def missing(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
+ for pos, missing_var in enumerate(missingvars):
+ if not ebuild.metadata.get(missing_var):
+ if kwargs.get('catdir') == "virtual" and \
+ missing_var in ("HOMEPAGE", "LICENSE"):
+ continue
+ if kwargs.get('live_ebuild') and missing_var ==
"KEYWORDS":
+ continue
+ myqakey = missingvars[pos] + ".missing"
+ self.qatracker.add_error(myqakey, '%s/%s.ebuild'
+ % (kwargs.get('xpkg'),
kwargs.get('y_ebuild')))
+ return {'continue': False}
+
+ def old_virtual(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
if ebuild.metadata.get("PROVIDE"):
self.qatracker.add_error("virtual.oldstyle",
ebuild.relative_path)
+ return {'continue': False}
+ def virtual(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
+ if kwargs.get('catdir') == "virtual":
+ for var in ("HOMEPAGE", "LICENSE"):
+ if ebuild.metadata.get(var):
+ myqakey = var + ".virtual"
+ self.qatracker.add_error(myqakey,
ebuild.relative_path)
return {'continue': False}
@property
@@ -39,4 +67,4 @@ class EbuildMetadata(object):
@property
def runInEbuilds(self):
- return (True, [self.check])
+ return (True, [self.invalidchar, self.missing,
self.old_virtual, self.virtual])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 46f46f5..d42fd33 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -324,23 +324,6 @@ class Scanner(object):
if y_ebuild_continue:
continue
-
- for pos, missing_var in enumerate(missingvars):
- if not
dynamic_data['ebuild'].metadata.get(missing_var):
- if dynamic_data['catdir'] == "virtual"
and \
- missing_var in ("HOMEPAGE",
"LICENSE"):
- continue
- if dynamic_data['live_ebuild'] and
missing_var == "KEYWORDS":
- continue
- myqakey = missingvars[pos] + ".missing"
- self.qatracker.add_error(myqakey, xpkg
+ "/" + y_ebuild + ".ebuild")
-
- if dynamic_data['catdir'] == "virtual":
- for var in ("HOMEPAGE", "LICENSE"):
- if
dynamic_data['ebuild'].metadata.get(var):
- myqakey = var + ".virtual"
-
self.qatracker.add_error(myqakey, dynamic_data['ebuild'].relative_path)
-
if dynami
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/depend/, pym/repoman/
commit: b580a0b47e7f010d5b651a274746128164b9c7cd
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jan 4 08:09:33 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Jan 23 01:37:04 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=b580a0b4
repoman: Create a new DependUnknown plugin class
pym/repoman/modules/scan/depend/__init__.py | 9 +
pym/repoman/modules/scan/depend/unknown.py | 30 +
pym/repoman/scanner.py | 10 +-
3 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/pym/repoman/modules/scan/depend/__init__.py
b/pym/repoman/modules/scan/depend/__init__.py
index cddb7f1..9fd7970 100644
--- a/pym/repoman/modules/scan/depend/__init__.py
+++ b/pym/repoman/modules/scan/depend/__init__.py
@@ -28,6 +28,15 @@ module_spec = {
'func_desc': {
},
},
+ 'unknown-module': {
+ 'name': "unknown",
+ 'sourcefile': "unknown",
+ 'class': "DependUnknown",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
}
}
diff --git a/pym/repoman/modules/scan/depend/unknown.py
b/pym/repoman/modules/scan/depend/unknown.py
new file mode 100644
index 000..61d51b9
--- /dev/null
+++ b/pym/repoman/modules/scan/depend/unknown.py
@@ -0,0 +1,30 @@
+# -*- coding:utf-8 -*-
+
+
+class DependUnknown(object):
+
+ def __init__(self, **kwargs):
+ self.qatracker = kwargs.get('qatracker')
+
+ def check(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
+ baddepsyntax = kwargs.get('baddepsyntax')
+ unknown_pkgs = kwargs.get('unknown_pkgs')
+
+ if not baddepsyntax and unknown_pkgs:
+ type_map = {}
+ for mytype, atom in unknown_pkgs:
+ type_map.setdefault(mytype, set()).add(atom)
+ for mytype, atoms in type_map.items():
+ self.qatracker.add_error(
+ "dependency.unknown", "%s: %s: %s"
+ % (ebuild.relative_path, mytype, ",
".join(sorted(atoms
+ return {'continue': False}
+
+ @property
+ def runInPkgs(self):
+ return (False, [])
+
+ @property
+ def runInEbuilds(self):
+ return (True, [self.check])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 9223876..1cd37d0 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -289,6 +289,7 @@ class Scanner(object):
('mtime', 'MtimeChecks'), ('multicheck',
'MultiCheck'),
# Options.is_forced() is used to bypass further
checks
('options', 'Options'), ('profile',
'ProfileDependsChecks'),
+ ('unknown', 'DependUnknown'),
]:
if mod[0]:
mod_class =
MODULE_CONTROLLER.get_class(mod[0])
@@ -316,15 +317,6 @@ class Scanner(object):
if y_ebuild_continue:
continue
- if not dynamic_data['baddepsyntax'] and
dynamic_data['unknown_pkgs']:
- type_map = {}
- for mytype, atom in
dynamic_data['unknown_pkgs']:
- type_map.setdefault(mytype,
set()).add(atom)
- for mytype, atoms in type_map.items():
- self.qatracker.add_error(
- "dependency.unknown", "%s: %s:
%s"
- %
(dynamic_data['ebuild'].relative_path, mytype, ", ".join(sorted(atoms
-
# check if there are unused local USE-descriptions in
metadata.xml
# (unless there are any invalids, to avoid noise)
if dynamic_data['allvalid']:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/depend/
commit: 985d6011a1f7d3d79ee3119e7d6b64fe92ce6eb3
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 20:38:11 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Jan 23 01:28:28 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=985d6011
repoman: New DependChecks class plugin
Migrate code from _scan_ebuilds to the plugin system
pym/repoman/modules/scan/depend/__init__.py | 24 +
pym/repoman/modules/scan/depend/depend.py | 132
pym/repoman/scanner.py | 119 ++---
3 files changed, 163 insertions(+), 112 deletions(-)
diff --git a/pym/repoman/modules/scan/depend/__init__.py
b/pym/repoman/modules/scan/depend/__init__.py
new file mode 100644
index 000..ebc716c
--- /dev/null
+++ b/pym/repoman/modules/scan/depend/__init__.py
@@ -0,0 +1,24 @@
+# Copyright 2015-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+doc = """Depend plug-in module for repoman.
+Performs Dependency checks on ebuilds."""
+__doc__ = doc[:]
+
+
+module_spec = {
+ 'name': 'depend',
+ 'description': doc,
+ 'provides':{
+ 'depend-module': {
+ 'name': "depend",
+ 'sourcefile': "depend",
+ 'class': "DependChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
+ }
+}
+
diff --git a/pym/repoman/modules/scan/depend/depend.py
b/pym/repoman/modules/scan/depend/depend.py
new file mode 100644
index 000..8a0ff48
--- /dev/null
+++ b/pym/repoman/modules/scan/depend/depend.py
@@ -0,0 +1,132 @@
+
+from _emerge.Package import Package
+
+from repoman.check_missingslot import check_missingslot
+# import our initialized portage instance
+from repoman._portage import portage
+from repoman.qa_data import suspect_virtual, suspect_rdepend
+
+
+class DependChecks(object):
+
+ def __init__(self, **kwargs):
+ self.qatracker = kwargs.get('qatracker')
+ self.portdb = kwargs.get('portdb')
+
+ def check(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
+ pkg = kwargs.get('pkg')
+
+ unknown_pkgs = set()
+
+ inherited_java_eclass = "java-pkg-2" in ebuild.inherited or \
+ "java-pkg-opt-2" in ebuild.inherited,
+ inherited_wxwidgets_eclass = "wxwidgets" in ebuild.inherited
+ # operator_tokens = set(["||", "(", ")"])
+ type_list, badsyntax = [], []
+ for mytype in Package._dep_keys + ("LICENSE", "PROPERTIES",
"PROVIDE"):
+ mydepstr = ebuild.metadata[mytype]
+
+ buildtime = mytype in Package._buildtime_keys
+ runtime = mytype in Package._runtime_keys
+ token_class = None
+ if mytype.endswith("DEPEND"):
+ token_class = portage.dep.Atom
+
+ try:
+ atoms = portage.dep.use_reduce(
+ mydepstr, matchall=1, flat=True,
+ is_valid_flag=pkg.iuse.is_valid_flag,
token_class=token_class)
+ except portage.exception.InvalidDependString as e:
+ atoms = None
+ badsyntax.append(str(e))
+
+ if atoms and mytype.endswith("DEPEND"):
+ if runtime and \
+ "test?" in mydepstr.split():
+ self.qatracker.add_error(
+ mytype + '.suspect',
+ "%s: 'test?' USE conditional in
%s" %
+ (ebuild.relative_path, mytype))
+
+ for atom in atoms:
+ if atom == "||":
+ continue
+
+ is_blocker = atom.blocker
+
+ # Skip dependency.unknown for blockers,
so that we
+ # don't encourage people to remove
necessary blockers,
+ # as discussed in bug 382407. We use
atom.without_use
+ # due to bug 525376.
+ if not is_blocker and \
+ not
self.portdb.xmatch("match-all", atom.without_use) and \
+ not
atom.cp.startswith("virtual/"):
+ unknown_pkgs.add((mytype,
atom.une
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/metadata/, pym/repoman/
commit: 13e0d777ca6dbb32f75e7600a3260ebb4d3803d5
Author: Brian Dolbec gentoo org>
AuthorDate: Thu Jan 21 18:29:07 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Jan 23 01:38:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=13e0d777
repoman: Fix a traceback due to xmlint not being installed for a manifest
generation
Mike helped find teh fact that self.binary was None, causing the misleading
traceback.
Tighten up the logic in XmlLint.
Bypass the PkgMetadata check for manifest mode.
floppym@naomi btrfs-progs % repoman manifest
>>> Creating Manifest for /home/floppym/repos/gentoo/sys-fs/btrfs-progs
Traceback (most recent call last):
File "/home/floppym/bin/repoman", line 37, in
repoman_main(sys.argv[1:])
File "/home/floppym/src/portage/pym/repoman/main.py", line 111, in
repoman_main
can_force = scanner.scan_pkgs(can_force)
File "/home/floppym/src/portage/pym/repoman/scanner.py", line 242, in
scan_pkgs
rdata = func(**dynamic_data)
File
"/home/floppym/src/portage/pym/repoman/modules/scan/metadata/pkgmetadata.py",
line 180, in check
if not self.xmllint.check(checkdir, repolevel):
File "/home/floppym/src/portage/pym/repoman/_xml.py", line 98, in check
os.path.join(checkdir, "metadata.xml"
TypeError: unsupported operand type(s) for +: 'NoneType' and 'str'
pym/repoman/_xml.py | 2 +-
pym/repoman/modules/scan/metadata/pkgmetadata.py | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/pym/repoman/_xml.py b/pym/repoman/_xml.py
index 2661f14..f7ff9fb 100644
--- a/pym/repoman/_xml.py
+++ b/pym/repoman/_xml.py
@@ -60,6 +60,7 @@ class XmlLint(object):
self.repoman_settings = repoman_settings
self._is_capable = metadata_dtd is not None
self.binary = None
+ self._is_capable = False
self._check_capable()
def _check_capable(self):
@@ -68,7 +69,6 @@ class XmlLint(object):
self.binary = find_binary('xmllint')
if not self.binary:
print(red("!!! xmllint not found. Can't check
metadata.xml.\n"))
- self._is_capable = False
elif not self._is_capable:
if not fetch_metadata_dtd(self.metadata_dtd,
self.repoman_settings):
sys.exit(1)
diff --git a/pym/repoman/modules/scan/metadata/pkgmetadata.py
b/pym/repoman/modules/scan/metadata/pkgmetadata.py
index 220fd23..8e93457 100644
--- a/pym/repoman/modules/scan/metadata/pkgmetadata.py
+++ b/pym/repoman/modules/scan/metadata/pkgmetadata.py
@@ -71,6 +71,9 @@ class PkgMetadata(ScanBase):
repolevel = kwargs.get('repolevel')
self.musedict = {}
+ if self.options.mode in ['manifest']:
+ return {'continue': False, 'muselist':
frozenset(self.musedict)}
+
# metadata.xml file check
if "metadata.xml" not in checkdirlist:
self.qatracker.add_error("metadata.missing", xpkg +
"/metadata.xml")
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: c8c9c3d59737ef226494e8e8d013d2cf614e98b1 Author: Mike Gilbert gentoo org> AuthorDate: Thu Jan 21 18:51:16 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Sat Jan 23 01:38:03 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c8c9c3d5 metadata.py: Resolve error when moving metadata.dtd If DISTDIR and PORTDIR/metadata/dtd live on different filesystems, os.rename() will fail. Use shutil.move() instead. pym/repoman/metadata.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pym/repoman/metadata.py b/pym/repoman/metadata.py index f1fa53a..e95ad41 100644 --- a/pym/repoman/metadata.py +++ b/pym/repoman/metadata.py @@ -19,6 +19,7 @@ from repoman._portage import portage from portage import exception from portage import os +from portage import shutil from portage.output import green if sys.hexversion >= 0x300: @@ -143,7 +144,7 @@ def fetch_metadata_dtd(metadata_dtd, repoman_settings): except portage.exception.PortageException: pass - os.rename(metadata_dtd_tmp, metadata_dtd) + shutil.move(metadata_dtd_tmp, metadata_dtd) finally: try: os.unlink(metadata_dtd_tmp)
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/metadata/, ...
commit: 72165d8e08e9b32312db1d7437c4ab15549d91f4
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 17:36:26 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Jan 23 01:25:16 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=72165d8e
repoman: Migrate DescriptionChecks to the plugin system
pym/repoman/modules/scan/metadata/__init__.py| 9 +
.../scan/metadata}/description.py| 20 ++--
pym/repoman/scanner.py | 5 +
3 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/pym/repoman/modules/scan/metadata/__init__.py
b/pym/repoman/modules/scan/metadata/__init__.py
index bacedf5..83aac7f 100644
--- a/pym/repoman/modules/scan/metadata/__init__.py
+++ b/pym/repoman/modules/scan/metadata/__init__.py
@@ -28,6 +28,15 @@ module_spec = {
'func_desc': {
},
},
+ 'description-metadata': {
+ 'name': "description",
+ 'sourcefile': "description",
+ 'class': "DescriptionChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
}
}
diff --git a/pym/repoman/checks/ebuilds/variables/description.py
b/pym/repoman/modules/scan/metadata/description.py
similarity index 66%
rename from pym/repoman/checks/ebuilds/variables/description.py
rename to pym/repoman/modules/scan/metadata/description.py
index a2b1057..3570607 100644
--- a/pym/repoman/checks/ebuilds/variables/description.py
+++ b/pym/repoman/modules/scan/metadata/description.py
@@ -9,20 +9,19 @@ from repoman.qa_data import max_desc_len
class DescriptionChecks(object):
'''Perform checks on the DESCRIPTION variable.'''
- def __init__(self, qatracker):
+ def __init__(self, **kwargs):
'''
@param qatracker: QATracker instance
'''
- self.qatracker = qatracker
+ self.qatracker = kwargs.get('qatracker')
- def check(self, pkg, ebuild):
+ def checkTooLong(self, **kwargs):
'''
@param pkg: Package in which we check (object).
@param ebuild: Ebuild which we check (object).
'''
- self._checkTooLong(pkg, ebuild)
-
- def _checkTooLong(self, pkg, ebuild):
+ ebuild = kwargs.get('ebuild')
+ pkg = kwargs.get('pkg')
# 14 is the length of DESCRIPTION=""
if len(pkg._metadata['DESCRIPTION']) > max_desc_len:
self.qatracker.add_error(
@@ -30,3 +29,12 @@ class DescriptionChecks(object):
"%s: DESCRIPTION is %d characters (max %d)" %
(ebuild.relative_path, len(
pkg._metadata['DESCRIPTION']),
max_desc_len))
+ return {'continue': False}
+
+ @property
+ def runInPkgs(self):
+ return (False, [])
+
+ @property
+ def runInEbuilds(self):
+ return (True, [self.checkTooLong])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 955440e..bb856b8 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -21,7 +21,6 @@ from repoman.checks.ebuilds.checks import run_checks
from repoman.checks.ebuilds.eclasses.ruby import RubyEclassChecks
from repoman.check_missingslot import check_missingslot
from repoman.checks.ebuilds.use_flags import USEFlagChecks
-from repoman.checks.ebuilds.variables.description import DescriptionChecks
from repoman.checks.ebuilds.variables.license import LicenseChecks
from repoman.checks.ebuilds.variables.restrict import RestrictChecks
from repoman.modules.commit import repochecks
@@ -216,7 +215,6 @@ class Scanner(object):
# initialize our checks classes here before the big xpkg loop
self.use_flag_checks = USEFlagChecks(self.qatracker, uselist)
self.rubyeclasscheck = RubyEclassChecks(self.qatracker)
- self.descriptioncheck = DescriptionChecks(self.qatracker)
self.licensecheck = LicenseChecks(self.qatracker, liclist,
liclist_deprecated)
self.restrictcheck = RestrictChecks(self.qatracker)
@@ -301,6 +299,7 @@ class Scanner(object):
for mod in [('ebuild', 'Ebuild'), ('live',
'LiveEclassChecks'),
('eapi', 'EAPIChecks'), ('ebuild_metadata',
'EbuildMetadata'),
('thirdpartymirrors', 'ThirdPartyMirrors'),
+ ('description', 'DescriptionChecks'),
]:
if mod[0]:
mod_class =
MODULE_CONTR
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/mirrors/, pym/repoman/checks/ebuilds/
commit: 26bfb232229e8760db38aed5ef5d79a90eb3750c
Author: Brian Dolbec gentoo org>
AuthorDate: Fri Jan 8 01:29:42 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Jan 23 01:24:19 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=26bfb232
repoman: Create the ThirdPartyMirrors class plugin
pym/repoman/checks/ebuilds/thirdpartymirrors.py| 39 --
pym/repoman/modules/scan/mirrors/__init__.py | 24 +
.../modules/scan/mirrors/thirdpartymirrors.py | 59 ++
pym/repoman/scanner.py | 6 +--
4 files changed, 86 insertions(+), 42 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/thirdpartymirrors.py
b/pym/repoman/checks/ebuilds/thirdpartymirrors.py
deleted file mode 100644
index 848dfb9..000
--- a/pym/repoman/checks/ebuilds/thirdpartymirrors.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding:utf-8 -*-
-
-# import our initialized portage instance
-from repoman._portage import portage
-
-
-class ThirdPartyMirrors(object):
-
- def __init__(self, repoman_settings, qatracker):
- # TODO: Build a regex instead here, for the SRC_URI.mirror
check.
- self.thirdpartymirrors = {}
- profile_thirdpartymirrors =
repoman_settings.thirdpartymirrors().items()
- for mirror_alias, mirrors in profile_thirdpartymirrors:
- for mirror in mirrors:
- if not mirror.endswith("/"):
- mirror += "/"
- self.thirdpartymirrors[mirror] = mirror_alias
-
- self.qatracker = qatracker
-
- def check(self, myaux, relative_path):
- # Check that URIs don't reference a server from
thirdpartymirrors.
- for uri in portage.dep.use_reduce(
- myaux["SRC_URI"], matchall=True, is_src_uri=True,
- eapi=myaux["EAPI"], flat=True):
- contains_mirror = False
- for mirror, mirror_alias in
self.thirdpartymirrors.items():
- if uri.startswith(mirror):
- contains_mirror = True
- break
- if not contains_mirror:
- continue
-
- new_uri = "mirror://%s/%s" % (mirror_alias,
uri[len(mirror):])
- self.qatracker.add_error(
- "SRC_URI.mirror",
- "%s: '%s' found in thirdpartymirrors, use '%s'"
% (
- relative_path, mirror, new_uri))
- return
diff --git a/pym/repoman/modules/scan/mirrors/__init__.py
b/pym/repoman/modules/scan/mirrors/__init__.py
new file mode 100644
index 000..6bf7d2d
--- /dev/null
+++ b/pym/repoman/modules/scan/mirrors/__init__.py
@@ -0,0 +1,24 @@
+# Copyright 2015-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+doc = """Mirrors plug-in module for repoman.
+Performs third party mirrors checks on ebuilds."""
+__doc__ = doc[:]
+
+
+module_spec = {
+ 'name': 'mirrors',
+ 'description': doc,
+ 'provides':{
+ 'mirrors-module': {
+ 'name': "thirdpartymirrors",
+ 'sourcefile': "thirdpartymirrors",
+ 'class': "ThirdPartyMirrors",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
+ }
+}
+
diff --git a/pym/repoman/modules/scan/mirrors/thirdpartymirrors.py
b/pym/repoman/modules/scan/mirrors/thirdpartymirrors.py
new file mode 100644
index 000..9404e28
--- /dev/null
+++ b/pym/repoman/modules/scan/mirrors/thirdpartymirrors.py
@@ -0,0 +1,59 @@
+# -*- coding:utf-8 -*-
+
+# import our initialized portage instance
+from repoman._portage import portage
+from repoman.modules.scan.scanbase import ScanBase
+
+
+class ThirdPartyMirrors(ScanBase):
+
+ def __init__(self, **kwargs):
+ '''Class init
+
+ @param repo_settings: settings instance
+ @param qatracker: QATracker instance
+ '''
+ super(ThirdPartyMirrors, self).__init__(**kwargs)
+ repo_settings = kwargs.get('repo_settings')
+ self.qatracker = kwargs.get('qatracker')
+
+ # TODO: Build a regex instead here, for the SRC_URI.mirror
check.
+ self.thirdpartymirrors = {}
+ profile_thirdpartymirrors =
repo_settings.repoman_settings.thirdpartymirrors().items()
+ for mirror_alias, mirrors in profile_thirdpartymirrors:
+ for mirror in mirrors:
+ if not mirror.endswith("/"):
+
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/arches/
commit: 832cc1cc734858dec86c7041d8f5af2a29677a65
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 19:11:22 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Jan 23 01:27:30 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=832cc1cc
repoman: Create a new ArchChecks class plugin
pym/repoman/modules/scan/arches/__init__.py | 24 +++
pym/repoman/modules/scan/arches/arches.py | 64 +
pym/repoman/scanner.py | 47 +
3 files changed, 90 insertions(+), 45 deletions(-)
diff --git a/pym/repoman/modules/scan/arches/__init__.py
b/pym/repoman/modules/scan/arches/__init__.py
new file mode 100644
index 000..d080c30
--- /dev/null
+++ b/pym/repoman/modules/scan/arches/__init__.py
@@ -0,0 +1,24 @@
+# Copyright 2015-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+doc = """Arches plug-in module for repoman.
+Performs archs checks on ebuilds."""
+__doc__ = doc[:]
+
+
+module_spec = {
+ 'name': 'arches',
+ 'description': doc,
+ 'provides':{
+ 'archs-module': {
+ 'name': "arches",
+ 'sourcefile': "arches",
+ 'class': "ArchChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
+ }
+}
+
diff --git a/pym/repoman/modules/scan/arches/arches.py
b/pym/repoman/modules/scan/arches/arches.py
new file mode 100644
index 000..2c32028
--- /dev/null
+++ b/pym/repoman/modules/scan/arches/arches.py
@@ -0,0 +1,64 @@
+# -*- coding:utf-8 -*-
+
+
+class ArchChecks(object):
+
+ def __init__(self, **kwargs):
+ self.options = kwargs.get('options')
+ self.repo_settings = kwargs.get('repo_settings')
+ self.profiles = kwargs.get('profiles')
+
+ def check(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
+ if self.options.ignore_arches:
+ arches = [[
+ self.repo_settings.repoman_settings["ARCH"],
self.repo_settings.repoman_settings["ARCH"],
+
self.repo_settings.repoman_settings["ACCEPT_KEYWORDS"].split()]]
+ else:
+ arches = set()
+ for keyword in ebuild.keywords:
+ if keyword[0] == "-":
+ continue
+ elif keyword[0] == "~":
+ arch = keyword[1:]
+ if arch == "*":
+ for expanded_arch in
self.profiles:
+ if expanded_arch ==
"**":
+ continue
+ arches.add(
+ (keyword,
expanded_arch, (
+
expanded_arch, "~" + expanded_arch)))
+ else:
+ arches.add((keyword, arch,
(arch, keyword)))
+ else:
+ # For ebuilds with stable keywords,
check if the
+ # dependencies are satisfiable for
unstable
+ # configurations, since use.stable.mask
is not
+ # applied for unstable configurations
(see bug
+ # 563546).
+ if keyword == "*":
+ for expanded_arch in
self.profiles:
+ if expanded_arch ==
"**":
+ continue
+ arches.add(
+ (keyword,
expanded_arch, (expanded_arch,)))
+ arches.add(
+ (keyword,
expanded_arch,
+
(expanded_arch, "~" + expanded_arch)))
+ else:
+ arches.add((keyword, keyword,
(keyword,)))
+ arches.add((keyword, keyword,
+ (keyword, "~" +
keyword)))
+ if not arches:
+ # Use an emp
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/metadata/
commit: 0fdd06062e2436366619c91ffa4b2b155e334762
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 11:31:26 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Jan 23 01:30:34 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0fdd0606
scanner.py: Migrate another metadata check to ebuild_metadata
pym/repoman/modules/scan/metadata/ebuild_metadata.py | 3 +++
pym/repoman/scanner.py | 2 --
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pym/repoman/modules/scan/metadata/ebuild_metadata.py
b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
index 143a40e..2dc1db2 100644
--- a/pym/repoman/modules/scan/metadata/ebuild_metadata.py
+++ b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
@@ -28,6 +28,9 @@ class EbuildMetadata(object):
"%s: %s variable contains non-ASCII "
"character at position %s" %
(ebuild.relative_path, k, m.start() +
1))
+ if ebuild.metadata.get("PROVIDE"):
+ self.qatracker.add_error("virtual.oldstyle",
ebuild.relative_path)
+
return {'continue': False}
@property
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index e6a17cd..46f46f5 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -324,8 +324,6 @@ class Scanner(object):
if y_ebuild_continue:
continue
- if dynamic_data['ebuild'].metadata.get("PROVIDE"):
- self.qatracker.add_error("virtual.oldstyle",
dynamic_data['ebuild'].relative_path)
for pos, missing_var in enumerate(missingvars):
if not
dynamic_data['ebuild'].metadata.get(missing_var):
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/metadata/, pym/repoman/
commit: 2f2c6d6d06c42dff98bdf9950b1d1c14efb819c5
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 10:35:49 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Sat Jan 23 01:23:14 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2f2c6d6d
repoman: Migrate code from _scan_ebuilds to a new EbuildMetadata class and check
pym/repoman/modules/scan/metadata/__init__.py | 11 +-
.../modules/scan/metadata/ebuild_metadata.py | 39 ++
pym/repoman/scanner.py | 27 +--
3 files changed, 50 insertions(+), 27 deletions(-)
diff --git a/pym/repoman/modules/scan/metadata/__init__.py
b/pym/repoman/modules/scan/metadata/__init__.py
index ae9b18b..bacedf5 100644
--- a/pym/repoman/modules/scan/metadata/__init__.py
+++ b/pym/repoman/modules/scan/metadata/__init__.py
@@ -10,7 +10,7 @@ module_spec = {
'name': 'metadata',
'description': doc,
'provides':{
- 'metadata-module': {
+ 'pkg-metadata': {
'name': "pkgmetadata",
'sourcefile': "pkgmetadata",
'class': "PkgMetadata",
@@ -19,6 +19,15 @@ module_spec = {
'func_desc': {
},
},
+ 'ebuild-metadata': {
+ 'name': "ebuild_metadata",
+ 'sourcefile': "ebuild_metadata",
+ 'class': "EbuildMetadata",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
}
}
diff --git a/pym/repoman/modules/scan/metadata/ebuild_metadata.py
b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
new file mode 100644
index 000..143a40e
--- /dev/null
+++ b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
@@ -0,0 +1,39 @@
+# -*- coding:utf-8 -*-
+
+'''Ebuild Metadata Checks'''
+
+import re
+import sys
+
+if sys.hexversion >= 0x300:
+ basestring = str
+
+NON_ASCII_RE = re.compile(r'[^\x00-\x7f]')
+
+
+class EbuildMetadata(object):
+
+ def __init__(self, **kwargs):
+ self.qatracker = kwargs.get('qatracker')
+
+ def check(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
+ for k, v in ebuild.metadata.items():
+ if not isinstance(v, basestring):
+ continue
+ m = NON_ASCII_RE.search(v)
+ if m is not None:
+ self.qatracker.add_error(
+ "variable.invalidchar",
+ "%s: %s variable contains non-ASCII "
+ "character at position %s" %
+ (ebuild.relative_path, k, m.start() +
1))
+ return {'continue': False}
+
+ @property
+ def runInPkgs(self):
+ return (False, [])
+
+ @property
+ def runInEbuilds(self):
+ return (True, [self.check])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index a8aa2f3..6f3fb53 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -5,8 +5,6 @@ from __future__ import print_function, unicode_literals
import copy
import io
import logging
-import re
-import sys
from itertools import chain
from pprint import pformat
@@ -47,18 +45,10 @@ MODULE_CONTROLLER = Modules(path=MODULES_PATH,
namepath="repoman.modules.scan")
MODULE_NAMES = MODULE_CONTROLLER.module_names[:]
-
-if sys.hexversion >= 0x300:
- basestring = str
-
-NON_ASCII_RE = re.compile(r'[^\x00-\x7f]')
-
-
def sort_key(item):
return item[2].sub_path
-
class Scanner(object):
'''Primary scan class. Operates all the small Q/A tests and checks'''
@@ -311,7 +301,7 @@ class Scanner(object):
# initialize per ebuild plugin checks here
# need to set it up for ==> self.modules_list or some
other ordered list
for mod in [('ebuild', 'Ebuild'), ('live',
'LiveEclassChecks'),
- ('eapi', 'EAPIChecks')]:
+ ('eapi', 'EAPIChecks'), ('ebuild_metadata',
'EbuildMetadata')]:
if mod[0]:
mod_class =
MODULE_CONTROLLER.get_class(mod[0])
logging.debug("Initializing class name:
%s", mod_class.__name__)
@@ -338,21 +328,6 @@ class Scanner(object):
if y_ebuild_continue:
continue
-
- for k, v in dynamic_data['ebuild'].metadata.items():
- if not isinstance(v, basestring):
- continue
-
[gentoo-commits] repo/gentoo:master commit in: games-action/garden/, games-action/garden/files/
commit: cfaf2aad0f3fc6867c445bece6041adfcaa8377f
Author: Michael Sterrett gentoo org>
AuthorDate: Sat Jan 23 01:22:04 2016 +
Commit: Michael Sterrett gentoo org>
CommitDate: Sat Jan 23 01:24:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfaf2aad
games-action/garden: fix compile (bug #572648)
Package-Manager: portage-2.2.26
games-action/garden/files/garden-1.0.9-gcc52.patch | 20
games-action/garden/garden-1.0.9.ebuild| 7 +--
2 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/games-action/garden/files/garden-1.0.9-gcc52.patch
b/games-action/garden/files/garden-1.0.9-gcc52.patch
deleted file mode 100644
index 60f9272..000
--- a/games-action/garden/files/garden-1.0.9-gcc52.patch
+++ /dev/null
@@ -1,20 +0,0 @@
src/stuff.c.old2015-09-22 08:57:21.482794770 +0200
-+++ src/stuff.c2015-09-22 08:58:22.567815095 +0200
-@@ -52,7 +52,7 @@
- float cos_table[ANGLE_1];
- float sin_table[ANGLE_1];
-
--inline int xpart (int angle, int length);
-+extern inline int xpart (int angle, int length);
-
- void init_trig (void)
- {
-@@ -72,7 +72,7 @@
- return (cos_table[angle & 1023] * length);
- }
-
--inline int ypart (int angle, int length)
-+extern inline int ypart (int angle, int length)
- {
- return (sin_table[angle & 1023] * length);
- }
diff --git a/games-action/garden/garden-1.0.9.ebuild
b/games-action/garden/garden-1.0.9.ebuild
index 63eb620..39f6086 100644
--- a/games-action/garden/garden-1.0.9.ebuild
+++ b/games-action/garden/garden-1.0.9.ebuild
@@ -20,8 +20,11 @@ RDEPEND="${DEPEND}"
src_prepare() {
epatch \
"${FILESDIR}"/${P}-dash.patch \
- "${FILESDIR}"/${P}-resources.patch \
- "${FILESDIR}"/${P}-gcc52.patch
+ "${FILESDIR}"/${P}-resources.patch
+ # build with gcc52
+ sed -i \
+ -e 's/inline/extern inline/' \
+ src/stuff.h || die
eautoreconf
}
[gentoo-commits] repo/gentoo:master commit in: app-shells/gentoo-zsh-completions/
commit: 8e29ef257e0c590344fa82d411ac13cf47d6add9
Author: Tim Harder gentoo org>
AuthorDate: Sat Jan 23 00:04:42 2016 +
Commit: Tim Harder gentoo org>
CommitDate: Sat Jan 23 00:06:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e29ef25
app-shells/gentoo-zsh-completions: repo moved to the gentoo org
.../gentoo-zsh-completions/gentoo-zsh-completions-20150103.ebuild | 6 +++---
.../gentoo-zsh-completions/gentoo-zsh-completions-.ebuild | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20150103.ebuild
b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20150103.ebuild
index 28d8192..ab2b9c3 100644
--- a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20150103.ebuild
+++ b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20150103.ebuild
@@ -6,14 +6,14 @@ EAPI=5
if [[ ${PV} == * ]] ; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/radhermit/gentoo-zsh-completions.git";
+ EGIT_REPO_URI="https://github.com/gentoo/gentoo-zsh-completions.git";
else
- SRC_URI="https://github.com/radhermit/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
+ SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x86-macos ~sparc64-solaris"
fi
DESCRIPTION="Gentoo specific zsh completion support (includes emerge and
ebuild commands)"
-HOMEPAGE="https://github.com/radhermit/gentoo-zsh-completions";
+HOMEPAGE="https://github.com/gentoo/gentoo-zsh-completions";
LICENSE="ZSH"
SLOT="0"
diff --git
a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-.ebuild
b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-.ebuild
index fb16661..a340351 100644
--- a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-.ebuild
+++ b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-.ebuild
@@ -6,14 +6,14 @@ EAPI=5
if [[ ${PV} == * ]] ; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/radhermit/gentoo-zsh-completions.git";
+ EGIT_REPO_URI="https://github.com/gentoo/gentoo-zsh-completions.git";
else
- SRC_URI="https://github.com/radhermit/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
+ SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
~sparc64-solaris"
fi
DESCRIPTION="Gentoo specific zsh completion support (includes emerge and
ebuild commands)"
-HOMEPAGE="https://github.com/radhermit/gentoo-zsh-completions";
+HOMEPAGE="https://github.com/gentoo/gentoo-zsh-completions";
LICENSE="ZSH"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-sources/
commit: bbf26cc478c0d5a02dd634f410ae0b48d89153dd Author: Mike Pagano gentoo org> AuthorDate: Fri Jan 22 23:55:45 2016 + Commit: Mike Pagano gentoo org> CommitDate: Fri Jan 22 23:55:45 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbf26cc4 sys-kernel/gentoo-sources: Remove vulnerable versions Package-Manager: portage-2.2.26 sys-kernel/gentoo-sources/Manifest | 6 - .../gentoo-sources/gentoo-sources-3.14.57.ebuild | 29 -- .../gentoo-sources/gentoo-sources-3.14.58.ebuild | 29 -- 3 files changed, 64 deletions(-) diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest index 278b358..5f9eb11 100644 --- a/sys-kernel/gentoo-sources/Manifest +++ b/sys-kernel/gentoo-sources/Manifest @@ -24,12 +24,6 @@ DIST genpatches-3.12-49.extras.tar.xz 18232 SHA256 5800be892a1828498d914ca9315cc DIST genpatches-3.14-62.base.tar.xz 1104664 SHA256 d7790182dab0aba591fc5e9bed4f1dc4420a3b484ce3cf8af57769318d1a3229 SHA512 8cc76af4175f2e9d54ac1c7255b870df250ff3b28ac7000b32ce7b3348830f7072f13a8b25b0b6ab7fe49ca3ad5c6aeba62a899e43869a97677dfec017b32b02 WHIRLPOOL c77640e5fd36af50d78f49f00de79c2c986c99b8997d42c9a4888a0c6afc9f10833a87ec7acf5a4e228f483d35aeae9f767fb8f27fbfbfaa1b06d0443fc6d593 DIST genpatches-3.14-62.experimental.tar.xz 60300 SHA256 564892b993deadbb2d47f936d924d7d1e6891de329b5bd04d2b3ecb126690401 SHA512 942d099b41c4e041570e23ae97006fcc5c6dafefe42d9d694c373b9a5398ff5b7c20f58edc8d339a6ef56cce240cc47f07958f59208165233e39ab573f611717 WHIRLPOOL bd7f6519d20137f18e086871a8dfd7cd06ddd7b9170badee7a31496cb6fa0669723a433ef7c159e037c15b3f31ccf0744afe6a76cb680bf8e9a1faf6df14b842 DIST genpatches-3.14-62.extras.tar.xz 18252 SHA256 6702160c63ae9de7eb95279ffbe3e5b08fcc6d016803f18e3c09183f1ce309ba SHA512 8fe48eaecf72c257a6642a51dcabe8a0b76e5dd352dca0ff99ff4098db59151f622357beb14830aca7a7f16132b41f8b35d337933f38d8ce1c60531487b3d843 WHIRLPOOL e9e9790a84b432bb90b50e27a369cdd6777b5df67cc5175c4542ff6c15cb8ff7ba650b7046756dcade77742c595b8f9037f49c28e82ecb623742ed3073d74f1e -DIST genpatches-3.14-63.base.tar.xz 1110736 SHA256 430af952731acb738d0569465120f5a60f46a5dfcdba943705ca10ed56bcc4d4 SHA512 7dcca031f1c1d48094ce5cdda960f2b3f38aa1c6022929df2125a5581fcda84330ddf0f99fa00b4d3174be5dcbd24abb569ecdd3add0f3cfbc288409310b9dee WHIRLPOOL 0d46ff7f6960470fcf2019a17885c98f27422e9c406d0019d9cb51ca14a0f122e4c95699e07324c4bc30d3e7e538377c8c15976cc619d578d10f893a3d5af0b3 -DIST genpatches-3.14-63.experimental.tar.xz 60316 SHA256 60fcccec6ceec3080c0b76e12f204ba443a8bb92e22b9d3f3b72a86f9338ec87 SHA512 43c31320aace9aecf6064eb877fa21fa25a90355dccb63545edef91105ac69ea7316477ed4ff222b818a9f83e896466cac8dce872274c2fa9c851a144b7a2cd7 WHIRLPOOL 259a9a1d2e94f6f4de11e3712102d51496042ae92097a8714354bcabb70c794c45da63747d739d9f9cbe45e0b19aa7458f979c582b4c1c4e7d86ad979972b66d -DIST genpatches-3.14-63.extras.tar.xz 18260 SHA256 d85286f9101952e49f47bd8919449abf7984ba8d5ad1e1711c5e66912a127fef SHA512 10c2e2ce6b227b30404deeb0d01ab0407becd042fb7d462e351ed56d47f973a8710fb07428f7941f972e6c5ba516ca3663c7745898022d3246b35a1cf47165fa WHIRLPOOL 18fe9f3149066dadef9d56e25a15edb8728a8bfb8e1d1d492f46183f90c17ddb84f3065dedee25cb38997f987d6548989818298163f07aa34d3088f49370fe15 -DIST genpatches-3.14-64.base.tar.xz 1117320 SHA256 4ac5de230cb3174469273057203cc2463a2a16a776bacfa65bb922b7f33123dc SHA512 2170058710496275200c7d69e643451cb41578944e60b1cfca0761a4cf0de7f94db37a9f7b0f8880f4031a897d9c437a537e9ee36ad389d613106e98a4e3074c WHIRLPOOL 0fb3bc3d262b548499205a7797e85f8606e1f7682d1c4e8acc066ff10c69cb54478da4b014607c4aacd72e1a388d81117a91e913a9f73f2fc49de0cbda72 -DIST genpatches-3.14-64.experimental.tar.xz 60304 SHA256 dbd95c2e037084a85aed25e3669bffed7f94cc3052734e7954a43ecc3cd577e6 SHA512 9a53dd76dac497028907ed6cf17aade8675620e11bcba88a54f97db3b744123d634bc4d50c262f689e8e5026ec9716febd967461e91b775d0b2e1e53b5589c43 WHIRLPOOL 6fa792538577bf56cf21914c574359c91ba164c519ff0c6c5d10ac218b9c84d73fe017543ab2c5804d63240ce265556983cfd0907c0eae3d1124bb34919f0fc2 -DIST genpatches-3.14-64.extras.tar.xz 18252 SHA256 e6a4f086c0ffb45e5345bd18354c8bff4870f768843a3ce6ad671db99ce8d439 SHA512 ee7dbd7e9db3405cf6b0b55110cee4a7844732dc80b19ec6b76ae27b355fbca58500aa10745dcf8d91db080e67e091400d2c227a35fa3e2c838f1be91740f452 WHIRLPOOL a2c3f61a9191e7703bae7f0dc8bdfa81d349440aa5c2fd3b60456bb36464b35f601a6dc5ecf37552ddc1e8cdd77722c23224d6984b04312bd508ec7e1f264a44 DIST genpatches-3.14-65.base.tar.xz 1118344 SHA256 fdbaf042acdacca6c02b602638980ec661cbce979600391e94cca031d45ef6f2 SHA512 28bb3f51b5d0b45bc18d54fc04eb975a7c61bf5c28539cc6a6466bc22611ec3b91ecf5b9f79053082e3907e0980c2d97a1e22eb25e75157e4dc54ccf1d9a16bc WHIRLPOOL f776e32318fe8e4c468cacc907aa32554b74dac0f5a1ce785acb80a40b52643977c283b469d6d5ba895ead477f246e409a99d6e686cd3686b4b6ecaff4a97ef0 DIST genpatches-3.14-65.experimental.tar.xz 60300 SHA256 f0e047dc68af01750fc2b2cfb76
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-sources/
commit: e38d7d1cbceb6328f52c86d7c8b4d6188d00d903 Author: Mike Pagano gentoo org> AuthorDate: Fri Jan 22 23:53:11 2016 + Commit: Mike Pagano gentoo org> CommitDate: Fri Jan 22 23:53:11 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e38d7d1c sys-kernel/gentoo-sources: Remove vulnerable versions Package-Manager: portage-2.2.26 sys-kernel/gentoo-sources/Manifest | 9 --- .../gentoo-sources/gentoo-sources-4.3.0.ebuild | 31 -- .../gentoo-sources/gentoo-sources-4.3.2.ebuild | 31 -- .../gentoo-sources/gentoo-sources-4.3.3.ebuild | 31 -- 4 files changed, 102 deletions(-) diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest index 9bb98bf..278b358 100644 --- a/sys-kernel/gentoo-sources/Manifest +++ b/sys-kernel/gentoo-sources/Manifest @@ -50,15 +50,6 @@ DIST genpatches-4.1-16.extras.tar.xz 16176 SHA256 a6e00246f5e8feef952529d7be5110 DIST genpatches-4.1-20.base.tar.xz 452816 SHA256 74b7e3355fdd999b17ed0cd955a20551ddaa0cc4d8608f5b80d31f8059a79549 SHA512 fd2d6c1ce75c899254b944798d230144c25caa8e36103388fa4dd3aa1a1a9e310435b442535be13a933b16d1a142c125bd5e754fb4aa621573599c36b6ac4bfd WHIRLPOOL a22aa9175d0cdf315c345ab60655476b141a472c4ebe505838440402b1bd65802ab21e6ad897f7883bf2846b61b9b414b2f55af29ee9372ea30d62df3257fc73 DIST genpatches-4.1-20.experimental.tar.xz 61652 SHA256 155bbcf04d07d2b02523c9e64323f000ea24fa2b06d1472ceaf125e70e2ece25 SHA512 5f03d99b5c35384a158a2568516a41b9bfba8c373f1b004e1493bb2071b4de321b66ddd623bf71cd6fd85f4c3af1d2d45316dd3b2424b113f292ff4104e976c3 WHIRLPOOL ff6668b2f2301e34ba3a387a1216d8ab65f720acc6b2a6218f2d883c2ac0c1fa608e1cd0b07033eb6e114e4ae9a88ad7e3ef6ce7a4f6da8b241149ae08a8ec23 DIST genpatches-4.1-20.extras.tar.xz 16180 SHA256 8f44981c6574aedf1484c7e643cfa3dfc1362fdce415947382c77098082d34d7 SHA512 5ae28d62ece98e9f39b68e6ffbc205c3c7e47b9048a67e461f944f1b05e39de865973c11a4fa6dcf34dea65e2cf883f537be4aaf24c704ff311c0769c68a286a WHIRLPOOL 58c8389b43898e4700d81fd12496acbf954152e6879e0f2d0535686ebeded273032080569c18fd739a8e2c07c6b55f8fe58adc2ff21c436c33d20e2a8eed6fdf -DIST genpatches-4.3-1.base.tar.xz 3464 SHA256 7a4fa6450f306844cbe767c69e0f26cd9363803840e5147c27bc78fa1b20d739 SHA512 a37d673a6daf0956cd5a9284c1772112b726187b2e83293cf1c41b64988eeb3ed27be41394fa18b9ce2dc2c2f07a974f39d74a0d9de406d76d5c8e960bafbe94 WHIRLPOOL 95289c547af7c6ef0c2bf2af323782044c45191b1055e032aeff2652ee2d51779abcb2caea23634dbeaf375397ca4b9ec6b4bb11e3074cac37787b047db0e958 -DIST genpatches-4.3-1.experimental.tar.xz 4904 SHA256 e36a9856c8bef942c21f8211a23b54522cd270e98e7bb3facdd562f19e579a0a SHA512 1690d38ebdd12d9593931b6fe7467cfb3cbe160a65c955fa82fccce2a9f57b6818efb39ef01ce97274aa6c8d0596c2d651f293b67abba5556fba7c7495658cd1 WHIRLPOOL 42414daeecba5d9cbc1fe46a3e438c3ef82ebae317a38c9d8b78ad723376550dbf3b83b102a9a0f7f893ed624a62bfeb80a49566bf13803805ae3dd3050e5afe -DIST genpatches-4.3-1.extras.tar.xz 16288 SHA256 41cf40be254f6204a0dcfbb0051309bf506a9306e6c637058fc23dbecbe37c00 SHA512 6cedca7ab7e3971751077dbebb84d6cdd711600db7ea19a6e110ebc71a6281dc9db3d195b6f4e553bafd74d3dd1a252308c85e13de76879e3b6becd1b64ad2ff WHIRLPOOL 129068f0912b07e64b8087e90a4f8758673f89f61d9d6ff69962168ad183efe27f9a657bcac85e44db62ee690b86eadc131282200e9d657b47402b3bbc95b96b -DIST genpatches-4.3-3.base.tar.xz 42780 SHA256 61d6121205303e840e3eb29a2fc23be269f9aae7e8116012f476bff3d5d1a878 SHA512 be125ba6edd8731a8188478f5e463c2bb282654647b97c6e2190ae6183ebc380c53dd8f7324a5d2d6de207194bd1d9066ae611a40c93d6d74a5067aee37c98ca WHIRLPOOL 7f94a5bea46e661e12d1b0238233e94df6c6889397c7f5823283376f7a0587c41225c6c5d41caf1c04243f12d260cdf2b0aa8a3e8f0d95aae62328f524f3d1d2 -DIST genpatches-4.3-3.experimental.tar.xz 61640 SHA256 75f14ed604b7bf6acfe5cda34de34e76a27fe6f858ff45c33211b2086f174b9a SHA512 4f3b82c0fa96c4f27910692faff913d9480923c84658c0a7cad2553bb424da4d4fea7771455fb97942449c1e08a47d1e71faeb808941cc1859a72f6c92161e38 WHIRLPOOL f91c325499e18c516d1e6a950fafbb5782ec0c288009511f82975582c594aba7bb1eadbc63bb2ffc915e1591dc31243b2a3b4a4088ea1e01e0b5dc6381407e8d -DIST genpatches-4.3-3.extras.tar.xz 16284 SHA256 575fdbd65e2c4a607cecd55e5ddb9be421fb9d7e199196b26eb31ea0f8933dfc SHA512 15c2a8bccb48219f925fadf3111066e8ce862fefb755451a1beaef954abedf5629fdc27dc7c66eb20598110b30f5774ed8029826464dadbdd7b3c60cdce573b3 WHIRLPOOL 803bbecf109f122b06807a93efc7efb914853a5675e49d052c7dc1275a1266937593d8ec835fa49699b4cf46078a1e5cdb6efd18b9b7e36c1b240701a986d42f -DIST genpatches-4.3-4.base.tar.xz 75572 SHA256 c0c073f12a4f1c0adf9d3865fe5d16dc43ea0e5c95c0867868e16e57f2fd6235 SHA512 a16b75f8fcd868d6f9bc2b91318eb8b8ec4db2b622d244e750d4176c4e8225808751c543c54d768fbd88785da656e9f60d8ef8bc22672b5cb1038573c0c366e1 WHIRLPOOL 04c723b71f440035f57684088a47e83430f1c5b057951e037f128f3681f16669eca16f2f1b8d4b7be4a617420131277d1fe415503a679b83a081e06635df46e3 -DIST genpatches-4.3-4.experi
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-sources/
commit: 5267351890949c84b48e2a8e70fe72df407ca7fc Author: Mike Pagano gentoo org> AuthorDate: Fri Jan 22 23:50:32 2016 + Commit: Mike Pagano gentoo org> CommitDate: Fri Jan 22 23:50:32 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52673518 sys-kernel/gentoo-sources: Remove vulnerable versions Package-Manager: portage-2.2.26 sys-kernel/gentoo-sources/Manifest | 9 --- .../gentoo-sources/gentoo-sources-4.1.13.ebuild| 31 -- .../gentoo-sources/gentoo-sources-4.1.14.ebuild| 31 -- .../gentoo-sources/gentoo-sources-4.1.15.ebuild| 31 -- 4 files changed, 102 deletions(-) diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest index b6f1df0..9bb98bf 100644 --- a/sys-kernel/gentoo-sources/Manifest +++ b/sys-kernel/gentoo-sources/Manifest @@ -47,15 +47,6 @@ DIST genpatches-4.0-6.extras.tar.xz 16280 SHA256 205c87c3d133a57d6ca42e2ce107cf6 DIST genpatches-4.1-16.base.tar.xz 390916 SHA256 c36edc8f56a26e0ae74fa28e9a50d02d8196f5d29447d6d2cdbf17ad71f70902 SHA512 981c4589a2f448a8c58276590eae9db25e716e0df584f4e431e7d29e69714695078112e30b84179038879071dcb94adb0753a94bcc3cf3e4c3a676244543f0aa WHIRLPOOL 6f3bf0ec325a1d7363315fd7828da31901916c497cbb8adb212e515ee7fae1179f276116f9e484fb23f2200e2fa61ad315baa8de1c073c5412dd1ff3ce624cf9 DIST genpatches-4.1-16.experimental.tar.xz 215996 SHA256 0840ccdcad7c4b03cd4fd54940e3ca31d0d738184abe1c9340d5d0f9c3943009 SHA512 95b8bc22413b24627ac1906830a345689c7e98a77beb1405e9a6c5b97f48c4fa7dbd15a2ffe66f24ef9dd8617a83a4913a26acbcb387f4a0add6d5f37c3343a9 WHIRLPOOL b19fbda05c354c17df10a8fe3e482798926e6631c5b5f96685e2d99cc016f10c37fbe5aef633c8a77bc427d045b02390815469f5aa2850dd76d5cb374a916cc0 DIST genpatches-4.1-16.extras.tar.xz 16176 SHA256 a6e00246f5e8feef952529d7be51104657f0acfea1d17b5c7a1e9fd800bd62ee SHA512 0ec02e89fef967286851d8cc0bd8c6d908d0b72c79ef55da30747cc151878340c3c882f9e1067edff3476851f136032674180e58cbc46a6a48d9f501c28c4f56 WHIRLPOOL 0aa25106c9346d8ec2eb3ff56b315312a07363e36039efcce7d52b2e73eebf4c6ffba65dac45ee49a3b6b0ffab05ed42905a86f3e7ead3d6be7bd998e5dbf8b6 -DIST genpatches-4.1-17.base.tar.xz 411900 SHA256 a19b332a06c9486f38fa0397ddf16a107f524c8fda184a9ba3941d85e29d0f83 SHA512 32ce0d796844516cd27bfcb035ff791cbeb4c3b7cce5465268bf88a306dc1870145b6d5758fb7ef4d53acfb29bb4b8333b5b4ff7cef5a0711efea8ea11052121 WHIRLPOOL aae1f608d665f253fb106e25a51c884caa37f44961027e938daf323689c9c4b0c64071b4a7b4b6d3b07f51f2243a9b84e683aad4ea0fdcc04f09e0b97b65fb5b -DIST genpatches-4.1-17.experimental.tar.xz 61620 SHA256 104939e96a8be5483f61a25c716facaa88ae9c5169ea0d265c6758d4d681a339 SHA512 8c9994e556ef20252b59b6a534602b7964f8effc6428464a3463c58aecf0a7e3d93dd9138f89c6f8a8f8cebeb3f60f0df01c2c067fe4998066a42c6c8544a969 WHIRLPOOL 9d1f3a479b8e82597e0a7b2aafedbbbf16a767158134b3b7ead88d753d6723097eba0376930bb20465d84b21b0dd9e850d64fded278d98482b2b8498525f1499 -DIST genpatches-4.1-17.extras.tar.xz 16176 SHA256 755f880b1683ac915aa36739ee355fbdc00ceaa6a0843fb4a02f122008a2b33b SHA512 70151870af107d62095f2df0a8881e8934225fd70e5be1731f0a01856ffed61e3b284c20d04105c18a1302974b5bf39b01565ffd9a2338db91dea146b9b626d2 WHIRLPOOL 7250978f19dce490f21f84a27867465d0db195f3bd6b3619e84e591bb83e61d28e732ceef65d90cffc3878ab41eec10b17b6b1b15eaa68e5bf9745a877c4a537 -DIST genpatches-4.1-18.base.tar.xz 434312 SHA256 e039e095053deb5b21709c3277ffed00c44a8589bed2e2481f2a74de548ef00c SHA512 599f8e0fd53a59429a5dd8ddf29ff2673827068132c3aca43894a629f007ec58c9ce872b0a39e65c7222b420ef25fa1324d3c60b0c526fea4345c004c55e8b12 WHIRLPOOL dc7322d05e7fd4a10bd149b00510ebb636832571108c7b751b90a3d8bd9dec0af01b29f59ac5e984621d1f6dc085600c919b28e06eb3f1d287c6f3045e585610 -DIST genpatches-4.1-18.experimental.tar.xz 61640 SHA256 183ac4b1c8b8fa2b8986ee37920246955f05d8be48c8d59017c3821572d1da7a SHA512 65335da4b657248fb6ee035d3be189b4045a9b05d695f21082fae25f4bc071b065bca416c2e99f69ebccbd8d2dded542532edf41299f8e3b662465a78c23 WHIRLPOOL 0ddf13a2c3ea96b73380c95e8f5eac4a77c9936dca1e52828f7aa4c056c4a01b35df12e509239874e0af61ccb6c38ec21f25444eec4a35a609b72bd397218ac6 -DIST genpatches-4.1-18.extras.tar.xz 16180 SHA256 6c386d8e019d5ff811aaf2c75c14c819237e94df4f3cd7037e4e04a9660ce5ca SHA512 7e1239796426182271aaefbf3cf0afb14a0864f39cbc2a14105afbe137b347967035fe716d43bb31b75518b598f20c8523262564adef32b14564f60a1f9b3306 WHIRLPOOL 3906fc8c6565ce77c283dd125be18601043d74df0e0c498e9e542dd933d085201b20a4751c52eafa30fbb908baeed820b074e691fc4359f43c53ddc0eac6c401 -DIST genpatches-4.1-19.base.tar.xz 451948 SHA256 65c565a3659b0b1ce639aab4c37a45f1e1a2890d4bc7ca05507fe97a1def3c8f SHA512 595abfe560bf83a1809785f4e3c5885db73fab079cb9117669c1006baffb2657d8d0fb5ef2b2740396bcbd7e7296952fafbf9b665944e0ec6bb6fa300bc2e4e5 WHIRLPOOL 5295d5d7e5202cfd3c94c4e3b43a068aacd640d411a34c4a12098a16c854893f9c2d18969efc7d61e1b5951f376e57f402c70dbf3b85ef679940dce2f1dfc674 -DIST genpatches
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-sources/
commit: 3806a7ebf27e86790471814bcc70c348dc2ce218 Author: Mike Pagano gentoo org> AuthorDate: Fri Jan 22 23:49:08 2016 + Commit: Mike Pagano gentoo org> CommitDate: Fri Jan 22 23:49:08 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3806a7eb sys-kernel/gentoo-sources: Remove vulnerable versions Package-Manager: portage-2.2.26 sys-kernel/gentoo-sources/Manifest | 17 - .../gentoo-sources/gentoo-sources-3.18.21.ebuild | 29 -- .../gentoo-sources/gentoo-sources-3.18.22.ebuild | 29 -- .../gentoo-sources/gentoo-sources-3.18.23.ebuild | 29 -- .../gentoo-sources/gentoo-sources-3.18.24.ebuild | 29 -- .../gentoo-sources/gentoo-sources-3.18.25.ebuild | 29 -- 6 files changed, 162 deletions(-) diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest index 755067b..b6f1df0 100644 --- a/sys-kernel/gentoo-sources/Manifest +++ b/sys-kernel/gentoo-sources/Manifest @@ -1,6 +1,4 @@ -DIST deblob-3.18 127087 SHA256 c720eabb3911f8dfa4398c4250853df4633018abebc01a509ee4a283c3e00941 SHA512 6fe33762ba19aad7ff891b7b805cc26f6e2926f5e40c92fa45bc7f31bdeb5c8fc42b97e5d37d71b9422da239c7c54abd25f1fa2fa1e5733c6053abbf4c9e9011 WHIRLPOOL c351a3ae15c59081fca69c1b5d9b9de10f024eb01f1426722a0d6ccb7caa34330be42897cd85cf19b22ff876352b0cec1c19707edc81c4cb01ad9c1df2e3d831 DIST deblob-4.0 129952 SHA256 c3d8e9a9728d5c1fc11b1112f5343b14e46a8cf2880e10399a840bc94b6e2ad3 SHA512 055205394487dbc0022f9531fb76d0be51ca3ec4e119232cc0972790d1532c680e1367eb36a9f40529f0ab1d76f64240b1e8a07cb02d3605d594c06e3547f1bb WHIRLPOOL db32b66231e552ac6e3651152eb2b3212ef0863842cd352bd2f1b1080b9ea5543f1f7ed0e7958a9f4b115559233dc1817560e896c789378ea7b68b527b721ca8 -DIST deblob-check-3.18 654232 SHA256 30f22602b6ddf2cbccc16ef25fdc4d92755f3972e1c671d7cab8b9d6865eb155 SHA512 2cff9abef479a55dd6a0699371be8227ba63b18da1fb153d5df382e0a5e4f1b745b7de256a367a36efa9d12e2aad5622cc288efef009feebf81c108dbef4fe16 WHIRLPOOL e92927ad1565e80ce87e8bda372f8f7eb42bc0f47ad9b19fe5cf737903b2021fd6e3756e8d22b70f3037a46c254fec8b7285b37beb10795ccb4ca99d38876f8c DIST deblob-check-4.0 670921 SHA256 042b511913187672d9a0512765e662ba5d4283812ebebf424f778eb08fa359bc SHA512 a27e3530cd3028041445cf8c5f49ad7827a7cf2b511de28851d2b09c28347cf2be667a7494bd698939c007fb77595699c1f61fb76249ae87658e1d12e855d2a1 WHIRLPOOL 953d8e6eed10971ed67a4573449b9a536ad693a2130153a6fc7cc9ea3e2daea21ca002c8df80126f7e318f75bec82c3f6e99fe43155817e2e2a52b5949dc5d2d DIST genpatches-3.10-97.base.tar.xz 1299308 SHA256 d5407d2f91744519c407e1f74773e1861cf1ce46d82d5c035035a86e8189 SHA512 2a91d0772002a079691ba1c0810fd3ac38e4b893a4da28c53b62bba790d402e36389275dbbc8df6d0bd76634cdfc319a6221da2a1bf07abf0657fc419084d141 WHIRLPOOL b2a5a758695fdd6fa78926cd3eff3f7d3b074fb0d3ac35a51393662d6724f0abc2fd21647096a8a0a9805bde706314d085169ff10d8999af73d55934d4b66359 DIST genpatches-3.10-97.experimental.tar.xz 60148 SHA256 c0d7145c053c8165b8a0036c3d6d823300319ac7d7766d0c2c431b7f2f558a13 SHA512 b9d78f88ef57cd4ba43dec4b9dab1ea72c39947e1de5369060cb044b9d5eaa4ed81731d3f26280d5f7fb47d84c4c439c2024f870f5324bff09a32538fa15e072 WHIRLPOOL ca93d5351300ca4166b20021ed14c31ced9c9743fbdcc0b676a43c1853d3e868209fb747f31a0e1a9eb5f4dce8a9e3ae3299dfbb312a35e1459e268a8e300306 @@ -35,21 +33,6 @@ DIST genpatches-3.14-64.extras.tar.xz 18252 SHA256 e6a4f086c0ffb45e5345bd18354c8 DIST genpatches-3.14-65.base.tar.xz 1118344 SHA256 fdbaf042acdacca6c02b602638980ec661cbce979600391e94cca031d45ef6f2 SHA512 28bb3f51b5d0b45bc18d54fc04eb975a7c61bf5c28539cc6a6466bc22611ec3b91ecf5b9f79053082e3907e0980c2d97a1e22eb25e75157e4dc54ccf1d9a16bc WHIRLPOOL f776e32318fe8e4c468cacc907aa32554b74dac0f5a1ce785acb80a40b52643977c283b469d6d5ba895ead477f246e409a99d6e686cd3686b4b6ecaff4a97ef0 DIST genpatches-3.14-65.experimental.tar.xz 60300 SHA256 f0e047dc68af01750fc2b2cfb76694cecb391e4de657810b2de2a9092bbb0eeb SHA512 c2125a73aba4fe51c1efc6a73a86088964bff398c2409e256148d0f13e8106b56e6c8137e0943332be2524b3230f522e0b76b265d20ef075d852a5a3ca21edf0 WHIRLPOOL 5042375ab3541e65f609deb48a03d186b53d583b4512c27ece06130c0ac4fcebeb8256bf9cb38276720e8fc6610dc8663819ec5acd3bdcc57232a1d2082f25b5 DIST genpatches-3.14-65.extras.tar.xz 18256 SHA256 9220e49d4a95d876373ec40fae2e026bcd76efb5e33106bf2350026120b28244 SHA512 2699115a2a176a34570b1045f1ca6f5f23e46eb974c9c4953607919f7e5668e1b317b197cd39aa375347460110e9c67231b0315eddb9ed4d8fb631b453f802bf WHIRLPOOL ecb98ae1bca845efbd5dc32bfba31268bef55c73ad35092796c8c4d3661a72341e1a179833ef76d701ede477b9d436a2c45c16ca9b2bc23bec413e0186848285 -DIST genpatches-3.18-21.base.tar.xz 632956 SHA256 f657997b05dc52e215c22fde16cb227895d072ac2716d25481654849a9e373f1 SHA512 f1dac401caf1cd6282fc47670ad9e3540855542d7eee77f27231bdb9679d3da07b7b09f675ce5998aa777024817546ba8747c7d75aa45cbeb2789dbabf5c5602 WHIRLPOOL 26d19e9302ffd72123c897f7012
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-sources/
commit: 2a7f324303735814422cdbeee4068a3fe3b5bf67 Author: Mike Pagano gentoo org> AuthorDate: Fri Jan 22 23:46:10 2016 + Commit: Mike Pagano gentoo org> CommitDate: Fri Jan 22 23:46:47 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a7f3243 sys-kernel/gentoo-sources: Remove old, unsupported and vulnerable kernel. Package-Manager: portage-2.2.26 sys-kernel/gentoo-sources/Manifest | 16 --- .../gentoo-sources/gentoo-sources-4.2.4.ebuild | 31 -- .../gentoo-sources/gentoo-sources-4.2.5.ebuild | 31 -- .../gentoo-sources/gentoo-sources-4.2.6.ebuild | 31 -- .../gentoo-sources/gentoo-sources-4.2.7.ebuild | 31 -- .../gentoo-sources/gentoo-sources-4.2.8.ebuild | 31 -- 6 files changed, 171 deletions(-) diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest index a1cf740..755067b 100644 --- a/sys-kernel/gentoo-sources/Manifest +++ b/sys-kernel/gentoo-sources/Manifest @@ -76,21 +76,6 @@ DIST genpatches-4.1-19.extras.tar.xz 16188 SHA256 d88c39902511c8bd0e4b80761bef8d DIST genpatches-4.1-20.base.tar.xz 452816 SHA256 74b7e3355fdd999b17ed0cd955a20551ddaa0cc4d8608f5b80d31f8059a79549 SHA512 fd2d6c1ce75c899254b944798d230144c25caa8e36103388fa4dd3aa1a1a9e310435b442535be13a933b16d1a142c125bd5e754fb4aa621573599c36b6ac4bfd WHIRLPOOL a22aa9175d0cdf315c345ab60655476b141a472c4ebe505838440402b1bd65802ab21e6ad897f7883bf2846b61b9b414b2f55af29ee9372ea30d62df3257fc73 DIST genpatches-4.1-20.experimental.tar.xz 61652 SHA256 155bbcf04d07d2b02523c9e64323f000ea24fa2b06d1472ceaf125e70e2ece25 SHA512 5f03d99b5c35384a158a2568516a41b9bfba8c373f1b004e1493bb2071b4de321b66ddd623bf71cd6fd85f4c3af1d2d45316dd3b2424b113f292ff4104e976c3 WHIRLPOOL ff6668b2f2301e34ba3a387a1216d8ab65f720acc6b2a6218f2d883c2ac0c1fa608e1cd0b07033eb6e114e4ae9a88ad7e3ef6ce7a4f6da8b241149ae08a8ec23 DIST genpatches-4.1-20.extras.tar.xz 16180 SHA256 8f44981c6574aedf1484c7e643cfa3dfc1362fdce415947382c77098082d34d7 SHA512 5ae28d62ece98e9f39b68e6ffbc205c3c7e47b9048a67e461f944f1b05e39de865973c11a4fa6dcf34dea65e2cf883f537be4aaf24c704ff311c0769c68a286a WHIRLPOOL 58c8389b43898e4700d81fd12496acbf954152e6879e0f2d0535686ebeded273032080569c18fd739a8e2c07c6b55f8fe58adc2ff21c436c33d20e2a8eed6fdf -DIST genpatches-4.2-10.base.tar.xz 248292 SHA256 8eb6bba57faabfba57c4415b145300c9fb7b96e9aebcb0dcde7b18aa447dc725 SHA512 0f449d0bc29102ea25fd695508fe17ce8258c216d454777d642727f2eb2f1042acde47bd52bcfabed296d4fc3d0fe3bcb080e5bde5077b1e0879b1651e7f9ffe WHIRLPOOL 3d07c16cc43de6237d6fee0af2bed8d3dae0c8e688d255a48f54b7b6a293ec9eb9658168120c18226079e1e2ca4ecff30b681ea326dcf9b434b2642c3910e16f -DIST genpatches-4.2-10.experimental.tar.xz 61620 SHA256 e3f6a3d33552281f012456a580cc1e624cb8acdf33f28bc07231319fe3db4dd2 SHA512 d72a6d135b36dbb2e665a537a8d9e31b6fae2cda68aca32532a1e6ea249da88bcbc4b9f853e62ca4f8b58c78a4f242d7fe96ff673f3a881091112a35868f1dff WHIRLPOOL 634df2eefc154eca49e8d15aa286ce79941a4193bba4534dcd6340419993e428351562c7e17e8b19a1c47bd53a9a31485952e035061c8b1b5a594cf477dc -DIST genpatches-4.2-10.extras.tar.xz 16180 SHA256 6c386d8e019d5ff811aaf2c75c14c819237e94df4f3cd7037e4e04a9660ce5ca SHA512 7e1239796426182271aaefbf3cf0afb14a0864f39cbc2a14105afbe137b347967035fe716d43bb31b75518b598f20c8523262564adef32b14564f60a1f9b3306 WHIRLPOOL 3906fc8c6565ce77c283dd125be18601043d74df0e0c498e9e542dd933d085201b20a4751c52eafa30fbb908baeed820b074e691fc4359f43c53ddc0eac6c401 -DIST genpatches-4.2-11.base.tar.xz 274904 SHA256 0407b8f542450e6c1a0af439b04b6fdb9668efbfb6a70da08fc08917b543b9a3 SHA512 ec4f0bc1a53ad19329ccd3000968eadfc9411ef890e8a342c5810ad1a1abdda430354f85d3fa4a158d330023dff3ec9a02f8228720d5a339806eb9374ec4 WHIRLPOOL 375134e742a18d874212a084cb949daddbf2cb833f8480857a1c65897845e6c8cc88761a4f3bf8858081dc5131710ce1bbe2316134888ba970eb0b98f51d3e24 -DIST genpatches-4.2-11.experimental.tar.xz 61620 SHA256 10111c0a06a30d661b90af17c5d50ce1ae533f55e419d253109a4a313c31121b SHA512 ecdb6aa5a53599d427f38915fb6f8955ee0dd9e9b3744de01e5eaa073e890124e6096cde67596dc853877cf39b227c8115605a71c40665d689febb02f6d193c0 WHIRLPOOL 4fcfc1aa68a6d95a3d3a91ed3d6b47308e17c433b95b0cc2bddfdf5e3dd394f5dd089b66145a4f853300cd18a6bce42e166fcec4ca1fd5a15b77724d99379dba -DIST genpatches-4.2-11.extras.tar.xz 16188 SHA256 d88c39902511c8bd0e4b80761bef8d85471f08cdea3b7eec3c7e57e63fb4d33a SHA512 83ed872b30caf21f5cbeac892cf00b7633b2957708aa40d1e92b9c7b47c0e1eb72c8a3fd7c8711de3b1c1f9e39699c8d85df93c6db0165a8e8df6d2380fd5792 WHIRLPOOL 7a2deb7718ec4ecdf44fe4e810c973b6d3bf153a9a244bb5b7b5882212a3134f893460f0665a5c655f7ce73a3e90cfc63c8d2cc5c2a502706b5d35f1884899d3 -DIST genpatches-4.2-7.base.tar.xz 177852 SHA256 7f7528ef582219a6d5aee348b09c8523f7b6d5b80eed2d7c6d0a804dffb11440 SHA512 657a7316aaf139820898f0136f5eb0011d38a439f55257567c70074f65f78ab67b316132fa0cf3a19990c8decc49ebf13ed8b4be
[gentoo-commits] repo/gentoo:master commit in: dev-go/go-tools/
commit: 2ead2b6100c93033dbd0f634371d04fbf782bace
Author: Zac Medico gentoo org>
AuthorDate: Fri Jan 22 23:44:09 2016 +
Commit: Zac Medico gentoo org>
CommitDate: Fri Jan 22 23:44:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ead2b61
dev-go/go-tools: fix "tipgodoc does not exist" error (bug 572650)
Package-Manager: portage-2.2.26
dev-go/go-tools/go-tools-0_pre20160121.ebuild | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/dev-go/go-tools/go-tools-0_pre20160121.ebuild
b/dev-go/go-tools/go-tools-0_pre20160121.ebuild
index a2030fb..381504a 100644
--- a/dev-go/go-tools/go-tools-0_pre20160121.ebuild
+++ b/dev-go/go-tools/go-tools-0_pre20160121.ebuild
@@ -98,7 +98,16 @@ src_install() {
# bug 558818: install binaries in $GOROOT/bin to avoid file collisions
exeinto "$(go env GOROOT)/bin"
- doexe bin/* "${T}/goroot/bin/godoc" "${T}/gopath/bin/tipgodoc"
+ doexe bin/* "${T}/goroot/bin/godoc"
+ # Since tipgodoc has been known to be installed in either
+ # GOROOT or GOPATH, handle either case (bug 572650). It likely
+ # depends on what is currently installed, as is often the case
+ # for weird issues like this with go.
+ if [[ -e ${T}/gopath/bin/tipgodoc ]]; then
+ doexe "${T}/gopath/bin/tipgodoc"
+ else
+ doexe "${T}/goroot/bin/tipgodoc"
+ fi
dodir /usr/bin
ln "${ED}$(go env GOROOT)/bin/godoc" "${ED}usr/bin/godoc" || die
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-sources/
commit: fbbd1c6e57da271e9645baf70bd853ab03aa5dd2 Author: Mikle Kolyada gentoo org> AuthorDate: Fri Jan 22 23:16:41 2016 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri Jan 22 23:16:41 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbbd1c6e sys-kernel/gentoo-sources: amd64 stable wrt bug 572384 Package-Manager: portage-2.2.26 sys-kernel/gentoo-sources/gentoo-sources-3.12.52-r1.ebuild | 2 +- sys-kernel/gentoo-sources/gentoo-sources-3.14.58-r1.ebuild | 2 +- sys-kernel/gentoo-sources/gentoo-sources-3.18.25-r1.ebuild | 2 +- sys-kernel/gentoo-sources/gentoo-sources-4.1.15-r1.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.12.52-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.52-r1.ebuild index 20eaec8..ef8e546 100644 --- a/sys-kernel/gentoo-sources/gentoo-sources-3.12.52-r1.ebuild +++ b/sys-kernel/gentoo-sources/gentoo-sources-3.12.52-r1.ebuild @@ -11,7 +11,7 @@ inherit kernel-2 detect_version detect_arch -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"; IUSE="experimental" diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.14.58-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.14.58-r1.ebuild index 075a5cc..5358760 100644 --- a/sys-kernel/gentoo-sources/gentoo-sources-3.14.58-r1.ebuild +++ b/sys-kernel/gentoo-sources/gentoo-sources-3.14.58-r1.ebuild @@ -11,7 +11,7 @@ inherit kernel-2 detect_version detect_arch -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"; IUSE="experimental" diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.18.25-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.18.25-r1.ebuild index 9791666..bfedc76 100644 --- a/sys-kernel/gentoo-sources/gentoo-sources-3.18.25-r1.ebuild +++ b/sys-kernel/gentoo-sources/gentoo-sources-3.18.25-r1.ebuild @@ -11,7 +11,7 @@ inherit kernel-2 detect_version detect_arch -KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"; IUSE="experimental" diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.1.15-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.1.15-r1.ebuild index 0537496..83f6236 100644 --- a/sys-kernel/gentoo-sources/gentoo-sources-4.1.15-r1.ebuild +++ b/sys-kernel/gentoo-sources/gentoo-sources-4.1.15-r1.ebuild @@ -13,7 +13,7 @@ inherit kernel-2 detect_version detect_arch -KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"; IUSE="experimental"
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/testpack/, dev-haskell/testpack/files/
commit: c9784dc6bf642e0da6d3a0815811bdf530bb6dba
Author: Sergei Trofimovich gentoo org>
AuthorDate: Fri Jan 22 23:09:24 2016 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Fri Jan 22 23:10:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9784dc6
dev-haskell/testpack: tweak for QC-2.8.2
Package-Manager: portage-2.2.27
dev-haskell/testpack/files/testpack-2.1.3.0-QC-2.8.2.patch | 12
dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild| 1 +
2 files changed, 13 insertions(+)
diff --git a/dev-haskell/testpack/files/testpack-2.1.3.0-QC-2.8.2.patch
b/dev-haskell/testpack/files/testpack-2.1.3.0-QC-2.8.2.patch
new file mode 100644
index 000..9ea5f8d
--- /dev/null
+++ b/dev-haskell/testpack/files/testpack-2.1.3.0-QC-2.8.2.patch
@@ -0,0 +1,12 @@
+diff --git a/src/Test/QuickCheck/Instances.hs
b/src/Test/QuickCheck/Instances.hs
+index 98367b7..f65eb37 100644
+--- a/src/Test/QuickCheck/Instances.hs
b/src/Test/QuickCheck/Instances.hs
+@@ -30,2 +30,3 @@ import Data.Word
+
++#if ! MIN_VERSION_QuickCheck(2,8,2)
+ instance (Arbitrary k, Arbitrary v, Eq k, Ord k) => Arbitrary (Map.Map k v)
where
+@@ -37,2 +38,3 @@ instance (CoArbitrary k, CoArbitrary v, Eq k, Ord k) =>
CoArbitrary (Map.Map k v
+ coarbitrary = coarbitrary . Map.keys
++#endif
+
diff --git a/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild
b/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild
index 7168eb3..d5f79b5 100644
--- a/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild
+++ b/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild
@@ -31,4 +31,5 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}"/${P}-qc28.patch
epatch "${FILESDIR}"/${P}-HUnit-1.3.patch
+ epatch "${FILESDIR}"/${P}-QC-2.8.2.patch
}
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtmultimedia/, dev-qt/qtmultimedia/files/
commit: 46fa9a3fbb5f9727a44ac42c5ac6e82725446e3e
Author: Davide Pesavento gentoo org>
AuthorDate: Fri Jan 22 22:47:47 2016 +
Commit: Davide Pesavento gentoo org>
CommitDate: Fri Jan 22 22:49:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46fa9a3f
dev-qt/qtmultimedia: backport alsa detection patch to Qt4
Gentoo-Bug: 572426
Package-Manager: portage-2.2.27
...4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch | 155 +
dev-qt/qtmultimedia/qtmultimedia-4.8.6-r1.ebuild | 3 +-
dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild | 1 +
3 files changed, 158 insertions(+), 1 deletion(-)
diff --git
a/dev-qt/qtmultimedia/files/qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch
b/dev-qt/qtmultimedia/files/qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch
new file mode 100644
index 000..6a040b2
--- /dev/null
+++
b/dev-qt/qtmultimedia/files/qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch
@@ -0,0 +1,155 @@
+From 7737e5f851fdf33ea3e8e60cf7856f47565f09d3 Mon Sep 17 00:00:00 2001
+From: Davide Pesavento
+Date: Fri, 22 Jan 2016 23:17:16 +0100
+Subject: [PATCH] Relax ALSA version checks for alsa-lib >= 1.1.0
+
+Backport of qtmultimedia/3b322323d036ae2fc9f685bfc74d1ebcd5532159
+---
+ config.tests/unix/alsa/alsatest.cpp | 2 +-
+ src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp | 16
+ src/multimedia/audio/qaudiodeviceinfo_alsa_p.h | 2 +-
+ src/multimedia/audio/qaudioinput_alsa_p.cpp | 4 ++--
+ src/multimedia/audio/qaudiooutput_alsa_p.cpp | 4 ++--
+ 5 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/config.tests/unix/alsa/alsatest.cpp
b/config.tests/unix/alsa/alsatest.cpp
+index ac5f1e1..8d78f95 100644
+--- a/config.tests/unix/alsa/alsatest.cpp
b/config.tests/unix/alsa/alsatest.cpp
+@@ -40,7 +40,7 @@
+ /
+
+ #include
+-#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
++#if (!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10)))
+ #error "Alsa version found too old, require >= 1.0.10"
+ #endif
+
+diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
+index 973cbab..a09dcf6 100644
+--- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
+@@ -63,7 +63,7 @@
QAudioDeviceInfoInternal::QAudioDeviceInfoInternal(QByteArray dev, QAudio::Mode
+ device = QLatin1String(dev);
+ this->mode = mode;
+
+-#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+ checkSurround();
+ #endif
+ }
+@@ -159,13 +159,13 @@ bool QAudioDeviceInfoInternal::open()
+ QList devices = availableDevices(mode);
+
+ if(dev.compare(QLatin1String("default")) == 0) {
+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+ dev = QLatin1String(devices.first().constData());
+ #else
+ dev = QLatin1String("hw:0,0");
+ #endif
+ } else {
+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+ dev = device;
+ #else
+ int idx = 0;
+@@ -212,13 +212,13 @@ bool QAudioDeviceInfoInternal::testSettings(const
QAudioFormat& format) const
+ QList devices =
QAudioDeviceInfoInternal::availableDevices(QAudio::AudioOutput);
+
+ if(dev.compare(QLatin1String("default")) == 0) {
+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+ dev = QLatin1String(devices.first().constData());
+ #else
+ dev = QLatin1String("hw:0,0");
+ #endif
+ } else {
+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+ dev = device;
+ #else
+ int idx = 0;
+@@ -396,7 +396,7 @@ void QAudioDeviceInfoInternal::updateLists()
+ }
+ channelz.append(1);
+ channelz.append(2);
+-#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+ if (surround40) channelz.append(4);
+ if (surround51) channelz.append(6);
+ if (surround71) channelz.append(8);
+@@ -419,7 +419,7 @@ QList
QAudioDeviceInfoInternal::availableDevices(QAudio::Mode mode)
+ QList devices;
+ QByteArray filter;
+
+-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
+ // Create a list of all current audio devices that support mode
+ void **hints, **n;
[gentoo-commits] repo/gentoo:master commit in: www-client/vivaldi/
commit: 7f3e38974487457e0f29fae7a25439137c601bea
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Jan 22 22:44:20 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Jan 22 22:44:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f3e3897
www-client/vivaldi: Version bump.
Package-Manager: portage-2.2.27
www-client/vivaldi/Manifest | 2 +
www-client/vivaldi/vivaldi-1.0.377.10_p1.ebuild | 109
2 files changed, 111 insertions(+)
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 17508ba..aab2daa 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -2,3 +2,5 @@ DIST vivaldi-1.0.365.3_p1-amd64.deb 43086610 SHA256
85c7eb864a9253760af6effcaab6
DIST vivaldi-1.0.365.3_p1-i386.deb 43656870 SHA256
d06b25fa23815749e326d91f5a226b2688c0a607c8896747aa7571fd0fe6bb8a SHA512
9b7c3807946d546497f7330eeb00ece77c0d1433e24a2ddade837c85d3ddff47b3a225c638f8bc69844ad95e5654a25a182c3fd6f36de44581b0518efed84f3c
WHIRLPOOL
31e711dd966f81dd7d4cdb661c2df09c1b629256afa2f8134565c0d7e5e122e6e6dfdfd5b2c85d39c086e5f487f04d797c619234a174f76a71942ac8cefa61ab
DIST vivaldi-1.0.375.3_p1-amd64.deb 45034430 SHA256
4789eb4d4c286a9b187cb556b144b5d3b7287864edced3c94b760b744da18057 SHA512
edc4658406da37d9d7337206609694282e0d905f77c6336e6be75134333834f9841e81ccb8398e7f7ccd8b4c979949ec8ac5ceff963e5875c6c4d89d76f41a2a
WHIRLPOOL
efbc45279364face1ce122ff30ba1bfe5a93965d0e3dea7af7666ac29e9d77a211ae8f67d598cf5dbe9c4a8429d8733c14d246a730d2208afb9935f6176727b8
DIST vivaldi-1.0.375.3_p1-i386.deb 45538444 SHA256
d182435fcbb94e63590a71315a02cb47b14d3a34416b268b88defa283ec8d6af SHA512
7796fbdef89bf017a46a16892f1f79205f3c20a94ffb9cc743c8c70fb61c5385ce217f4244ec4fe6e515fefbf0ae5bb734e0f76649e54f3c5a26437e3dd67cd5
WHIRLPOOL
50f86a0760223b5eddb13bc6c62a9070c6edc91714bb20c8ca9c05f9fc9d223cb787782f4060910522ef58a5282009c2462da3277d626034ea4d73157a967171
+DIST vivaldi-1.0.377.10_p1-amd64.deb 44007696 SHA256
01f3994438454e951bbde79bf337f4b35730cd47f02493ac547f1257a41db01e SHA512
41be0a6dfa036f13e69f08db6d7e99f4d7bceda8faed21bf5ef4c831796df574ddaf893b356b8a41d0fea6137c223538468a9253a54d9071400c72483490d7ef
WHIRLPOOL
1441989abb20e535732f53cf522781db930f251ea2d0113fc8df251dfccd0142c9f8e37febb68045348976470934974d32f8b05a60bfd154e863b70960ac2b9b
+DIST vivaldi-1.0.377.10_p1-i386.deb 44514502 SHA256
9bc9ff3de9c761c7011575831339a2463678cec605425e5f11aad22bf8f6234e SHA512
0203b8ba3c3b2b06d2b42fbc01dd2498bd3a7e8f55a3f2476e4adfd2d436a7be4ba75db3df3aab2765a812b4544087e731100e54f337169341589d779e53
WHIRLPOOL
d69fa5273b8fe65b4aba7b651e0b0f255b810e5941e86e771b8cbb195df1ba78c1e5257b6c7fcb867127ddcdb8989fe16d149f5ef1f1967845795c449407069a
diff --git a/www-client/vivaldi/vivaldi-1.0.377.10_p1.ebuild
b/www-client/vivaldi/vivaldi-1.0.377.10_p1.ebuild
new file mode 100644
index 000..f985379
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-1.0.377.10_p1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CHROMIUM_LANGS="
+ am ar bg bn ca cs da de el en_GB en_US es_419 es et fa fil fi fr gu he
hi
+ hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
sv
+ sw ta te th tr uk vi zh_CN zh_TW
+"
+inherit chromium eutils multilib unpacker toolchain-funcs
+
+DESCRIPTION="A new browser for our friends"
+HOMEPAGE="http://vivaldi.com/";
+VIVALDI_BASE_URI="${HOMEPAGE}download/snapshot/${PN}-snapshot_${PV/_p/-}_"
+SRC_URI="
+ amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+ x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="bindist mirror"
+
+S=${WORKDIR}
+
+RDEPEND="
+ dev-libs/expat
+ dev-libs/glib:2
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/openssl-1.0.1:0
+ gnome-base/gconf:2
+ media-libs/alsa-lib
+ media-libs/fontconfig
+ media-libs/freetype
+ net-misc/curl
+ net-print/cups
+ sys-apps/dbus
+ sys-libs/libcap
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+VIVALDI_HOME="opt/${PN}-snapshot"
+
+src_unpack() {
+ unpack_deb ${A}
+}
+
+src_prepare() {
+ sed -i \
+ -e "s|@LIBDIR@|$(get_libdir)|g" \
+ opt/vivaldi-snapshot/vivaldi-snapshot || die
+
+ sed -i \
+ -e 's|vivaldi-snapshot|vivaldi|g' \
+ usr/share/applications/${PN}-snapshot.desktop \
+
[gentoo-commits] repo/gentoo:master commit in: dev-lang/rust-bin/
commit: f52c26f2e20d18e6705ff5b7b748431ecbb1522b
Author: Jauhien Piatlicki gentoo org>
AuthorDate: Fri Jan 22 22:16:49 2016 +
Commit: Jauhien Piatlicki gentoo org>
CommitDate: Fri Jan 22 22:18:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f52c26f2
dev-lang/rust-bin: version bump
Thanks to Heather
Package-Manager: portage-2.2.26
dev-lang/rust-bin/Manifest | 2 +
dev-lang/rust-bin/rust-bin-1.6.0.ebuild | 102
2 files changed, 104 insertions(+)
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 796530a..ce30c16 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -1,5 +1,7 @@
DIST rust-1.5.0-i686-unknown-linux-gnu.tar.gz 97897323 SHA256
ee45a91c5b1b3542fc349c743667216dec52ea924166ced90675500baf2c42cd SHA512
1fdbb197fc2f28c846da2099e5c671fd165236a0e611eadd9faf07cdd8a3312f0085d992e97da1f97e1e10fb3d9f4d06215208242349a7d7857008d003495eb2
WHIRLPOOL
d3a4dd5e002cd85d71648822274e8d4e1085618c38efdda602ab2afe647ad0415360c84fd18a5e1cda544ae54d18daa3a6e6ecd92b7529fb5263a8edcd3577c3
DIST rust-1.5.0-x86_64-unknown-linux-gnu.tar.gz 97177085 SHA256
60b83f74d882ce2ba5bc979b5b0589dca56659f215b3259e7188fed8c50aac9d SHA512
2ccb6fcb7479ce6d7a5c9a55b3dde7dacc723012a8d8065f431492c7060aeb3dcf3c5df120a583aa890c659b08cbd9cb6df0846e936fdb808afb5efb2410e3b6
WHIRLPOOL
bd20965ba143ef95ea7da378f8b312bc1f6340635fcbc9ef8c351bf2f5488825d4f96f3b43d5f88dba8587273ea73586e69c5f5adaf88f32fe01f5ffe5100abb
+DIST rust-1.6.0-i686-unknown-linux-gnu.tar.gz 99521439 SHA256
4d46ab71e057c66ff6805e5935038371b661aae908bb907d65cedc112bbaa109 SHA512
473a3e946b9d650f157c3eedb926b6f6c657a7116d8c7173417e6ad065f8f504548992eb2f1c0a10f3033d06520da54dba780aabc1921bb264f7b85bc1c416ad
WHIRLPOOL
ca8ccb07a7c60d0217ddb3a3082d8a0ee99ae7c048f603f3d3fbcd6fc24c8ab959de98e85967bb69a457d37e51677dede4672b6b13502601be105b6e7c1dc2dc
+DIST rust-1.6.0-x86_64-unknown-linux-gnu.tar.gz 98645290 SHA256
8630cc02432b4423d64eeae4ef071ec58e5dd1f3d555a3a3cc34b759202813f6 SHA512
6b627631334775d224ed2c4b359776a680219dc03851d1bcd11655fa6626144b1ae31ceeed4d93317104ae4bf65e9d18ad833da162b50b65c607437ff6b75f6d
WHIRLPOOL
860d09251da13df779f883a56b2bdc96170222ee2a241627845307f905dd2d9eb67bd0ca39f1d00508b5349ad70772ff38ee17d7e54e4a8e6e65e295fe23e9fe
DIST rustc-1.2.0-i686-unknown-linux-gnu.tar.gz 89840371 SHA256
f4c1692479314d63ee67914ec2065778c39ca4912f191a7894caf5264802b4fa SHA512
c89e6fac05c79755db7c15a275ac2a11d781fda10f6851ff13f0dce314f9a373bd5b79d0e1da0780071ce959693d4f08c33e3d18abbabe802922679d1e25a6b6
WHIRLPOOL
56c0636ecdc745fcdb41b77037486ba04c11b6a08568a0ada962687ead31bbd2c8f360894e629428fde4e5e3204d355e402d4a3651c4b13d0422e16beaec9f60
DIST rustc-1.2.0-x86_64-unknown-linux-gnu.tar.gz 8977 SHA256
32fb262ba9da26a6d5ad9b2ca420fb56d97af8f86acb5cda2e85b7e7c33f6dcc SHA512
ea87a2c0e05d3f7e7c738320fd08b53055f76703526846b87b885e7abbd320b2f393b9328daa1ca04e9cb545e906c5750b6dcede2ede23323aeab8a8b096ccfd
WHIRLPOOL
e82ed578218ce19b4a7ca5b9d4c842c5546b5daa6aa3be162393fc0ca7148cf245bb7a79719b10ea7bf43952f8908a6355eea9070f027fcd5f1d70caa37c9931
DIST rustc-1.3.0-i686-unknown-linux-gnu.tar.gz 90445379 SHA256
7a3add3d229047bc68b929ba7b5f5d5796333f29e160c18c2a0ff24f643fab6b SHA512
afd001c1c285f12c13c0a9ecf0788f47ab72f069c1e1c5ec568973691ef2223c075fb99324e8245012e8a21003ea4fc63d874de99b95065aa9d09081798e09d5
WHIRLPOOL
d273387d6eea540bf3a4bff96b5f754537ed265348661d412d37280f6d89fc726ed46fa03995b26eb444ac18e6c41f07d23c3c6844c7aaa00d2cc3970bad2f40
diff --git a/dev-lang/rust-bin/rust-bin-1.6.0.ebuild
b/dev-lang/rust-bin/rust-bin-1.6.0.ebuild
new file mode 100644
index 000..aef5ebe
--- /dev/null
+++ b/dev-lang/rust-bin/rust-bin-1.6.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils bash-completion-r1
+
+MY_P="rust-${PV}"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="http://www.rust-lang.org/";
+SRC_URI="amd64? (
http://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.gz )
+ x86? (
http://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.gz )"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+SLOT="stable"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+ !dev-lang/rust:0
+"
+RDEPEND="${DEPEND}"
+
+QA_PREBUILT="
+ opt/${P}/bin/rustc-bin-${PV}
+ opt/${P}/bin/rustdoc-bin-${PV}
+ opt/${P}/lib/*.so
+ opt/${P}/lib/rustlib/*/lib/*.so
+"
+
+src_unpack() {
+ default
+
+ local postfix
+ use amd64 && postfix=x86_64-unknown-linux-gnu
+ use x86 && postfix=i686-unknown-linux-gnu
+ mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
+}
+
+src_install() {
+ local std=$(grep 'std' ./components)
+ local components="rustc,${std}"
+ use doc
[gentoo-commits] repo/gentoo:master commit in: sys-apps/flashrom/
commit: cfca6885ae198842fa3b193b3ca4cf111aa73994
Author: Sven Wegener gentoo org>
AuthorDate: Fri Jan 22 20:44:23 2016 +
Commit: Sven Wegener gentoo org>
CommitDate: Fri Jan 22 22:03:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfca6885
sys-apps/flashrom: Add atapromise programmer USE flag
Signed-off-by: Sven Wegener gentoo.org>
sys-apps/flashrom/flashrom-.ebuild | 3 ++-
sys-apps/flashrom/metadata.xml | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/sys-apps/flashrom/flashrom-.ebuild
b/sys-apps/flashrom/flashrom-.ebuild
index 9c6bb44..d67568b 100644
--- a/sys-apps/flashrom/flashrom-.ebuild
+++ b/sys-apps/flashrom/flashrom-.ebuild
@@ -21,13 +21,14 @@ SLOT="0"
# The defaults match the upstream Makefile.
# Note: Do not list bitbang_spi as it is not a programmer; it's a backend used
# by some other spi programmers.
-IUSE_PROGRAMMERS="atahpt +atavia +buspirate_spi dediprog +drkaiser +dummy
+IUSE_PROGRAMMERS="atahpt +atapromise +atavia +buspirate_spi dediprog +drkaiser
+dummy
+ft2232_spi +gfxnvidia +internal +it8212 +linux_spi mstarddc_spi +nic3com
+nicintel +nicintel_eeprom +nicintel_spi nicnatsemi +nicrealtek +ogp_spi
+pickit2_spi +pony_spi +rayer_spi +satamv +satasii +serprog +usbblaster_spi"
IUSE="${IUSE_PROGRAMMERS} +internal_dmi static tools +wiki"
LIB_DEPEND="atahpt? ( sys-apps/pciutils[static-libs(+)] )
+ atapromise? ( sys-apps/pciutils[static-libs(+)] )
atavia? ( sys-apps/pciutils[static-libs(+)] )
dediprog? ( virtual/libusb:0[static-libs(+)] )
drkaiser? ( sys-apps/pciutils[static-libs(+)] )
diff --git a/sys-apps/flashrom/metadata.xml b/sys-apps/flashrom/metadata.xml
index 2501995..6c05e6d 100644
--- a/sys-apps/flashrom/metadata.xml
+++ b/sys-apps/flashrom/metadata.xml
@@ -12,6 +12,7 @@
Highpoint (HPT) ATA/RAID controller
support
+ Support for Promise PDC2026x
(FastTrak/Ultra)
Support for VIA VT6421A SATA
controllers
Bitbanging SPI infrastructure
Enable Bus Pirate SPI
programmer
[gentoo-commits] repo/gentoo:master commit in: dev-java/guice/
commit: cadbd36b36b59cebf30315179050b4cef14dd34d
Author: James Le Cuirot gentoo org>
AuthorDate: Fri Jan 22 21:51:04 2016 +
Commit: James Le Cuirot gentoo org>
CommitDate: Fri Jan 22 21:51:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cadbd36b
dev-java/guice: Use a sane distfile name
Package-Manager: portage-2.2.27
dev-java/guice/Manifest | 2 +-
dev-java/guice/guice-4.0.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
index 4b076b0..23f8e3e 100644
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@@ -1,2 +1,2 @@
-DIST 4.0.zip 23619064 SHA256
162f10637cd76d34b1bdcccff7f721424928ecdf1e15dc04270f0fa6a5f8953c SHA512
db4021518a7868fa3387686a701fa5e464b92f69f6a2e4a6a8d85c13b665da22c1cacfdb36caa0de484ad03321280fde9ad5ec9725c66c6bb455575b03915344
WHIRLPOOL
36d426f4a604b8dd0c51b42df4e6e5acd8e05391c1acf4cb90731331a8e1126d09e14c0264b6854fac14632ed11bcc45bad0f0fafc076023488f0684b7a6c55f
DIST guice-2.0-src.zip 17342981 SHA256
7f836156d9d6b7688d373a4c70971b8b42e3a553e26a8f98a110a868eb749394 SHA512
61e1c5b6bbd7db5017a99b2998b706071717781360ab8d622d163be2cc954d9b34ab8b68d2ab02f29bb1a8b640ac25350dca302c390855641ca3e4cc4438a1b9
WHIRLPOOL
7be8673b603ad1aa722ddb76cefaec5e1d03e9a4199d25cbb1a58a31f89c33ac1d9e0a479951b5412cc2c94504d46afd56f42a57f3d87ef3915554fbf821d506
+DIST guice-4.0.tar.gz 23103592 SHA256
353cd5130d6e7f5bdb702af2e6b4f8aedd6e152c276275a6adcf5bbefade4ddb SHA512
45bdc00ebbad051f1f31b7cb5c134e42c841a06513563abc184739a514f39bc76dcb220af77ec60f46a0d887df93e0177ce071110b41ef6e5e69bad1a30f0e40
WHIRLPOOL
7b9b1d41b5256592ae5ccbd550b008d4cd10a50e7007a3c2b3d9b5cfaaa144f43be2d398386a762d9ca4afa76b30d4ec40aed2a9c9fd1c731f359de23c3be0df
diff --git a/dev-java/guice/guice-4.0.ebuild b/dev-java/guice/guice-4.0.ebuild
index 56820e0..6049aeb 100644
--- a/dev-java/guice/guice-4.0.ebuild
+++ b/dev-java/guice/guice-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-ant-2
DESCRIPTION="Guice is a lightweight dependency injection framework for Java 5
and above"
HOMEPAGE="https://github.com/google/guice/";
-SRC_URI="https://github.com/google/${PN}/archive/${PV}.zip";
+SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="4"
[gentoo-commits] proj/openrc: New tag: 0.20.4
commit: Commit: William Hubbs gentoo org> CommitDate: Fri Jan 22 21:29:42 2016 + New tag: 0.20.4
[gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/, dev-qt/qtdeclarative/, dev-qt/assistant/, dev-qt/designer/, ...
commit: 65dbb742a80aef82a2b4feca91dce08989b4ed84 Author: Davide Pesavento gentoo org> AuthorDate: Fri Jan 22 21:30:01 2016 + Commit: Davide Pesavento gentoo org> CommitDate: Fri Jan 22 21:30:01 2016 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=65dbb742 dev-qt: delete unused local USE descriptions Package-Manager: portage-2.2.27 dev-qt/assistant/metadata.xml | 4 dev-qt/designer/metadata.xml | 4 dev-qt/linguist/metadata.xml | 4 dev-qt/pixeltool/metadata.xml | 4 dev-qt/qdbusviewer/metadata.xml | 4 dev-qt/qtcore/metadata.xml| 5 - dev-qt/qtdbus/metadata.xml| 4 dev-qt/qtdeclarative/metadata.xml | 5 - dev-qt/qtgui/metadata.xml | 8 dev-qt/qthelp/metadata.xml| 6 -- dev-qt/qtmultimedia/metadata.xml | 2 -- dev-qt/qtopengl/metadata.xml | 5 - dev-qt/qtscript/metadata.xml | 2 -- dev-qt/qtsql/metadata.xml | 5 - dev-qt/qtsvg/metadata.xml | 4 dev-qt/qttest/metadata.xml| 4 dev-qt/qtwebkit/metadata.xml | 2 -- 17 files changed, 72 deletions(-) diff --git a/dev-qt/assistant/metadata.xml b/dev-qt/assistant/metadata.xml index 258aee1..afb3b43 100644 --- a/dev-qt/assistant/metadata.xml +++ b/dev-qt/assistant/metadata.xml @@ -2,10 +2,6 @@ http://www.gentoo.org/dtd/metadata.dtd";> qt - - Add support for exceptions - like catching them - inside the event loop (recommended by upstream) - https://bugreports.qt.io/ http://doc.qt.io/ diff --git a/dev-qt/designer/metadata.xml b/dev-qt/designer/metadata.xml index d5e349c..a2c89f2 100644 --- a/dev-qt/designer/metadata.xml +++ b/dev-qt/designer/metadata.xml @@ -4,10 +4,6 @@ qt Build the qdeclarativeview plugin - Add support for exceptions - like catching them - inside the event loop (recommended by upstream) - Build the phononwidgets plugin - Build the qt3supportwidgets plugin Build the qwebview plugin diff --git a/dev-qt/linguist/metadata.xml b/dev-qt/linguist/metadata.xml index 258aee1..afb3b43 100644 --- a/dev-qt/linguist/metadata.xml +++ b/dev-qt/linguist/metadata.xml @@ -2,10 +2,6 @@ http://www.gentoo.org/dtd/metadata.dtd";> qt - - Add support for exceptions - like catching them - inside the event loop (recommended by upstream) - https://bugreports.qt.io/ http://doc.qt.io/ diff --git a/dev-qt/pixeltool/metadata.xml b/dev-qt/pixeltool/metadata.xml index 258aee1..afb3b43 100644 --- a/dev-qt/pixeltool/metadata.xml +++ b/dev-qt/pixeltool/metadata.xml @@ -2,10 +2,6 @@ http://www.gentoo.org/dtd/metadata.dtd";> qt - - Add support for exceptions - like catching them - inside the event loop (recommended by upstream) - https://bugreports.qt.io/ http://doc.qt.io/ diff --git a/dev-qt/qdbusviewer/metadata.xml b/dev-qt/qdbusviewer/metadata.xml index 258aee1..afb3b43 100644 --- a/dev-qt/qdbusviewer/metadata.xml +++ b/dev-qt/qdbusviewer/metadata.xml @@ -2,10 +2,6 @@ http://www.gentoo.org/dtd/metadata.dtd";> qt - - Add support for exceptions - like catching them - inside the event loop (recommended by upstream) - https://bugreports.qt.io/ http://doc.qt.io/ diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml index c649f06..c5da8ea 100644 --- a/dev-qt/qtcore/metadata.xml +++ b/dev-qt/qtcore/metadata.xml @@ -3,11 +3,6 @@ qt - Add support for exceptions - like catching them - inside the event loop (recommended by upstream) - Enable dev-libs/glib eventloop support - Enable the Qt3Support libraries for Qt4. Note that - this does not mean you can compile pure Qt3 programs with Qt4. Enable native journald logging support diff --git a/dev-qt/qtdbus/metadata.xml b/dev-qt/qtdbus/metadata.xml index 258aee1..afb3b43 100644 --- a/dev-qt/qtdbus/metadata.xml +++ b/dev-qt/qtdbus/metadata.xml @@ -2,10 +2,6 @@ http://www.gentoo.org/dtd/metadata.dtd";> qt - - Add support for exceptions - like catching them - inside the event loop (recommended by upstream) - https://bugreports.qt.io/ http://doc.qt.io/ diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml index f96540a..adda384 100644 --- a/dev-qt/qtdeclarative/metadata.xml +++ b/dev-qt/qtdeclarative/metadata.xml @@ -3,13
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hashed-storage/files/, dev-haskell/hashed-storage/
commit: 6a8dc0407c2ee63d71cadb73a894d1624c97fe81
Author: Sergei Trofimovich gentoo org>
AuthorDate: Fri Jan 22 21:28:18 2016 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Fri Jan 22 21:28:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a8dc040
dev-haskell/hashed-storage: tweak for QC-2.8.2
Package-Manager: portage-2.2.27
.../files/hashed-storage-0.5.11-QC-2.8.2.patch | 16
dev-haskell/hashed-storage/hashed-storage-0.5.11.ebuild | 1 +
2 files changed, 17 insertions(+)
diff --git
a/dev-haskell/hashed-storage/files/hashed-storage-0.5.11-QC-2.8.2.patch
b/dev-haskell/hashed-storage/files/hashed-storage-0.5.11-QC-2.8.2.patch
new file mode 100644
index 000..1a001e7
--- /dev/null
+++ b/dev-haskell/hashed-storage/files/hashed-storage-0.5.11-QC-2.8.2.patch
@@ -0,0 +1,16 @@
+diff --git a/Storage/Hashed/Test.hs b/Storage/Hashed/Test.hs
+index d3cab6f..7f8291e 100644
+--- a/Storage/Hashed/Test.hs
b/Storage/Hashed/Test.hs
+@@ -1,2 +1,2 @@
+-{-# LANGUAGE ScopedTypeVariables, FlexibleInstances #-}
++{-# LANGUAGE ScopedTypeVariables, FlexibleInstances, CPP #-}
+ module Storage.Hashed.Test( tests ) where
+@@ -464,2 +464,3 @@ posix = [ testCase "getFileStatus" $ check_stat
Posix.getFileStatus
+
++#if ! MIN_VERSION_QuickCheck(2,8,2)
+ instance (Arbitrary a, Ord a) => Arbitrary (S.Set a)
+@@ -469,2 +470,3 @@ instance (Arbitrary k, Arbitrary v, Ord k) => Arbitrary
(M.Map k v)
+ where arbitrary = M.fromList `fmap` arbitrary
++#endif
+
diff --git a/dev-haskell/hashed-storage/hashed-storage-0.5.11.ebuild
b/dev-haskell/hashed-storage/hashed-storage-0.5.11.ebuild
index 094a567..fb72b5e 100644
--- a/dev-haskell/hashed-storage/hashed-storage-0.5.11.ebuild
+++ b/dev-haskell/hashed-storage/hashed-storage-0.5.11.ebuild
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}"/${P}-ghc-7.10.patch
+ epatch "${FILESDIR}"/${P}-QC-2.8.2.patch
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/quickcheck-instances/
commit: 15d7fe2a290671fce74627d35f00ec88d0ad3fab
Author: Sergei Trofimovich gentoo org>
AuthorDate: Fri Jan 22 21:12:42 2016 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Fri Jan 22 21:12:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15d7fe2a
dev-haskell/quickcheck-instances: bump up to 0.3.12
Package-Manager: portage-2.2.27
dev-haskell/quickcheck-instances/Manifest | 1 +
.../quickcheck-instances-0.3.12.ebuild | 32 ++
2 files changed, 33 insertions(+)
diff --git a/dev-haskell/quickcheck-instances/Manifest
b/dev-haskell/quickcheck-instances/Manifest
index e7e3e43..10a4a74 100644
--- a/dev-haskell/quickcheck-instances/Manifest
+++ b/dev-haskell/quickcheck-instances/Manifest
@@ -1,3 +1,4 @@
DIST quickcheck-instances-0.3.11.tar.gz 6024 SHA256
02962005e51d77b84e94dd0a8f3f1be89af6e8099d25e6c0bf417f364c323a10 SHA512
a19c97810df7a028af5c6190f62bd9c858444ba210bd016eeb37b402aa9ff942a3538263b80d89a9c156189220ce32058fb81b384c1317f96df527654cb59818
WHIRLPOOL
8ccd4a400540ef70d60890b53e881b2f1fd232f5817640c4feaba365ddf4dca0c73af692b1e7c588544b3bde2e63461c32e359ebb0786ee5e55b40dcfabee330
+DIST quickcheck-instances-0.3.12.tar.gz 6437 SHA256
ddd5b988da50eff7f56737bff516fba52309f7461297698f04f1e8aaee9f9bf3 SHA512
471e9e4324ca6d655283d8ed149587bdad981684dce9dc5db5db417fb7614d3a1b6d41388af228e4d600b989d2e14e0496af63c09275cce3f132db7d71c35f98
WHIRLPOOL
b9c6d36651222c43709437484a65e1e72a1397366d821946ffef9ea0c8cea23149414b269d2a9f4048d10e9b822f9e0a8df989714639df297bfb9b22ad1c6149
DIST quickcheck-instances-0.3.8.tar.gz 5725 SHA256
6fbe5a3ec9358b3a0a159528b568af6c0541320caabfa754f80a86f8cf506204 SHA512
c8ec49fdc4cc34ea1538c0e49945ede7b6e65897b80c4b9bbc28b3da420458e2731259344e3df02ab0d1afb757a0416dd8697c165af56bf899388491117b6287
WHIRLPOOL
5888baf24fbd40886150ae40877bd179c4eb79b592e689f3c29d9eac3a9cf77c7aaf47bc1eb4a3a5dd79b65c93507999510de3c436cd186e18dd119308f7ac59
DIST quickcheck-instances-0.3.9.tar.gz 5768 SHA256
a618b0bce74594b060eb38e6fcc1479e71b91579a20374abb298a837435b15a8 SHA512
1a85f8c1e22307cff86456f5eee6ce8f5b394168b84868d220e721137ea4187822d4faface0116624e7ac99e8b716f6373903e913487712816e9829ca854c477
WHIRLPOOL
94966448ac0dc6cd16b40ef13e7554ef4c05e086db80a9dcc8f3f683aabc8282f45676a486407065b8695ce419644a1ddac17b0618deb2322388a479bd6e8cf9
diff --git
a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.12.ebuild
b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.12.ebuild
new file mode 100644
index 000..e1e629a
--- /dev/null
+++ b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.12.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Common quickcheck instances"
+HOMEPAGE="https://github.com/aslatter/qc-instances";
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/hashable-1.1.2.3:=[profile?]
=dev-haskell/old-time-1.0:=[profile?]
=dev-haskell/quickcheck-2.1:2=[profile?]
=dev-haskell/scientific-0.2:=[profile?]
=dev-haskell/text-0.7:=[profile?] =dev-haskell/unordered-containers-0.2.1:=[profile?]
=dev-haskell/vector-0.9:=[profile?]
=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
[gentoo-commits] repo/gentoo:master commit in: sys-block/fio/
commit: 8e1ed2776ca3509bea3627f3c66ac6b99cef7119
Author: Robin H. Johnson gentoo org>
AuthorDate: Fri Jan 22 21:02:09 2016 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Fri Jan 22 21:03:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e1ed277
sys-block/fio: Version bump & bug #572446.
- Version bump.
- Fix bug #572446: USE=static builds, the deps need to be build with
USE=static-libs, or else the build will fail (backported change to
last stable as well, as also affected).
X-Gentoo-Bug: 572446
Package-Manager: portage-2.2.24
Signed-off-by: Robin H. Johnson gentoo.org>
sys-block/fio/Manifest | 2 ++
sys-block/fio/fio-2.2.10.ebuild| 14 --
sys-block/fio/{fio-2.2.10.ebuild => fio-2.2.13.ebuild} | 14 --
sys-block/fio/fio-2.2.9.ebuild | 14 --
sys-block/fio/{fio-2.2.10.ebuild => fio-2.5.ebuild}| 14 --
5 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 89185ef..5fca220 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -4,5 +4,7 @@ DIST fio-2.0.14.tar.bz2 253574 SHA256
4bf01f1d2baf6d4fa905e5489e446e85e01979c427
DIST fio-2.0.15.tar.bz2 258773 SHA256
3cc1b5e6c6955f9acad016b4d2ef619061ad9937874c7663e2a29777ed845ac4 SHA512
00289a0404cb44dd670614856932fbdf61cb1508e0eb672e5778c2ba3eba661b82892f7c969e4a82cf4fc487a744eb7411bfebf3b9612863de0197a28787f556
WHIRLPOOL
08b37573b63f812ea62c4ba323f05f510a9656e74f780117bd711bcc78e7fc7b5bef009212e7ec98f0ed153cc3786ece4d75d565845c0bc5eaba59afa1b037d8
DIST fio-2.1.9.tar.bz2 429122 SHA256
4ae877939a1a1460ad4d93f7891a15bad8ca7295f441204b12c723758a0d4493 SHA512
91913941c0d83705c156eef550eb87b388368804ee722c8c99ea638481ee657960e333c58b54e720034e92c2c34e9a8bb901336399a209a87f5eaa1ad1dfde53
WHIRLPOOL
6f44cbfe601f436b1ed0173e1dfbcf3b342f1a191c947392f0167a2dba9c4806fa422ffaedf9475f83b49fab8832aa1076ba91d27a9f2bdbcae126fa4d708824
DIST fio-2.2.10.tar.bz2 497503 SHA256
04b4490c69f82bafeccbab51d33732cfd74e7a54e74eae0d9a2450faf4f1d857 SHA512
6ff71ca78b2ffa40cd9390b3e4f0b6f07db4d50c85f89c4a9e03c7f327153c0fed3eb8b7c44f3a8f8d0b1b35b48ccb5b1aa96a95fdca08581c22b99f2961c7d3
WHIRLPOOL
7bb881ecea82f3ad568d7513af0486494dc657ede69cc4de0f71e7bdf873ccf8f7a58744ab8f1fce8a1c507c3ce0f7e95eb3a7098a01fe041f04cd29a6a4afb7
+DIST fio-2.2.13.tar.bz2 503950 SHA256
66a0084c37bd8804d9f7d260d843a9a3bf51561954024d3b32062b9332281924 SHA512
b2adc4fb1b8c71bb909cfc2cfd9e0d25affcacd47908bc6d126625b448c0e964afa7c65fb88cf21662d4b9d07bfbaebbb2fd66b4c4662382ef68aaf8f053bd6d
WHIRLPOOL
112af8620a73e907723760fd01caa4c582f7adba5eef5bf51bb6b695c1a15ff812957937cb67dff00b93c3e941df67d751ecf1aca1627722a6084c5494e7f70a
DIST fio-2.2.4.tar.bz2 467312 SHA256
9e1c77216457d9e21e418a55fa28bc1f98c283723fe9dcccff6138e3fb25285b SHA512
91fa0d8f9dd8d950dd26ef5c778414acddd9d6deeb84caeecdfef08df7e00c7972566a76bd242b0d5aea33a7c588aa05cf2fdcd79ef5a475277a2139d1f111a1
WHIRLPOOL
4588601d5f44c1836f97cc223bf08cce3f29f5ea3421880c00a16dcd9e3cffd741bbdd2029518712f8808548469d7f44f1b0348189643419bfd2104eab980536
DIST fio-2.2.9.tar.bz2 492404 SHA256
c881d9cf15500bd4436970d0467c356c5c021417131587931ba78845e965bf56 SHA512
e0cd26bb8a760ef5e40ddb73246671c1988f0c0886bd24fa510fcab93fe64d8853f120355f55fa109168c7fae0b081f63278f2233644f5ed20da4e4c3cb3f3fc
WHIRLPOOL
4f5ada7f1140c7229fc3173fa0582a4ae7401121768d8dec828dcd42c1c22ec828e9c000c482b155ead4fd75ee15c4d7678fc7c6d18c8fbb9c749e83f87a4881
+DIST fio-2.5.tar.bz2 509978 SHA256
30f85cd6596125bd2f76b379f15a4edee1149bb0347a9c10a2dda15d7591a543 SHA512
44fc4bc342b611f9ed89685d73592389dd9e63970a9bbcc1b332aa8434a3e4a52b0c16d27b6a6dd96fcf3a9831a68af5249251895a6dbd9f7190ad0b8935eb40
WHIRLPOOL
dced416aae899987ff80c6f37999a064d8a45c8ea809d7a3f3a2eea5dd3b6ae5633125326373a5da3b37429dc940f0c97fa9694e976a61819709db3b6ab7ac3e
diff --git a/sys-block/fio/fio-2.2.10.ebuild b/sys-block/fio/fio-2.2.10.ebuild
index 8295543..1d6b7d4 100644
--- a/sys-block/fio/fio-2.2.10.ebuild
+++ b/sys-block/fio/fio-2.2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,15 +18,17 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
IUSE="aio glusterfs gnuplot gtk numa rbd rdma static zlib"
-DEPEND="aio? ( dev-libs/libaio )
- glusterfs? ( sys-cluster/glusterfs )
+# GTK+:2 does not offer static libaries
+# numactl always includes static libraries
+DEPEND="aio? ( static? ( dev-libs/libaio[static-libs(+)] ) !static? (
dev-libs/libaio ) )
+ glusterfs? ( static? ( sys-cluster/glusterfs[static-libs(+)] ) !static?
( sys-cluster/glusterfs ) )
gtk? (
- dev-libs/glib:2
+ static? ( dev-libs/glib:2[static-libs(+)] ) !static? (
dev-libs/glib:2 )
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-annex/files/, dev-vcs/git-annex/
commit: e93088f01d942229515808ff165d616b5191cc6a
Author: Sergei Trofimovich gentoo org>
AuthorDate: Fri Jan 22 21:04:27 2016 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Fri Jan 22 21:04:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e93088f0
dev-vcs/git-annex: fix against QC-2.8.2, bug #572504
QuickCheck-2.8.2 introduced default instances for
Data.Map and Data.Set. git-annex happened to provide
those as well.
Reported-by: bugtrack web.de
Reported-by: Matthias Maier
Bug: https://bugs.gentoo.org/572504
Package-Manager: portage-2.2.27
.../git-annex/files/git-annex-6.20160114-QC-2.8.2.patch | 16
dev-vcs/git-annex/git-annex-5.20151218.ebuild| 1 +
2 files changed, 17 insertions(+)
diff --git a/dev-vcs/git-annex/files/git-annex-6.20160114-QC-2.8.2.patch
b/dev-vcs/git-annex/files/git-annex-6.20160114-QC-2.8.2.patch
new file mode 100644
index 000..2f23278
--- /dev/null
+++ b/dev-vcs/git-annex/files/git-annex-6.20160114-QC-2.8.2.patch
@@ -0,0 +1,16 @@
+diff --git a/Utility/QuickCheck.hs b/Utility/QuickCheck.hs
+index cd408dd..9f60f23 100644
+--- a/Utility/QuickCheck.hs
b/Utility/QuickCheck.hs
+@@ -9,2 +9,3 @@
+ {-# LANGUAGE TypeSynonymInstances #-}
++{-# LANGUAGE CPP #-}
+
+@@ -23,2 +24,3 @@ import Prelude
+
++#if ! MIN_VERSION_QuickCheck(2,8,2)
+ instance (Arbitrary k, Arbitrary v, Eq k, Ord k) => Arbitrary (M.Map k v)
where
+@@ -28,2 +30,3 @@ instance (Arbitrary v, Eq v, Ord v) => Arbitrary (S.Set v)
where
+ arbitrary = S.fromList <$> arbitrary
++#endif
+
diff --git a/dev-vcs/git-annex/git-annex-5.20151218.ebuild
b/dev-vcs/git-annex/git-annex-5.20151218.ebuild
index 8e5b052..7afd432 100644
--- a/dev-vcs/git-annex/git-annex-5.20151218.ebuild
+++ b/dev-vcs/git-annex/git-annex-5.20151218.ebuild
@@ -106,6 +106,7 @@ DEPEND="${RDEPEND}
src_prepare() {
# does not respect staging dir
epatch "${FILESDIR}"/${PN}-5.20150731-no-strange-installs.patch
+ epatch "${FILESDIR}"/${PN}-6.20160114-QC-2.8.2.patch
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: app-admin/vault/
commit: d6631e4f3038c6153abfe9f3c6e260c2121f21de
Author: Justin Lecher gentoo org>
AuthorDate: Fri Jan 22 20:24:01 2016 +
Commit: Justin Lecher gentoo org>
CommitDate: Fri Jan 22 21:03:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6631e4f
app-admin/vault: Use egit_clean to clean workdir
* Sort global scope according to skel.ebuild
* Add missing die
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher gentoo.org>
app-admin/vault/metadata.xml | 2 +-
app-admin/vault/vault-0.1.2-r1.ebuild | 28 ++--
app-admin/vault/vault-0.1.2.ebuild| 25 -
app-admin/vault/vault-.ebuild | 24
4 files changed, 51 insertions(+), 28 deletions(-)
diff --git a/app-admin/vault/metadata.xml b/app-admin/vault/metadata.xml
index aace583..69a522d 100644
--- a/app-admin/vault/metadata.xml
+++ b/app-admin/vault/metadata.xml
@@ -1,4 +1,4 @@
-
+
http://www.gentoo.org/dtd/metadata.dtd";>
diff --git a/app-admin/vault/vault-0.1.2-r1.ebuild
b/app-admin/vault/vault-0.1.2-r1.ebuild
index f2adc6d..c30bcd2 100644
--- a/app-admin/vault/vault-0.1.2-r1.ebuild
+++ b/app-admin/vault/vault-0.1.2-r1.ebuild
@@ -1,27 +1,32 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-inherit fcaps golang-build systemd user
+inherit eutils fcaps golang-build systemd user
+
+GO_PN="github.com/hashicorp/${PN}"
-KEYWORDS="~amd64"
DESCRIPTION="A tool for managing secrets"
HOMEPAGE="https://vaultproject.io/";
-GO_PN="github.com/hashicorp/${PN}"
-LICENSE="MPL-2.0"
+SRC_URI="
+ https://${GO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/mitchellh/gox/archive/v0.3.0.tar.gz ->
gox-0.3.0.tar.gz
+
https://github.com/mitchellh/iochan/archive/b584a329b193e206025682ae6c10cdbe03b0cd77.tar.gz
-> iochan-b584a329b193e206025682ae6c10cdbe03b0cd77.tar.gz"
+
SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64"
IUSE=""
+
RESTRICT="test"
DEPEND="dev-go/go-oauth2:="
RDEPEND=""
-SRC_URI="https://${GO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/mitchellh/gox/archive/v0.3.0.tar.gz -> gox-0.3.0.tar.gz
-https://github.com/mitchellh/iochan/archive/b584a329b193e206025682ae6c10cdbe03b0cd77.tar.gz
-> iochan-b584a329b193e206025682ae6c10cdbe03b0cd77.tar.gz"
STRIP_MASK="*.a"
+
S="${WORKDIR}/src/${GO_PN}"
FILECAPS=(
@@ -85,8 +90,11 @@ src_install() {
fowners ${PN}:${PN} /var/log/${PN}
dobin bin/${PN}
- find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
- find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete
+
+ egit_clean "${WORKDIR}"/{pkg,src}
+
+ find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete
|| die
+
while read -r -d '' x; do
x=${x#${WORKDIR}/src}
[[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} ||
diff --git a/app-admin/vault/vault-0.1.2.ebuild
b/app-admin/vault/vault-0.1.2.ebuild
index 452afb6..a910cd9 100644
--- a/app-admin/vault/vault-0.1.2.ebuild
+++ b/app-admin/vault/vault-0.1.2.ebuild
@@ -1,27 +1,31 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-inherit fcaps golang-build systemd user
+inherit eutils fcaps golang-build systemd user
-KEYWORDS="~amd64"
+GO_PN="github.com/hashicorp/${PN}"
DESCRIPTION="A tool for managing secrets"
HOMEPAGE="https://vaultproject.io/";
-GO_PN="github.com/hashicorp/${PN}"
+SRC_URI="
+ https://${GO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/mitchellh/gox/archive/v0.3.0.tar.gz ->
gox-0.3.0.tar.gz
+
https://github.com/mitchellh/iochan/archive/b584a329b193e206025682ae6c10cdbe03b0cd77.tar.gz
-> iochan-b584a329b193e206025682ae6c10cdbe03b0cd77.tar.gz"
+
LICENSE="MPL-2.0"
SLOT="0"
+KEYWORDS="~amd64"
IUSE=""
+
RESTRICT="test"
DEPEND="dev-go/go-oauth2"
RDEPEND=""
-SRC_URI="https://${GO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/mitchellh/gox/archive/v0.3.0.tar.gz -> gox-0.3.0.tar.gz
-https://github.com/mitchellh/iochan/archive/b584a329b193e206025682ae6c10cdbe03b0cd77.tar.gz
-> iochan-b584a329b193e206025682ae6c10cdbe03b0cd77.tar.gz"
STRIP_MASK="*.a"
+
S="${WORKDIR}/src/${GO_PN}"
FILECAPS=(
@@ -85,8 +89,11 @@ src_install() {
fowners ${PN}:${PN} /var/log/${PN}
dobin bin/${PN}
- find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
- find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete
+
+ egit_clean "${WORKDIR}"/{pkg,src}
+
+ find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete
|| die
+
while read -r -d '' x; do
x=${x#${WORKDIR}/src}
[[ -d ${WORKDIR}
[gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury/
commit: 0dbd28d2e94105b4faaea44fc578ecbc8874efb4
Author: Justin Lecher gentoo org>
AuthorDate: Fri Jan 22 19:00:56 2016 +
Commit: Justin Lecher gentoo org>
CommitDate: Fri Jan 22 21:03:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dbd28d2
dev-lang/mercury: Use ecvs_clean to clean workdir
* add missing die
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher gentoo.org>
dev-lang/mercury/mercury-11.01.ebuild | 11 +--
dev-lang/mercury/mercury-11.07.1.ebuild | 11 +--
dev-lang/mercury/mercury-11.07.2.ebuild | 11 +--
dev-lang/mercury/mercury-11.07.ebuild | 11 +--
dev-lang/mercury/mercury-13.05.1.ebuild | 11 +--
dev-lang/mercury/mercury-13.05.2.ebuild | 11 +--
dev-lang/mercury/mercury-13.05.ebuild | 11 +--
dev-lang/mercury/metadata.xml | 14 +++---
8 files changed, 42 insertions(+), 49 deletions(-)
diff --git a/dev-lang/mercury/mercury-11.01.ebuild
b/dev-lang/mercury/mercury-11.01.ebuild
index bb7c875..f8f9bc7 100644
--- a/dev-lang/mercury/mercury-11.01.ebuild
+++ b/dev-lang/mercury/mercury-11.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -36,7 +36,7 @@ TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
SITEFILE=50${PN}-gentoo.el
src_prepare() {
- cd "${WORKDIR}"
+ cd "${WORKDIR}" || die
EPATCH_FORCE=yes
EPATCH_SUFFIX=patch
epatch "${WORKDIR}"/${PV}
@@ -49,7 +49,7 @@ src_prepare() {
epatch "${WORKDIR}"/${PV}-tests
fi
- cd "${S}"
+ cd "${S}" || die
eautoconf
}
@@ -132,7 +132,7 @@ src_test() {
TWS="${S}"
fi
- cd "${TESTDIR}"
+ cd "${TESTDIR}" || die
sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws \
|| die "sed WORKSPACE failed"
@@ -202,8 +202,7 @@ src_install() {
doins -r samples/java_interface || die
fi
- rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \
- -name CVS -o -name .cvsignore)
+ ecvs_clean "${D}"/usr/share/doc/${PF}/samples
fi
}
diff --git a/dev-lang/mercury/mercury-11.07.1.ebuild
b/dev-lang/mercury/mercury-11.07.1.ebuild
index fbc3732..f143a22 100644
--- a/dev-lang/mercury/mercury-11.07.1.ebuild
+++ b/dev-lang/mercury/mercury-11.07.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -36,7 +36,7 @@ TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
SITEFILE=50${PN}-gentoo.el
src_prepare() {
- cd "${WORKDIR}"
+ cd "${WORKDIR}" || die
EPATCH_FORCE=yes
EPATCH_SUFFIX=patch
epatch "${WORKDIR}"/${PV}
@@ -49,7 +49,7 @@ src_prepare() {
epatch "${WORKDIR}"/${PV}-tests
fi
- cd "${S}"
+ cd "${S}" || die
eautoconf
}
@@ -132,7 +132,7 @@ src_test() {
TWS="${S}"
fi
- cd "${TESTDIR}"
+ cd "${TESTDIR}" || die
sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws \
|| die "sed WORKSPACE failed"
@@ -202,8 +202,7 @@ src_install() {
doins -r samples/java_interface || die
fi
- rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \
- -name CVS -o -name .cvsignore)
+ ecvs_clean "${D}"/usr/share/doc/${PF}/samples
fi
}
diff --git a/dev-lang/mercury/mercury-11.07.2.ebuild
b/dev-lang/mercury/mercury-11.07.2.ebuild
index 9d8b648..74cb440 100644
--- a/dev-lang/mercury/mercury-11.07.2.ebuild
+++ b/dev-lang/mercury/mercury-11.07.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -36,7 +36,7 @@ TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
SITEFILE=50${PN}-gentoo.el
src_prepare() {
- cd "${WORKDIR}"
+ cd "${WORKDIR}" || die
EPATCH_FORCE=yes
EPATCH_SUFFIX=patch
epatch "${WORKDIR}"/${PV}
@@ -49,7 +49,7 @@ src_prepare() {
epatch "${WORKDIR}"/${PV}-tests
fi
- cd "${S}"
+ cd "${S}" || die
eautoconf
}
@@ -132,7 +132,7 @@ src_test() {
TWS="${S}"
fi
- cd "${TESTDIR}"
+ cd "${TESTDIR}" || die
sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws \
|| die "sed WORKSPACE failed"
@@ -202,8 +202,7 @@ src_install() {
doins -r samples/java_interface || die
fi
- rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \
- -name CVS -o -name .cvsignore)
+ ecvs_clean "${D}"/usr/sha
[gentoo-commits] repo/gentoo:master commit in: app-admin/consul/
commit: 8d7da01c2e82f43b504e73cb0e40e93ed9f09e45
Author: Justin Lecher gentoo org>
AuthorDate: Fri Jan 22 19:54:39 2016 +
Commit: Justin Lecher gentoo org>
CommitDate: Fri Jan 22 21:03:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d7da01c
app-admin/consul: Use egit_clean to clean workdir
* Sort global scope according to skel.ebuild
* Add missing die
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher gentoo.org>
app-admin/consul/consul-0.5.2-r1.ebuild | 82 ++---
app-admin/consul/consul-0.6.3.ebuild| 105 +---
app-admin/consul/consul-.ebuild | 26 +---
app-admin/consul/metadata.xml | 2 +-
4 files changed, 119 insertions(+), 96 deletions(-)
diff --git a/app-admin/consul/consul-0.5.2-r1.ebuild
b/app-admin/consul/consul-0.5.2-r1.ebuild
index 4d737e5..f48f760 100644
--- a/app-admin/consul/consul-0.5.2-r1.ebuild
+++ b/app-admin/consul/consul-0.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -6,16 +6,48 @@ EAPI=5
inherit golang-base systemd user
-KEYWORDS="~amd64"
+GO_PN="github.com/hashicorp/consul"
+
DESCRIPTION="A tool for service discovery, monitoring and configuration"
HOMEPAGE="http://www.consul.io";
-GO_PN="github.com/hashicorp/consul"
-LICENSE="MPL-2.0"
+SRC_URI="
+ https://github.com/hashicorp/consul/archive/v0.5.2.tar.gz -> ${P}.tar.gz
+
https://github.com/armon/circbuf/archive/f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz
-> circbuf-f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz
+
https://github.com/armon/go-metrics/archive/a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz
-> go-metrics-a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz
+
https://github.com/armon/go-radix/archive/0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz
-> go-radix-0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz
+
https://github.com/armon/gomdb/archive/151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz
-> gomdb-151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz
+
https://github.com/boltdb/bolt/archive/2c04100eb9793f2b8541d243494e2909d2112325.tar.gz
-> bolt-2c04100eb9793f2b8541d243494e2909d2112325.tar.gz
+ https://github.com/hashicorp/consul-migrate/archive/v0.1.0.tar.gz ->
consul-migrate-0.1.0.tar.gz
+
https://github.com/hashicorp/go-checkpoint/archive/88326f6851319068e7b34981032128c0b1a6524d.tar.gz
-> go-checkpoint-88326f6851319068e7b34981032128c0b1a6524d.tar.gz
+
https://github.com/hashicorp/go-msgpack/archive/71c2886f5a673a35f909803f38ece5810165097b.tar.gz
-> go-msgpack-71c2886f5a673a35f909803f38ece5810165097b.tar.gz
+
https://github.com/hashicorp/go-multierror/archive/fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz
-> go-multierror-fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz
+
https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz
-> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz
+
https://github.com/hashicorp/golang-lru/archive/995efda3e073b6946b175ed93901d729ad47466a.tar.gz
-> golang-lru-995efda3e073b6946b175ed93901d729ad47466a.tar.gz
+
https://github.com/hashicorp/hcl/archive/513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz
-> hcl-513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz
+
https://github.com/hashicorp/logutils/archive/367a65d59043b4f846d179341d138f01f988c186.tar.gz
-> logutils-367a65d59043b4f846d179341d138f01f988c186.tar.gz
+
https://github.com/hashicorp/memberlist/archive/6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz
-> memberlist-6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz
+
https://github.com/hashicorp/net-rpc-msgpackrpc/archive/d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz
-> net-rpc-msgpackrpc-d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz
+
https://github.com/hashicorp/raft/archive/a8065f298505708bf60f518c09178149f3c06f21.tar.gz
-> raft-a8065f298505708bf60f518c09178149f3c06f21.tar.gz
+
https://github.com/hashicorp/raft-boltdb/archive/d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz
-> raft-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz
+
https://github.com/hashicorp/raft-mdb/archive/4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz
-> raft-mdb-4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz
+
https://github.com/hashicorp/scada-client/archive/c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz
-> scada-client-c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz
+
https://github.com/hashicorp/serf/archive/558a6876882b2c5c61df29fd3990fb1765fd71d3.tar.gz
-> serf-558a6876882b2c5c61df29fd3990fb1765fd71d3.tar.gz
+
https://github.com/hashicorp/yamux/archive/b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz
-> yamux-b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz
+
https://github.com/inconshrevea
[gentoo-commits] repo/gentoo:master commit in: dev-libs/mathjax/
commit: ce5d0290cf89f7983af3f54691b09ee9e169d3d2
Author: Justin Lecher gentoo org>
AuthorDate: Fri Jan 22 19:40:24 2016 +
Commit: Justin Lecher gentoo org>
CommitDate: Fri Jan 22 21:03:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce5d0290
dev-libs/mathjax: Use egit_clean to clean workdir
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher gentoo.org>
dev-libs/mathjax/mathjax-2.2.ebuild | 6 --
dev-libs/mathjax/mathjax-2.4.0.ebuild | 6 --
dev-libs/mathjax/mathjax-2.5.3.ebuild | 6 --
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/dev-libs/mathjax/mathjax-2.2.ebuild
b/dev-libs/mathjax/mathjax-2.2.ebuild
index 5334ef6..5ced6b5 100644
--- a/dev-libs/mathjax/mathjax-2.2.ebuild
+++ b/dev-libs/mathjax/mathjax-2.2.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
+inherit eutils
+
DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath"
HOMEPAGE="http://www.mathjax.org/";
SRC_URI="https://github.com/mathjax/MathJax/archive/v${PV}.tar.gz ->
${P}.tar.gz"
@@ -33,7 +35,7 @@ make_webconf() {
}
src_prepare() {
- find . -name .gitignore -delete || die
+ egit_clean
}
src_install() {
diff --git a/dev-libs/mathjax/mathjax-2.4.0.ebuild
b/dev-libs/mathjax/mathjax-2.4.0.ebuild
index 663ef8b..e12285e 100644
--- a/dev-libs/mathjax/mathjax-2.4.0.ebuild
+++ b/dev-libs/mathjax/mathjax-2.4.0.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
+inherit eutils
+
DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath"
HOMEPAGE="http://www.mathjax.org/";
SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz ->
${P}.tar.gz"
@@ -33,7 +35,7 @@ make_webconf() {
}
src_prepare() {
- find . -name .gitignore -delete || die
+ egit_clean
}
src_install() {
diff --git a/dev-libs/mathjax/mathjax-2.5.3.ebuild
b/dev-libs/mathjax/mathjax-2.5.3.ebuild
index a0042a5..c36f178 100644
--- a/dev-libs/mathjax/mathjax-2.5.3.ebuild
+++ b/dev-libs/mathjax/mathjax-2.5.3.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
+inherit eutils
+
DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath"
HOMEPAGE="http://www.mathjax.org/";
SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz ->
${P}.tar.gz"
@@ -33,7 +35,7 @@ make_webconf() {
}
src_prepare() {
- find . -name .gitignore -delete || die
+ egit_clean
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libgit2/
commit: 0ad2f0f4f0c36a58363ad3225a9543fe330a9ede
Author: Justin Lecher gentoo org>
AuthorDate: Fri Jan 22 20:53:05 2016 +
Commit: Justin Lecher gentoo org>
CommitDate: Fri Jan 22 21:03:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ad2f0f4
dev-libs/libgit2: Use egit_clean to clean workdir
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher gentoo.org>
dev-libs/libgit2/libgit2-0.20.0-r1.ebuild | 4 ++--
dev-libs/libgit2/libgit2-0.21.5.ebuild| 4 ++--
dev-libs/libgit2/libgit2-0.22.3.ebuild| 4 ++--
dev-libs/libgit2/libgit2-0.23.2-r1.ebuild | 4 ++--
dev-libs/libgit2/libgit2-0.23.3.ebuild| 4 ++--
dev-libs/libgit2/libgit2-0.23.4.ebuild| 4 ++--
dev-libs/libgit2/libgit2-.ebuild | 4 ++--
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/dev-libs/libgit2/libgit2-0.20.0-r1.ebuild
b/dev-libs/libgit2/libgit2-0.20.0-r1.ebuild
index 3fdf8df..655222c 100644
--- a/dev-libs/libgit2/libgit2-0.20.0-r1.ebuild
+++ b/dev-libs/libgit2/libgit2-0.20.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -58,7 +58,7 @@ src_install() {
cmake-utils_src_install
if use examples ; then
- find examples -name .gitignore -delete || die
+ egit_clean examples
dodoc -r examples
docompress -x /usr/share/doc/${PF}/examples
fi
diff --git a/dev-libs/libgit2/libgit2-0.21.5.ebuild
b/dev-libs/libgit2/libgit2-0.21.5.ebuild
index 4397ec8..974af82 100644
--- a/dev-libs/libgit2/libgit2-0.21.5.ebuild
+++ b/dev-libs/libgit2/libgit2-0.21.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -56,7 +56,7 @@ src_install() {
cmake-utils_src_install
if use examples ; then
- find examples -name .gitignore -delete || die
+ egit_clean examples
dodoc -r examples
docompress -x /usr/share/doc/${PF}/examples
fi
diff --git a/dev-libs/libgit2/libgit2-0.22.3.ebuild
b/dev-libs/libgit2/libgit2-0.22.3.ebuild
index cfd605b..699bee9 100644
--- a/dev-libs/libgit2/libgit2-0.22.3.ebuild
+++ b/dev-libs/libgit2/libgit2-0.22.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -68,7 +68,7 @@ src_install() {
cmake-utils_src_install
if use examples ; then
- find examples -name .gitignore -delete || die
+ egit_clean examples
dodoc -r examples
docompress -x /usr/share/doc/${PF}/examples
fi
diff --git a/dev-libs/libgit2/libgit2-0.23.2-r1.ebuild
b/dev-libs/libgit2/libgit2-0.23.2-r1.ebuild
index ab7043e..9d9e445 100644
--- a/dev-libs/libgit2/libgit2-0.23.2-r1.ebuild
+++ b/dev-libs/libgit2/libgit2-0.23.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -69,7 +69,7 @@ src_install() {
cmake-utils_src_install
if use examples ; then
- find examples -name .gitignore -delete || die
+ egit_clean examples
dodoc -r examples
docompress -x /usr/share/doc/${PF}/examples
fi
diff --git a/dev-libs/libgit2/libgit2-0.23.3.ebuild
b/dev-libs/libgit2/libgit2-0.23.3.ebuild
index ab7043e..9d9e445 100644
--- a/dev-libs/libgit2/libgit2-0.23.3.ebuild
+++ b/dev-libs/libgit2/libgit2-0.23.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -69,7 +69,7 @@ src_install() {
cmake-utils_src_install
if use examples ; then
- find examples -name .gitignore -delete || die
+ egit_clean examples
dodoc -r examples
docompress -x /usr/share/doc/${PF}/examples
fi
diff --git a/dev-libs/libgit2/libgit2-0.23.4.ebuild
b/dev-libs/libgit2/libgit2-0.23.4.ebuild
index 3825289..d16e522 100644
--- a/dev-libs/libgit2/libgit2-0.23.4.ebuild
+++ b/dev-libs/libgit2/libgit2-0.23.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -69,7 +69,7 @@ src_install() {
cmake-utils_src_install
if use examples ; then
- find examples -name .gitignore -delete || die
+ egit_clean examples
dodoc -r examples
docompress -x /usr/share/doc/${PF}/e
[gentoo-commits] repo/gentoo:master commit in: eclass/
commit: 38e617b4cd65d8ec69c0c255d68d4e06e488c0d6
Author: Justin Lecher gentoo org>
AuthorDate: Fri Jan 22 19:21:29 2016 +
Commit: Justin Lecher gentoo org>
CommitDate: Fri Jan 22 21:03:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38e617b4
eutils.eclass: Add egit_clean()
Signed-off-by: Justin Lecher gentoo.org>
eclass/eutils.eclass | 10 ++
1 file changed, 10 insertions(+)
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 13bf1e6..68c2813 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -54,6 +54,16 @@ esvn_clean() {
find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
}
+# @FUNCTION: egit_clean
+# @USAGE: [list of dirs]
+# @DESCRIPTION:
+# Remove .git* directories/files recursiveley. Useful when a source tarball
+# contains internal Git directories. Defaults to $PWD.
+egit_clean() {
+ [[ -z $* ]] && set -- .
+ find "$@" -type d -name '.git*' -prune -print0 | xargs -0 rm -rf
+}
+
# @FUNCTION: estack_push
# @USAGE: [items to push]
# @DESCRIPTION:
[gentoo-commits] repo/gentoo:master commit in: dev-go/go-oauth2/
commit: 4871d5e6560ed9627b0dfcfb92c71a4e74dd0b3b
Author: Justin Lecher gentoo org>
AuthorDate: Fri Jan 22 20:56:07 2016 +
Commit: Justin Lecher gentoo org>
CommitDate: Fri Jan 22 21:03:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4871d5e6
dev-go/go-oauth2: Use egit_clean to clean workdir
* Sort global scope according to skel.ebuild
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher gentoo.org>
dev-go/go-oauth2/go-oauth2-0_pre20150701.ebuild | 27 -
dev-go/go-oauth2/go-oauth2-.ebuild | 8 ++--
2 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/dev-go/go-oauth2/go-oauth2-0_pre20150701.ebuild
b/dev-go/go-oauth2/go-oauth2-0_pre20150701.ebuild
index 9807b1b..be31d40 100644
--- a/dev-go/go-oauth2/go-oauth2-0_pre20150701.ebuild
+++ b/dev-go/go-oauth2/go-oauth2-0_pre20150701.ebuild
@@ -1,26 +1,33 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-inherit golang-base
+inherit eutils golang-base
-KEYWORDS="~amd64"
-DESCRIPTION="Go client implementation for OAuth 2.0 spec"
MY_PN=${PN##*-}
GO_PN=golang.org/x/${MY_PN}
-HOMEPAGE="https://godoc.org/${GO_PN}";
EGIT_COMMIT="8914e5017ca260f2a3a1575b1e6868874050d95e"
-SRC_URI="https://github.com/golang/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz ->
${P}.tar.gz
-https://github.com/GoogleCloudPlatform/gcloud-golang/archive/e34a32f9b0ecbc0784865fb2d47f3818c09521d4.tar.gz
-> gcloud-golang-e34a32f9b0ecbc0784865fb2d47f3818c09521d4.tar.gz"
-LICENSE="BSD"
+
+HOMEPAGE="https://godoc.org/${GO_PN}";
+DESCRIPTION="Go client implementation for OAuth 2.0 spec"
+SRC_URI="
+ https://github.com/golang/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz ->
${P}.tar.gz
+
https://github.com/GoogleCloudPlatform/gcloud-golang/archive/e34a32f9b0ecbc0784865fb2d47f3818c09521d4.tar.gz
-> gcloud-golang-e34a32f9b0ecbc0784865fb2d47f3818c09521d4.tar.gz"
+
SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64"
IUSE=""
-DEPEND="dev-go/go-net:=
+
+DEPEND="
+ dev-go/go-net:=
dev-go/go-tools:="
RDEPEND=""
+
S="${WORKDIR}/src/${GO_PN}"
+
EGIT_CHECKOUT_DIR="${S}"
STRIP_MASK="*.a"
@@ -54,7 +61,7 @@ src_test() {
src_install() {
insinto /usr/lib/go
- find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
+ egit_clean "${WORKDIR}"/{pkg,src}
insopts -m0644 -p # preserve timestamps for bug 551486
doins -r "${WORKDIR}"/{pkg,src}
}
diff --git a/dev-go/go-oauth2/go-oauth2-.ebuild
b/dev-go/go-oauth2/go-oauth2-.ebuild
index 89f44e6..ad4a9e1 100644
--- a/dev-go/go-oauth2/go-oauth2-.ebuild
+++ b/dev-go/go-oauth2/go-oauth2-.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
+
EGO_PN=golang.org/x/oauth2
EGO_SRC=golang.org/x/oauth2
@@ -18,9 +19,12 @@ inherit golang-build
DESCRIPTION="Go client implementation for OAuth 2.0 spec"
HOMEPAGE="https://godoc.org/golang.org/x/oauth2";
+
LICENSE="BSD"
SLOT="0/${PV}"
IUSE=""
-DEPEND="dev-go/go-net:=
+
+DEPEND="
+ dev-go/go-net:=
dev-go/go-tools:="
RDEPEND=""
[gentoo-commits] repo/gentoo:master commit in: app-vim/youcompleteme/
commit: c84c428b7d8795b6063f490739b76bab774668b7
Author: Justin Lecher gentoo org>
AuthorDate: Fri Jan 22 20:36:10 2016 +
Commit: Justin Lecher gentoo org>
CommitDate: Fri Jan 22 21:03:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c84c428b
app-vim/youcompleteme: Use egit_clean to clean workdir
* Add missing die
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher gentoo.org>
app-vim/youcompleteme/youcompleteme-20130910.ebuild | 20 +---
app-vim/youcompleteme/youcompleteme-.ebuild | 14 --
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/app-vim/youcompleteme/youcompleteme-20130910.ebuild
b/app-vim/youcompleteme/youcompleteme-20130910.ebuild
index cb098b8..4defa4f 100644
--- a/app-vim/youcompleteme/youcompleteme-20130910.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20130910.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
+
PYTHON_COMPAT=( python2_7 )
-inherit multilib python-single-r1 cmake-utils vim-plugin
+
+inherit eutils multilib python-single-r1 cmake-utils vim-plugin
if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="git://github.com/Valloric/YouCompleteMe.git"
@@ -54,14 +56,14 @@ src_configure() {
src_test() {
# TODO: use system gmock/gtest
- cd "${S}"/cpp
+ cd "${S}"/cpp ||Â die
emake ycm_core_tests
cd ycm/tests || die
LD_LIBRARY_PATH="${EROOT}"/usr/$(get_libdir)/llvm \
"${S}"/cpp/ycm/tests/ycm_core_tests || die
- cd "${S}"/python/ycm
- nosetests || die
+ cd "${S}"/python/ycm || die
+ nosetests --verbose || die
}
src_install() {
@@ -79,10 +81,6 @@ src_install() {
pkg_postinst() {
vim-plugin_pkg_postinst
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- elog
- elog "optional dependencies:"
- elog " dev-python/jedi (better python autocompletion)"
- elog
- fi
+ [[ -z ${REPLACING_VERSIONS} ]] && \
+ optfeature "better python autocompletion" dev-python/jedi
}
diff --git a/app-vim/youcompleteme/youcompleteme-.ebuild
b/app-vim/youcompleteme/youcompleteme-.ebuild
index aef2bf0..5a68855 100644
--- a/app-vim/youcompleteme/youcompleteme-.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
+
PYTHON_COMPAT=( python2_7 )
-inherit multilib python-single-r1 cmake-utils vim-plugin
+
+inherit eutils multilib python-single-r1 cmake-utils vim-plugin
if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="git://github.com/Valloric/YouCompleteMe.git"
@@ -78,16 +80,16 @@ src_configure() {
}
src_test() {
- cd "${S}/third_party/ycmd/cpp/ycm/tests"
+ cd "${S}/third_party/ycmd/cpp/ycm/tests" || die
LD_LIBRARY_PATH="${EROOT}"/usr/$(get_libdir)/llvm \
./ycm_core_tests || die
- cd "${S}"/python/ycm
+ cd "${S}"/python/ycm ||Â die
local dirs=( "${S}"/third_party/*/
"${S}"/third_party/ycmd/third_party/*/ )
local -x PYTHONPATH=${PYTHONPATH}:$(IFS=:; echo "${dirs[*]}")
- nosetests || die
+ nosetests --verbose || die
}
src_install() {
@@ -95,7 +97,7 @@ src_install() {
rm -r *.md *.sh COPYING.txt third_party/ycmd/cpp || die
rm -r third_party/ycmd/{*.md,*.sh} || die
find python -name *test* -exec rm -rf {} + || die
- find "${S}" -name '.git*' -exec rm -rf {} + || die
+ egit_clean
rm third_party/ycmd/libclang.so || die
vim-plugin_src_install
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
commit: 4b4456d612fa160bfbd974e2bf026daf733a8853
Author: Justin Lecher gentoo org>
AuthorDate: Fri Jan 22 19:36:44 2016 +
Commit: Justin Lecher gentoo org>
CommitDate: Fri Jan 22 21:03:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b4456d6
sci-mathematics/rstudio: Use egit_clean to clean workdir
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher gentoo.org>
sci-mathematics/rstudio/rstudio-0.97.336.ebuild| 13 -
sci-mathematics/rstudio/rstudio-0.97.551.ebuild| 13 -
sci-mathematics/rstudio/rstudio-0.98.1028.ebuild | 13 -
sci-mathematics/rstudio/rstudio-0.98.1091.ebuild | 13 -
sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild | 13 -
sci-mathematics/rstudio/rstudio-0.98.490.ebuild| 13 -
sci-mathematics/rstudio/rstudio-0.98.932.ebuild| 10 ++
sci-mathematics/rstudio/rstudio-0.98.953.ebuild| 10 ++
sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild | 13 -
sci-mathematics/rstudio/rstudio-0.99.482.ebuild| 13 -
sci-mathematics/rstudio/rstudio-0.99.483.ebuild| 13 -
sci-mathematics/rstudio/rstudio-0.99.484.ebuild| 13 -
sci-mathematics/rstudio/rstudio-0.99.486.ebuild| 13 -
13 files changed, 100 insertions(+), 63 deletions(-)
diff --git a/sci-mathematics/rstudio/rstudio-0.97.336.ebuild
b/sci-mathematics/rstudio/rstudio-0.97.336.ebuild
index f473f63..9b1726f 100644
--- a/sci-mathematics/rstudio/rstudio-0.97.336.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.97.336.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,7 +17,8 @@ GINVER=1.5
DESCRIPTION="IDE for the R language"
HOMEPAGE="http://www.rstudio.org";
-SRC_URI="https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz ->
${P}.tar.gz
+SRC_URI="
+ https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://s3.amazonaws.com/rstudio-buildtools/gin-${GINVER}.zip
https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWTVER}.zip
https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip";
@@ -29,7 +30,8 @@ IUSE="dedicated server"
QTVER=4.8
QTSLOT=4
-RDEPEND=">=dev-lang/R-2.11.1
+RDEPEND="
+ >=dev-lang/R-2.11.1
>=dev-libs/boost-1.50:=
dev-libs/mathjax
dev-libs/openssl:0
@@ -63,9 +65,10 @@ src_unpack() {
src_prepare() {
java-pkg-2_src_prepare
- find . -name .gitignore -delete || die
+ egit_clean
- epatch "${FILESDIR}"/${P}-prefs.patch \
+ epatch \
+ "${FILESDIR}"/${P}-prefs.patch \
"${FILESDIR}"/${P}-paths.patch \
"${FILESDIR}"/${P}-linker_flags.patch \
"${FILESDIR}"/${P}-boost-1.53.patch
diff --git a/sci-mathematics/rstudio/rstudio-0.97.551.ebuild
b/sci-mathematics/rstudio/rstudio-0.97.551.ebuild
index f473f63..9b1726f 100644
--- a/sci-mathematics/rstudio/rstudio-0.97.551.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.97.551.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,7 +17,8 @@ GINVER=1.5
DESCRIPTION="IDE for the R language"
HOMEPAGE="http://www.rstudio.org";
-SRC_URI="https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz ->
${P}.tar.gz
+SRC_URI="
+ https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://s3.amazonaws.com/rstudio-buildtools/gin-${GINVER}.zip
https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWTVER}.zip
https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip";
@@ -29,7 +30,8 @@ IUSE="dedicated server"
QTVER=4.8
QTSLOT=4
-RDEPEND=">=dev-lang/R-2.11.1
+RDEPEND="
+ >=dev-lang/R-2.11.1
>=dev-libs/boost-1.50:=
dev-libs/mathjax
dev-libs/openssl:0
@@ -63,9 +65,10 @@ src_unpack() {
src_prepare() {
java-pkg-2_src_prepare
- find . -name .gitignore -delete || die
+ egit_clean
- epatch "${FILESDIR}"/${P}-prefs.patch \
+ epatch \
+ "${FILESDIR}"/${P}-prefs.patch \
"${FILESDIR}"/${P}-paths.patch \
"${FILESDIR}"/${P}-linker_flags.patch \
"${FILESDIR}"/${P}-boost-1.53.patch
diff --git a/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild
b/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild
index 52dc926..2616424 100644
--- a/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -21,9 +21,11 @@ PACKRAT_VER=0.3.0
RM
[gentoo-commits] repo/gentoo:master commit in: x11-terms/rxvt-unicode/
commit: c92912aef9424e7f145736ee16ae8ddfcb86d631
Author: Justin Lecher gentoo org>
AuthorDate: Fri Jan 22 18:53:48 2016 +
Commit: Justin Lecher gentoo org>
CommitDate: Fri Jan 22 21:03:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c92912ae
x11-terms/rxvt-unicode: Use ecvs_clean to clean workdir
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher gentoo.org>
x11-terms/rxvt-unicode/metadata.xml | 54 -
x11-terms/rxvt-unicode/rxvt-unicode-.ebuild | 4 +-
2 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/x11-terms/rxvt-unicode/metadata.xml
b/x11-terms/rxvt-unicode/metadata.xml
index fec1922..02306c3 100644
--- a/x11-terms/rxvt-unicode/metadata.xml
+++ b/x11-terms/rxvt-unicode/metadata.xml
@@ -1,33 +1,33 @@
http://www.gentoo.org/dtd/metadata.dtd";>
-
-j...@gentoo.org
-Jeroen Roovers
-
-
-wi...@gentoo.org
-Alex Alexander
-
-
-Enable 256 color support
-Calculate the font width using a different
method
-Enable blinking text
-Store visible output to history buffer when
clearing the screen with ctrl-l.
+
+ j...@gentoo.org
+ Jeroen Roovers
+
+
+ wi...@gentoo.org
+ Alex Alexander
+
+
+ Enable 256 color support
+ Calculate the font width using a
different method
+ Enable blinking text
+ Store visible output to history
buffer when clearing the screen with ctrl-l.
Read https://bbs.archlinux.org/viewtopic.php?id=129302
-Enable colors fading when off focus
-Enable the urgent flag when a terminal window is
focused
-Enable support for bold and italic fonts
-Enable ISO-14755 support
-Enable scrolling via mouse wheel or buttons 4 and
5
-Enable perl script support. You can still disable this at
runtime with -pe ""
-Enable transparency support using gtk's pixbuf
-Support for wheel scrolling on secondary screens
(like mutt).
+ Enable colors fading when off
focus
+ Enable the urgent flag when a
terminal window is focused
+ Enable support for bold and italic
fonts
+ Enable ISO-14755 support
+ Enable scrolling via mouse wheel or
buttons 4 and 5
+ Enable perl script support. You can still
disable this at runtime with -pe ""
+ Enable transparency support using gtk's
pixbuf
+ Support for wheel scrolling on
secondary screens (like mutt).
Read
http://lists.schmorp.de/pipermail/rxvt-unicode/2011q4/001491.html
-Use 21 instead of 16 bits to represent unicode
characters
-Enable wide char width support
-
-
-cpe:/a:rxvt-unicode:rxvt-unicode
-
+ Use 21 instead of 16 bits to represent
unicode characters
+ Enable wide char width support
+
+
+ cpe:/a:rxvt-unicode:rxvt-unicode
+
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-.ebuild
b/x11-terms/rxvt-unicode/rxvt-unicode-.ebuild
index 8fc2643..e1354f1 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -42,7 +42,7 @@ DEPEND="
S=${WORKDIR}/${PN}
src_prepare() {
- find . -name CVS -type d -exec rm -fr {} \;
+ ecvs_clean
# fix for prefix not installing properly
epatch \
[gentoo-commits] repo/gentoo:master commit in: dev-libs/go-fuse/
commit: c97e26f4584d8359ad9e618b325072bd05cb0283
Author: Justin Lecher gentoo org>
AuthorDate: Fri Jan 22 21:02:54 2016 +
Commit: Justin Lecher gentoo org>
CommitDate: Fri Jan 22 21:03:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c97e26f4
dev-libs/go-fuse: Use egit_clean to clean workdir
* Sort global scope according to skel.ebuild
* Add missing die
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher gentoo.org>
dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild | 21 -
dev-libs/go-fuse/go-fuse-0_p20150422.ebuild| 18 ++-
dev-libs/go-fuse/go-fuse-.ebuild | 42 +-
3 files changed, 46 insertions(+), 35 deletions(-)
diff --git a/dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild
b/dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild
index eb4bbe6..ceebfb3 100644
--- a/dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild
+++ b/dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild
@@ -1,21 +1,28 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-KEYWORDS="~amd64"
-RESTRICT="strip"
-DESCRIPTION="FUSE bindings for Go"
+inherit eutils
+
GO_PN=github.com/hanwen/${PN}
-HOMEPAGE="https://${GO_PN}";
EGIT_COMMIT="8c85ded140ac1889372a0e22d8d21e3d10a303bd"
+
+HOMEPAGE="https://${GO_PN}";
+DESCRIPTION="FUSE bindings for Go"
SRC_URI="https://${GO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
+
SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64"
IUSE=""
+
DEPEND=">=dev-lang/go-1.3"
RDEPEND=""
+
+RESTRICT="strip"
+
S=${WORKDIR}
src_unpack() {
@@ -47,6 +54,6 @@ src_install() {
doins -r pkg
insinto /usr/lib/go/src
rm src/${GO_PN}/all.bash.patched || die
- find src/${GO_PN} -name .gitignore -delete
+ egit_clean src/${GO_PN}
doins -r src/*
}
diff --git a/dev-libs/go-fuse/go-fuse-0_p20150422.ebuild
b/dev-libs/go-fuse/go-fuse-0_p20150422.ebuild
index 839de1e..60eefb5 100644
--- a/dev-libs/go-fuse/go-fuse-0_p20150422.ebuild
+++ b/dev-libs/go-fuse/go-fuse-0_p20150422.ebuild
@@ -1,29 +1,33 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-KEYWORDS="~amd64"
-RESTRICT="strip"
-DESCRIPTION="FUSE bindings for Go"
+inherit eutils
+
GO_PN=github.com/hanwen/${PN}
-HOMEPAGE="https://${GO_PN}";
EGIT_COMMIT="ffed29ec8b88f61c1b8954134cc48ef03bb26ce1"
+
+HOMEPAGE="https://${GO_PN}";
+DESCRIPTION="FUSE bindings for Go"
SRC_URI="https://${GO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
+
SLOT="0"
+LICENSE="BSD"
KEYWORDS="~amd64"
IUSE=""
DEPEND=">=dev-lang/go-1.3"
RDEPEND=""
+RESTRICT="strip"
+
src_unpack() {
default_src_unpack
mkdir -p "${S}/src/${GO_PN%/*}" || die
mv ${PN}-${EGIT_COMMIT} "${S}/src/${GO_PN}" || die
- find "${S}" -name .gitignore -delete || die
+ egit_clean
}
call_go() {
diff --git a/dev-libs/go-fuse/go-fuse-.ebuild
b/dev-libs/go-fuse/go-fuse-.ebuild
index f3e190c..8b44f59 100644
--- a/dev-libs/go-fuse/go-fuse-.ebuild
+++ b/dev-libs/go-fuse/go-fuse-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -6,8 +6,6 @@ EAPI=5
inherit git-r3
-RESTRICT="strip"
-
DESCRIPTION="native bindings for the FUSE kernel module"
HOMEPAGE="https://github.com/hanwen/go-fuse";
EGIT_REPO_URI="https://github.com/hanwen/go-fuse.git";
@@ -20,37 +18,39 @@ IUSE=""
DEPEND=">=dev-lang/go-1.3"
RDEPEND=""
+RESTRICT="strip"
+
GO_PN="github.com/hanwen/${PN}"
EGIT_CHECKOUT_DIR="${S}/src/${GO_PN}"
export GOPATH="${S}"
src_compile() {
+ local d
#no examples right now
#example/hello example/loopback example/zipfs \
#example/multizip example/unionfs example/memfs \
#example/autounionfs ; \
#or tests
#fuse/test
-for d in fuse fuse/pathfs zipfs unionfs
-do
- go build -v -x -work ${GO_PN}/${d} || die
-done
+ for d in fuse fuse/pathfs zipfs unionfs; do
+ go build -v -x -work ${GO_PN}/${d} || die
+ done
}
src_install() {
-for d in fuse fuse/pathfs zipfs unionfs
-do
- go install -v -x -work ${GO_PN}/${d} || die
-done
-
-insinto /usr/lib/go/
-doins -r "${S}/pkg"
-insinto "/usr/lib/go/src/${GO_PN}/"
-#for this ebuild, to fix bug #503324 I have limited what is installed
-#another possible solution would have been using adddeny to the
-#hide installed filed during build
-rm -r "${S}/src/${GO_PN}/.git"
-doins -r "${S}/src/${GO_PN}/fuse"
-doins -r "${S}/src/${GO_PN}/splice"
+ local d
+ for d in fuse fuse/pathfs zipfs unionfs; do
+ go install -v -x -work ${GO_PN}/${d} || die
+ done
+
+ insinto /usr/lib/go/
+ doins -r "${S
[gentoo-commits] repo/gentoo:master commit in: dev-db/go-etcd/
commit: 3f6c102dc3d0d6454b7477d8a328b1995a3d432a
Author: Justin Lecher gentoo org>
AuthorDate: Fri Jan 22 20:47:17 2016 +
Commit: Justin Lecher gentoo org>
CommitDate: Fri Jan 22 21:03:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f6c102d
dev-db/go-etcd: Use egit_clean to clean workdir
* Sort global scope according to skel.ebuild
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher gentoo.org>
dev-db/go-etcd/go-etcd-0_p20141013-r1.ebuild | 14 +-
dev-db/go-etcd/go-etcd-2.0.0-r1.ebuild | 16 ++--
dev-db/go-etcd/go-etcd-2.0.0.ebuild | 18 --
3 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/dev-db/go-etcd/go-etcd-0_p20141013-r1.ebuild
b/dev-db/go-etcd/go-etcd-0_p20141013-r1.ebuild
index 8ea0f6d..15b9646 100644
--- a/dev-db/go-etcd/go-etcd-0_p20141013-r1.ebuild
+++ b/dev-db/go-etcd/go-etcd-0_p20141013-r1.ebuild
@@ -1,20 +1,24 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-KEYWORDS="~amd64"
-DESCRIPTION="Go client library for etcd"
+inherit eutils
GO_PN=github.com/coreos/${PN}
+DESCRIPTION="Go client library for etcd"
HOMEPAGE="https://${GO_PN}";
EGIT_COMMIT="25e2c63be8e8ab405014a78879e0992ae5ff55e8"
SRC_URI="https://${GO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
+
SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
IUSE=""
+
DEPEND=">=dev-lang/go-1.4"
RDEPEND=""
+
S=${WORKDIR}
src_unpack() {
@@ -38,6 +42,6 @@ src_install() {
insinto /usr/lib/go
doins -r pkg
insinto /usr/lib/go/src
- find src/${GO_PN} -name .gitignore -delete
+ egit_clean
doins -r src/*
}
diff --git a/dev-db/go-etcd/go-etcd-2.0.0-r1.ebuild
b/dev-db/go-etcd/go-etcd-2.0.0-r1.ebuild
index 79358b5..9cf4459 100644
--- a/dev-db/go-etcd/go-etcd-2.0.0-r1.ebuild
+++ b/dev-db/go-etcd/go-etcd-2.0.0-r1.ebuild
@@ -1,20 +1,24 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-KEYWORDS="~amd64"
-DESCRIPTION="Go client library for etcd"
GO_PN=github.com/coreos/${PN}
-HOMEPAGE="https://${GO_PN}";
EGIT_COMMIT="25e2c63be8e8ab405014a78879e0992ae5ff55e8"
+
+DESCRIPTION="Go client library for etcd"
+HOMEPAGE="https://${GO_PN}";
SRC_URI="https://${GO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
+
SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
IUSE=""
+
DEPEND=">=dev-lang/go-1.4:="
RDEPEND=""
+
S=${WORKDIR}
src_unpack() {
@@ -38,6 +42,6 @@ src_install() {
insinto /usr/lib/go
doins -r pkg
insinto /usr/lib/go/src
- find src/${GO_PN} -name .gitignore -delete
+ egit_clean
doins -r src/*
}
diff --git a/dev-db/go-etcd/go-etcd-2.0.0.ebuild
b/dev-db/go-etcd/go-etcd-2.0.0.ebuild
index 8ea0f6d..5139a55 100644
--- a/dev-db/go-etcd/go-etcd-2.0.0.ebuild
+++ b/dev-db/go-etcd/go-etcd-2.0.0.ebuild
@@ -1,20 +1,26 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-KEYWORDS="~amd64"
-DESCRIPTION="Go client library for etcd"
+inherit eutils
+
GO_PN=github.com/coreos/${PN}
-HOMEPAGE="https://${GO_PN}";
EGIT_COMMIT="25e2c63be8e8ab405014a78879e0992ae5ff55e8"
+
+DESCRIPTION="Go client library for etcd"
+HOMEPAGE="https://${GO_PN}";
SRC_URI="https://${GO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
+
SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
IUSE=""
+
DEPEND=">=dev-lang/go-1.4"
RDEPEND=""
+
S=${WORKDIR}
src_unpack() {
@@ -38,6 +44,6 @@ src_install() {
insinto /usr/lib/go
doins -r pkg
insinto /usr/lib/go/src
- find src/${GO_PN} -name .gitignore -delete
+ egit_clean
doins -r src/*
}
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: 113ddad0bc919c00e8b4e650b33068f4b30d04c2 Author: Michael Orlitzky gentoo org> AuthorDate: Fri Jan 22 20:34:52 2016 + Commit: Michael Orlitzky gentoo org> CommitDate: Fri Jan 22 20:35:26 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=113ddad0 profiles: mask >=app-eselect/eselect-php-0.9.0 for testing. profiles/package.mask | 4 1 file changed, 4 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index f908a30..f12e618 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -30,6 +30,10 @@ #--- END OF EXAMPLES --- +# Michael Orlitzky (22 Jan 2016) +# Masked for testing of new build system. +>=app-eselect/eselect-php-0.9.0 + # Alexis Ballier (22 Jan 2016) # Breaks some of its revdeps # https://bugs.gentoo.org/show_bug.cgi?id=572552
[gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-php/
commit: 9d3e2859e56afb38a751b56a0e79b7428265f917
Author: Michael Orlitzky gentoo org>
AuthorDate: Fri Jan 22 20:55:30 2016 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Fri Jan 22 20:55:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d3e2859
app-eselect/eselect-php: add version 0.9.1 (masked for testing).
Package-Manager: portage-2.2.26
app-eselect/eselect-php/Manifest | 1 +
app-eselect/eselect-php/eselect-php-0.9.1.ebuild | 66
2 files changed, 67 insertions(+)
diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest
index c1394eb..a5f7c7d 100644
--- a/app-eselect/eselect-php/Manifest
+++ b/app-eselect/eselect-php/Manifest
@@ -1,3 +1,4 @@
DIST eselect-php-0.7.1.bz2 2251 SHA256
10aa400e2d08bc71989366993f12ddb546a0ea29f191c40e37beba1d11d7abd7 SHA512
a6b4c1475dda9f368d799db7658c50cef7d6f71482a53a186fb1394e7ea1fff3c0ef123c82b7ca4d1e45aadb0a034d36f213fc9450766878a60d28639761cb3d
WHIRLPOOL
a4e45492068616ff30fd888b0cc64441a6eb6e6656e0107d00bd2cf15360dce15052d4d62089ab89d43e6bb36e126529aa101c70e8bd94a9fc916a5369463e3b
DIST eselect-php-0.8.2.tar.xz 51832 SHA256
3601d0612a19ccc1c5146be2c8cd7df955a37c517817ae4f59bb3ead446f5355 SHA512
da1d71affe275d07db7a76fd98fd89ffdea6f671262a615bf4dda5a1bba8d19e5d1a3c8afe3f1eb1e70fd71298476a6f0d4e73eba7aafe7555f018f89005bc3d
WHIRLPOOL
dcc75d93eeaaa85f63f5329491d010debd83ed2a82af0051d59ab4aff639703a6f4c1baa5388ed2a8867d6ab610740d5a1ac86d28cddb0de5be47872ada040b4
DIST eselect-php-0.8.5.tar.xz 45800 SHA256
73b1dfab538dad971644ae9542e311cd9160e5dff3947086fc7691f0fedb835d SHA512
dbb97ddca2cd031e57e1efccc2a92dcb7aa3c4a4813c72dc5ad688b8e32e4e2ec8083781c450e9c439a9e70f04c26249e335a4eb814ac944dfc6e2d06ca724f6
WHIRLPOOL
00d8a1b6e065962105b704e8a6ab806c6f8181a4ec4c266902854ce61cb4532063412449c623ea7288e49dd64c4a8b762b9771abb89664071ff81b7b9728a8e5
+DIST eselect-php-0.9.1.tar.xz 47548 SHA256
0c9768c9dd361dd3910f26e11956fc2121467ab56c52ba80d7620b1d757bc143 SHA512
bea84b4ae386d60cea2703d1b1c2a91bdc19188dfe151619750a1979dcfbdf2a2ada05d87faa7e0f371ab003e05be6fc7dd15f96459ae6e998c62e6d5caeb64a
WHIRLPOOL
3d74edfa6962942836aa3823e9901b461433ce57f2fcb624eb1652b36245599a1bc076db5cb902b675747f2255f00ac887a5e35859dbcf62279944595ea02d6c
diff --git a/app-eselect/eselect-php/eselect-php-0.9.1.ebuild
b/app-eselect/eselect-php/eselect-php-0.9.1.ebuild
new file mode 100644
index 000..c02040a
--- /dev/null
+++ b/app-eselect/eselect-php/eselect-php-0.9.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit depend.apache systemd
+
+DESCRIPTION="PHP eselect module"
+HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/";
+SRC_URI="
+ https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz
+ https://dev.gentoo.org/~grknight/distfiles/${P}.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux
~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="fpm apache2"
+
+# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
+RDEPEND="app-admin/eselect
+ apache2? ( www-servers/apache[apache2_modules_dir] )"
+
+want_apache
+
+src_configure(){
+ # We expect localstatedir to be "var"ish, not "var/lib"ish, because
+ # that's what PHP upstream expects. See for example the FPM
+ # configuration where they put logs in @localstatedir@/log.
+ econf --localstatedir="${EPREFIX}"/var $(use_enable apache2)
+}
+
+src_install() {
+ default
+
+ # After a while, this can go, along with the want_apache call and
+ # depend.apache eclass.
+ if use apache2 ; then
+ insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
+ newins "${FILESDIR}/70_mod_php5.backcompat.conf"
70_mod_php5.conf
+ fi
+
+ if use fpm ; then
+ newinitd "${FILESDIR}/php-fpm.init-r4" "php-fpm"
+ systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
+ exeinto /usr/libexec
+ doexe "${FILESDIR}/php-fpm-launcher"
+ fi
+}
+
+pkg_postinst() {
+ if use apache2 ; then
+ elog
+ elog "If you are upgrading, be warned that our mod_php
configuration"
+ elog "file has changed! You should now define -DPHP for the
apache2"
+ elog "daemon, and inspect the new 70_mod_php.conf which has
been"
+ elog "installed. Module loading involves eselect as of this
version."
+ elog
+ elog "You must run eselect at least once to choose your apache2
target"
+ elog "before the new configuration will work. Afterwards, and
after you"
+ elog "have reviewed your new configuration, you are advised to
remove"
+ elog "t
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/metadata/
commit: 765e1a19e6f4d16ae279bf15b0ce120876cd5815
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 11:56:25 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Fri Jan 22 18:44:12 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=765e1a19
repoman: Migrate more metadata checks to ebuild_metadata.py
.../modules/scan/metadata/ebuild_metadata.py | 32 --
pym/repoman/scanner.py | 17
2 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/pym/repoman/modules/scan/metadata/ebuild_metadata.py
b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
index 2dc1db2..77c947e 100644
--- a/pym/repoman/modules/scan/metadata/ebuild_metadata.py
+++ b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
@@ -5,6 +5,8 @@
import re
import sys
+from repoman.qa_data import missingvars
+
if sys.hexversion >= 0x300:
basestring = str
@@ -16,7 +18,7 @@ class EbuildMetadata(object):
def __init__(self, **kwargs):
self.qatracker = kwargs.get('qatracker')
- def check(self, **kwargs):
+ def invalidchar(self, **kwargs):
ebuild = kwargs.get('ebuild')
for k, v in ebuild.metadata.items():
if not isinstance(v, basestring):
@@ -28,9 +30,35 @@ class EbuildMetadata(object):
"%s: %s variable contains non-ASCII "
"character at position %s" %
(ebuild.relative_path, k, m.start() +
1))
+ return {'continue': False}
+
+ def missing(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
+ for pos, missing_var in enumerate(missingvars):
+ if not ebuild.metadata.get(missing_var):
+ if kwargs.get('catdir') == "virtual" and \
+ missing_var in ("HOMEPAGE", "LICENSE"):
+ continue
+ if kwargs.get('live_ebuild') and missing_var ==
"KEYWORDS":
+ continue
+ myqakey = missingvars[pos] + ".missing"
+ self.qatracker.add_error(myqakey, '%s/%s.ebuild'
+ % (kwargs.get('xpkg'),
kwargs.get('y_ebuild')))
+ return {'continue': False}
+
+ def old_virtual(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
if ebuild.metadata.get("PROVIDE"):
self.qatracker.add_error("virtual.oldstyle",
ebuild.relative_path)
+ return {'continue': False}
+ def virtual(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
+ if kwargs.get('catdir') == "virtual":
+ for var in ("HOMEPAGE", "LICENSE"):
+ if ebuild.metadata.get(var):
+ myqakey = var + ".virtual"
+ self.qatracker.add_error(myqakey,
ebuild.relative_path)
return {'continue': False}
@property
@@ -39,4 +67,4 @@ class EbuildMetadata(object):
@property
def runInEbuilds(self):
- return (True, [self.check])
+ return (True, [self.invalidchar, self.missing,
self.old_virtual, self.virtual])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 46f46f5..d42fd33 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -324,23 +324,6 @@ class Scanner(object):
if y_ebuild_continue:
continue
-
- for pos, missing_var in enumerate(missingvars):
- if not
dynamic_data['ebuild'].metadata.get(missing_var):
- if dynamic_data['catdir'] == "virtual"
and \
- missing_var in ("HOMEPAGE",
"LICENSE"):
- continue
- if dynamic_data['live_ebuild'] and
missing_var == "KEYWORDS":
- continue
- myqakey = missingvars[pos] + ".missing"
- self.qatracker.add_error(myqakey, xpkg
+ "/" + y_ebuild + ".ebuild")
-
- if dynamic_data['catdir'] == "virtual":
- for var in ("HOMEPAGE", "LICENSE"):
- if
dynamic_data['ebuild'].metadata.get(var):
- myqakey = var + ".virtual"
-
self.qatracker.add_error(myqakey, dynamic_data['ebuild'].relative_path)
-
if dynami
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 9530916467ff83ea1aa1947db35752cb7daca4d1 Author: Brian Dolbec gentoo org> AuthorDate: Sun Jan 3 21:55:33 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Fri Jan 22 18:44:13 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=95309164 repoman: Migrate additional dynamic data setting to the USEFlagsChecks pym/repoman/scanner.py | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 6d5416b..d5faded 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -283,7 +283,7 @@ class Scanner(object): def _scan_ebuilds(self, ebuildlist, dynamic_data): xpkg = dynamic_data['xpkg'] # detect unused local USE-descriptions - used_useflags = set() + dynamic_data['used_useflags'] = set() for y_ebuild in ebuildlist: dynamic_data['y_ebuild'] = y_ebuild @@ -324,8 +324,6 @@ class Scanner(object): if y_ebuild_continue: continue - used_useflags = used_useflags.union(dynamic_data['ebuild_UsedUseFlags']) - # license checks if not dynamic_data['badlicsyntax']: self.licensecheck.check(dynamic_data['pkg'], xpkg, dynamic_data['ebuild'], y_ebuild) @@ -535,7 +533,7 @@ class Scanner(object): # check if there are unused local USE-descriptions in metadata.xml # (unless there are any invalids, to avoid noise) if dynamic_data['allvalid']: - for myflag in dynamic_data['muselist'].difference(used_useflags): + for myflag in dynamic_data['muselist'].difference(dynamic_data['used_useflags']): self.qatracker.add_error( "metadata.warning", "%s/metadata.xml: unused local USE-description: '%s'"
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/ebuild/
commit: 9a3614f9afb96da3f8c51826681c263f48d3330f
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 17:33:26 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Fri Jan 22 18:44:12 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=9a3614f9
repoman: Move ebuild_archs to the Ebuild class
pym/repoman/modules/scan/ebuild/ebuild.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/pym/repoman/modules/scan/ebuild/ebuild.py
b/pym/repoman/modules/scan/ebuild/ebuild.py
index 5db5d72..1d5dc9e 100644
--- a/pym/repoman/modules/scan/ebuild/ebuild.py
+++ b/pym/repoman/modules/scan/ebuild/ebuild.py
@@ -36,6 +36,7 @@ class Ebuild(ScanBase):
self.eapi = None
self.inherited = None
self.keywords = None
+ self.archs = None
def _set_paths(self, **kwargs):
repolevel = kwargs.get('repolevel')
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/depend/
commit: bc0f134f0a6ce2d39806947cd903689d7e73
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jan 4 07:57:36 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Fri Jan 22 18:44:14 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=bc0f134f
repoman: Move the large depency checks loop to a new plugin
ProfileDependsChecks class
pym/repoman/modules/scan/depend/__init__.py | 8 ++
pym/repoman/modules/scan/depend/profile.py | 211
pym/repoman/repos.py| 1 +
pym/repoman/scanner.py | 181 +---
4 files changed, 227 insertions(+), 174 deletions(-)
diff --git a/pym/repoman/modules/scan/depend/__init__.py
b/pym/repoman/modules/scan/depend/__init__.py
index 73d3f8f..2dac94b 100644
--- a/pym/repoman/modules/scan/depend/__init__.py
+++ b/pym/repoman/modules/scan/depend/__init__.py
@@ -18,6 +18,14 @@ module_spec = {
'func_desc': {
},
},
+ 'profile-module': {
+ 'name': "profile",
+ 'class': "ProfileDependsChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
}
}
diff --git a/pym/repoman/modules/scan/depend/profile.py
b/pym/repoman/modules/scan/depend/profile.py
new file mode 100644
index 000..91c52cc
--- /dev/null
+++ b/pym/repoman/modules/scan/depend/profile.py
@@ -0,0 +1,211 @@
+# -*- coding:utf-8 -*-
+
+
+import copy
+from pprint import pformat
+
+from _emerge.Package import Package
+
+# import our initialized portage instance
+from repoman._portage import portage
+from portage.dep import Atom
+
+
+def sort_key(item):
+ return item[2].sub_path
+
+
+class ProfileDependsChecks(object):
+
+ def __init__(self, **kwargs):
+ self.qatracker = kwargs.get('qatracker')
+ self.portdb = kwargs.get('portdb')
+ self.profiles = kwargs.get('profiles')
+ self.options = kwargs.get('options')
+ self.repo_settings = kwargs.get('repo_settings')
+ self.include_arches = kwargs.get('include_arches')
+ self.caches = kwargs.get('caches')
+ self.repoman_incrementals = kwargs.get('repoman_incrementals')
+ self.env = kwargs.get('env')
+ self.have = kwargs.get('have')
+ self.dev_keywords = kwargs.get('dev_keywords')
+
+ def check(self, **kwargs):
+ arches = kwargs.get('arches')
+ ebuild = kwargs.get('ebuild')
+ pkg = kwargs.get('pkg')
+ baddepsyntax = kwargs.get('baddepsyntax')
+ unknown_pkgs = kwargs.get('unknown_pkgs')
+
+ relevant_profiles = []
+ for keyword, arch, groups in arches:
+ if arch not in self.profiles:
+ # A missing profile will create an error
further down
+ # during the KEYWORDS verification.
+ continue
+
+ if self.include_arches is not None:
+ if arch not in self.include_arches:
+ continue
+
+ relevant_profiles.extend(
+ (keyword, groups, prof) for prof in
self.profiles[arch])
+
+ relevant_profiles.sort(key=sort_key)
+
+ for keyword, groups, prof in relevant_profiles:
+
+ is_stable_profile = prof.status == "stable"
+ is_dev_profile = prof.status == "dev" and \
+ self.options.include_dev
+ is_exp_profile = prof.status == "exp" and \
+ self.options.include_exp_profiles == 'y'
+ if not (is_stable_profile or is_dev_profile or
is_exp_profile):
+ continue
+
+ dep_settings = self.caches['arch'].get(prof.sub_path)
+ if dep_settings is None:
+ dep_settings = portage.config(
+ config_profile_path=prof.abs_path,
+
config_incrementals=self.repoman_incrementals,
+
config_root=self.repo_settings.config_root,
+ local_config=False,
+
_unmatched_removal=self.options.unmatched_removal,
+ env=self.env,
repositories=self.repo_settings.repoman_settings.repositories)
+ dep_settings.categories =
self.repo_settings.repoman_settings.categories
+ if self.opti
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/metadata/, pym/repoman/
commit: 009529b32d753e53e43673c53db8004703a53c17
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 10:35:49 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Fri Jan 22 18:44:10 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=009529b3
repoman: Migrate code from _scan_ebuilds to a new EbuildMetadata class and check
pym/repoman/modules/scan/metadata/__init__.py | 10 +-
.../modules/scan/metadata/ebuild_metadata.py | 39 ++
pym/repoman/scanner.py | 27 +--
3 files changed, 49 insertions(+), 27 deletions(-)
diff --git a/pym/repoman/modules/scan/metadata/__init__.py
b/pym/repoman/modules/scan/metadata/__init__.py
index 7327ec0..eba6565 100644
--- a/pym/repoman/modules/scan/metadata/__init__.py
+++ b/pym/repoman/modules/scan/metadata/__init__.py
@@ -10,7 +10,7 @@ module_spec = {
'name': 'metadata',
'description': doc,
'provides':{
- 'metadata-module': {
+ 'pkg-metadata': {
'name': "pkgmetadata",
'class': "PkgMetadata",
'description': doc,
@@ -18,6 +18,14 @@ module_spec = {
'func_desc': {
},
},
+ 'ebuild-metadata': {
+ 'name': "ebuild_metadata",
+ 'class': "EbuildMetadata",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
}
}
diff --git a/pym/repoman/modules/scan/metadata/ebuild_metadata.py
b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
new file mode 100644
index 000..143a40e
--- /dev/null
+++ b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
@@ -0,0 +1,39 @@
+# -*- coding:utf-8 -*-
+
+'''Ebuild Metadata Checks'''
+
+import re
+import sys
+
+if sys.hexversion >= 0x300:
+ basestring = str
+
+NON_ASCII_RE = re.compile(r'[^\x00-\x7f]')
+
+
+class EbuildMetadata(object):
+
+ def __init__(self, **kwargs):
+ self.qatracker = kwargs.get('qatracker')
+
+ def check(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
+ for k, v in ebuild.metadata.items():
+ if not isinstance(v, basestring):
+ continue
+ m = NON_ASCII_RE.search(v)
+ if m is not None:
+ self.qatracker.add_error(
+ "variable.invalidchar",
+ "%s: %s variable contains non-ASCII "
+ "character at position %s" %
+ (ebuild.relative_path, k, m.start() +
1))
+ return {'continue': False}
+
+ @property
+ def runInPkgs(self):
+ return (False, [])
+
+ @property
+ def runInEbuilds(self):
+ return (True, [self.check])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index a8aa2f3..6f3fb53 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -5,8 +5,6 @@ from __future__ import print_function, unicode_literals
import copy
import io
import logging
-import re
-import sys
from itertools import chain
from pprint import pformat
@@ -47,18 +45,10 @@ MODULE_CONTROLLER = Modules(path=MODULES_PATH,
namepath="repoman.modules.scan")
MODULE_NAMES = MODULE_CONTROLLER.module_names[:]
-
-if sys.hexversion >= 0x300:
- basestring = str
-
-NON_ASCII_RE = re.compile(r'[^\x00-\x7f]')
-
-
def sort_key(item):
return item[2].sub_path
-
class Scanner(object):
'''Primary scan class. Operates all the small Q/A tests and checks'''
@@ -311,7 +301,7 @@ class Scanner(object):
# initialize per ebuild plugin checks here
# need to set it up for ==> self.modules_list or some
other ordered list
for mod in [('ebuild', 'Ebuild'), ('live',
'LiveEclassChecks'),
- ('eapi', 'EAPIChecks')]:
+ ('eapi', 'EAPIChecks'), ('ebuild_metadata',
'EbuildMetadata')]:
if mod[0]:
mod_class =
MODULE_CONTROLLER.get_class(mod[0])
logging.debug("Initializing class name:
%s", mod_class.__name__)
@@ -338,21 +328,6 @@ class Scanner(object):
if y_ebuild_continue:
continue
-
- for k, v in dynamic_data['ebuild'].metadata.items():
- if not isinstance(v, basestring):
- continue
- m = NON_ASCII_RE.search(v)
-
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/metadata/
commit: 5ad8ca64e95010fa6acc3862f8d95c551b3d7300
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 11:31:26 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Fri Jan 22 18:44:12 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=5ad8ca64
scanner.py: Migrate another metadata check to ebuild_metadata
pym/repoman/modules/scan/metadata/ebuild_metadata.py | 3 +++
pym/repoman/scanner.py | 2 --
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pym/repoman/modules/scan/metadata/ebuild_metadata.py
b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
index 143a40e..2dc1db2 100644
--- a/pym/repoman/modules/scan/metadata/ebuild_metadata.py
+++ b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
@@ -28,6 +28,9 @@ class EbuildMetadata(object):
"%s: %s variable contains non-ASCII "
"character at position %s" %
(ebuild.relative_path, k, m.start() +
1))
+ if ebuild.metadata.get("PROVIDE"):
+ self.qatracker.add_error("virtual.oldstyle",
ebuild.relative_path)
+
return {'continue': False}
@property
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index e6a17cd..46f46f5 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -324,8 +324,6 @@ class Scanner(object):
if y_ebuild_continue:
continue
- if dynamic_data['ebuild'].metadata.get("PROVIDE"):
- self.qatracker.add_error("virtual.oldstyle",
dynamic_data['ebuild'].relative_path)
for pos, missing_var in enumerate(missingvars):
if not
dynamic_data['ebuild'].metadata.get(missing_var):
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/metadata/
commit: 1ed552fd83a5795944afe8f1971ee831fd42c423
Author: Brian Dolbec gentoo org>
AuthorDate: Thu Jan 21 18:29:07 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Fri Jan 22 18:44:15 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=1ed552fd
repoman: Fix a traceback due to xmlint not being installed for a manifest
generation
Mike helped find teh fact that self.binary was None, causing the misleading
traceback.
Tighten up the logic in XmlLint.
Bypass the PkgMetadata check for manifest mode.
floppym@naomi btrfs-progs % repoman manifest
>>> Creating Manifest for /home/floppym/repos/gentoo/sys-fs/btrfs-progs
Traceback (most recent call last):
File "/home/floppym/bin/repoman", line 37, in
repoman_main(sys.argv[1:])
File "/home/floppym/src/portage/pym/repoman/main.py", line 111, in
repoman_main
can_force = scanner.scan_pkgs(can_force)
File "/home/floppym/src/portage/pym/repoman/scanner.py", line 242, in
scan_pkgs
rdata = func(**dynamic_data)
File
"/home/floppym/src/portage/pym/repoman/modules/scan/metadata/pkgmetadata.py",
line 180, in check
if not self.xmllint.check(checkdir, repolevel):
File "/home/floppym/src/portage/pym/repoman/_xml.py", line 98, in check
os.path.join(checkdir, "metadata.xml"
TypeError: unsupported operand type(s) for +: 'NoneType' and 'str'
pym/repoman/_xml.py | 2 +-
pym/repoman/modules/scan/metadata/pkgmetadata.py | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/pym/repoman/_xml.py b/pym/repoman/_xml.py
index 2661f14..f7ff9fb 100644
--- a/pym/repoman/_xml.py
+++ b/pym/repoman/_xml.py
@@ -60,6 +60,7 @@ class XmlLint(object):
self.repoman_settings = repoman_settings
self._is_capable = metadata_dtd is not None
self.binary = None
+ self._is_capable = False
self._check_capable()
def _check_capable(self):
@@ -68,7 +69,6 @@ class XmlLint(object):
self.binary = find_binary('xmllint')
if not self.binary:
print(red("!!! xmllint not found. Can't check
metadata.xml.\n"))
- self._is_capable = False
elif not self._is_capable:
if not fetch_metadata_dtd(self.metadata_dtd,
self.repoman_settings):
sys.exit(1)
diff --git a/pym/repoman/modules/scan/metadata/pkgmetadata.py
b/pym/repoman/modules/scan/metadata/pkgmetadata.py
index 220fd23..8e93457 100644
--- a/pym/repoman/modules/scan/metadata/pkgmetadata.py
+++ b/pym/repoman/modules/scan/metadata/pkgmetadata.py
@@ -71,6 +71,9 @@ class PkgMetadata(ScanBase):
repolevel = kwargs.get('repolevel')
self.musedict = {}
+ if self.options.mode in ['manifest']:
+ return {'continue': False, 'muselist':
frozenset(self.musedict)}
+
# metadata.xml file check
if "metadata.xml" not in checkdirlist:
self.qatracker.add_error("metadata.missing", xpkg +
"/metadata.xml")
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/depend/
commit: a654b5a760b288303f1435cc760d331e38ccb17b
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jan 4 08:09:33 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Fri Jan 22 18:44:14 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a654b5a7
repoman: Create a new DependUnknown plugin class
pym/repoman/modules/scan/depend/__init__.py | 8
pym/repoman/modules/scan/depend/unknown.py | 30 +
pym/repoman/scanner.py | 10 +-
3 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/pym/repoman/modules/scan/depend/__init__.py
b/pym/repoman/modules/scan/depend/__init__.py
index 2dac94b..6b4 100644
--- a/pym/repoman/modules/scan/depend/__init__.py
+++ b/pym/repoman/modules/scan/depend/__init__.py
@@ -26,6 +26,14 @@ module_spec = {
'func_desc': {
},
},
+ 'unknown-module': {
+ 'name': "unknown",
+ 'class': "DependUnknown",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
}
}
diff --git a/pym/repoman/modules/scan/depend/unknown.py
b/pym/repoman/modules/scan/depend/unknown.py
new file mode 100644
index 000..61d51b9
--- /dev/null
+++ b/pym/repoman/modules/scan/depend/unknown.py
@@ -0,0 +1,30 @@
+# -*- coding:utf-8 -*-
+
+
+class DependUnknown(object):
+
+ def __init__(self, **kwargs):
+ self.qatracker = kwargs.get('qatracker')
+
+ def check(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
+ baddepsyntax = kwargs.get('baddepsyntax')
+ unknown_pkgs = kwargs.get('unknown_pkgs')
+
+ if not baddepsyntax and unknown_pkgs:
+ type_map = {}
+ for mytype, atom in unknown_pkgs:
+ type_map.setdefault(mytype, set()).add(atom)
+ for mytype, atoms in type_map.items():
+ self.qatracker.add_error(
+ "dependency.unknown", "%s: %s: %s"
+ % (ebuild.relative_path, mytype, ",
".join(sorted(atoms
+ return {'continue': False}
+
+ @property
+ def runInPkgs(self):
+ return (False, [])
+
+ @property
+ def runInEbuilds(self):
+ return (True, [self.check])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 9223876..1cd37d0 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -289,6 +289,7 @@ class Scanner(object):
('mtime', 'MtimeChecks'), ('multicheck',
'MultiCheck'),
# Options.is_forced() is used to bypass further
checks
('options', 'Options'), ('profile',
'ProfileDependsChecks'),
+ ('unknown', 'DependUnknown'),
]:
if mod[0]:
mod_class =
MODULE_CONTROLLER.get_class(mod[0])
@@ -316,15 +317,6 @@ class Scanner(object):
if y_ebuild_continue:
continue
- if not dynamic_data['baddepsyntax'] and
dynamic_data['unknown_pkgs']:
- type_map = {}
- for mytype, atom in
dynamic_data['unknown_pkgs']:
- type_map.setdefault(mytype,
set()).add(atom)
- for mytype, atoms in type_map.items():
- self.qatracker.add_error(
- "dependency.unknown", "%s: %s:
%s"
- %
(dynamic_data['ebuild'].relative_path, mytype, ", ".join(sorted(atoms
-
# check if there are unused local USE-descriptions in
metadata.xml
# (unless there are any invalids, to avoid noise)
if dynamic_data['allvalid']:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/eclasses/, ...
commit: ceb927e73c6be278eb6187e17317000c1fb6a52f
Author: Brian Dolbec gentoo org>
AuthorDate: Fri Jan 8 08:46:01 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Fri Jan 22 18:44:12 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ceb927e7
repoman: Create RubyEclassChecks class plugin
pym/repoman/checks/ebuilds/eclasses/__init__.py| 0
pym/repoman/modules/scan/eclasses/__init__.py | 8
.../{checks/ebuilds => modules/scan}/eclasses/ruby.py | 18 ++
pym/repoman/scanner.py | 9 ++---
4 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/eclasses/__init__.py
b/pym/repoman/checks/ebuilds/eclasses/__init__.py
deleted file mode 100644
index e69de29..000
diff --git a/pym/repoman/modules/scan/eclasses/__init__.py
b/pym/repoman/modules/scan/eclasses/__init__.py
index a821f5c..70a6252 100644
--- a/pym/repoman/modules/scan/eclasses/__init__.py
+++ b/pym/repoman/modules/scan/eclasses/__init__.py
@@ -18,6 +18,14 @@ module_spec = {
'func_kwargs': {
},
},
+ 'ruby-module': {
+ 'name': "ruby",
+ 'class': "RubyEclassChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_kwargs': {
+ },
+ },
}
}
diff --git a/pym/repoman/checks/ebuilds/eclasses/ruby.py
b/pym/repoman/modules/scan/eclasses/ruby.py
similarity index 62%
rename from pym/repoman/checks/ebuilds/eclasses/ruby.py
rename to pym/repoman/modules/scan/eclasses/ruby.py
index e8d36ea..4dc5d62 100644
--- a/pym/repoman/checks/ebuilds/eclasses/ruby.py
+++ b/pym/repoman/modules/scan/eclasses/ruby.py
@@ -4,19 +4,23 @@ Performs Ruby eclass checks
'''
from repoman.qa_data import ruby_deprecated
+from repoman.modules.scan.scanbase import ScanBase
-class RubyEclassChecks(object):
+class RubyEclassChecks(ScanBase):
'''Performs checks for the usage of Ruby eclasses in ebuilds'''
- def __init__(self, qatracker):
+ def __init__(self, **kwargs):
'''
@param qatracker: QATracker instance
'''
- self.qatracker = qatracker
+ super(RubyEclassChecks, self).__init__(**kwargs)
+ self.qatracker = kwargs.get('qatracker')
self.old_ruby_eclasses = ["ruby-ng", "ruby-fakegem", "ruby"]
- def check(self, pkg, ebuild):
+ def check(self, **kwargs):
+ pkg = kwargs.get('pkg')
+ ebuild = kwargs.get('ebuild')
is_inherited = lambda eclass: eclass in pkg.inherited
is_old_ruby_eclass_inherited = filter(
is_inherited, self.old_ruby_eclasses)
@@ -30,3 +34,9 @@ class RubyEclassChecks(object):
"IUSE.rubydeprecated",
(ebuild.relative_path + ":
Deprecated ruby target: %s")
% myruby)
+ return {'continue': False}
+
+ @property
+ def runInEbuilds(self):
+ '''Ebuild level scans'''
+ return (True, [self.check])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 0227a93..e6a17cd 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -18,7 +18,6 @@ from portage import _unicode_encode
from portage.dep import Atom
from portage.output import green
from repoman.checks.ebuilds.checks import run_checks
-from repoman.checks.ebuilds.eclasses.ruby import RubyEclassChecks
from repoman.checks.ebuilds.variables.license import LicenseChecks
from repoman.checks.ebuilds.variables.restrict import RestrictChecks
from repoman.modules.commit import repochecks
@@ -211,7 +210,6 @@ class Scanner(object):
self.modules[mod_class.__name__] =
mod_class(**self.kwargs)
# initialize our checks classes here before the big xpkg loop
- self.rubyeclasscheck = RubyEclassChecks(self.qatracker)
self.licensecheck = LicenseChecks(self.qatracker, liclist,
liclist_deprecated)
self.restrictcheck = RestrictChecks(self.qatracker)
@@ -298,7 +296,7 @@ class Scanner(object):
('thirdpartymirrors', 'ThirdPartyMirrors'),
('description', 'DescriptionChecks'), (None,
'KeywordChecks'),
('arches', 'ArchChecks'), ('depend',
'DependChecks'),
- ('use_flags', 'USEFlagChecks'),
+ ('use_flags', 'USEFlagChecks'), ('ruby',
'RubyEclassChecks'),
]:
if mod[0]:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/variables/, ...
commit: 705c1e23c2599a9b990df5b5ba5652b5f2a3accb
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 23:09:27 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Fri Jan 22 18:44:13 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=705c1e23
repoman: Migrate license checks to a plugin module
pym/repoman/checks/ebuilds/variables/license.py | 47 --
pym/repoman/modules/scan/metadata/__init__.py | 8
pym/repoman/modules/scan/metadata/license.py| 53 +
pym/repoman/scanner.py | 7 +---
4 files changed, 62 insertions(+), 53 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/variables/license.py
b/pym/repoman/checks/ebuilds/variables/license.py
deleted file mode 100644
index bdc859c..000
--- a/pym/repoman/checks/ebuilds/variables/license.py
+++ /dev/null
@@ -1,47 +0,0 @@
-
-'''description.py
-Perform checks on the LICENSE variable.
-'''
-
-# import our initialized portage instance
-from repoman._portage import portage
-
-
-class LicenseChecks(object):
- '''Perform checks on the LICENSE variable.'''
-
- def __init__(self, qatracker, liclist, liclist_deprecated):
- '''
- @param qatracker: QATracker instance
- @param liclist: List of licenses.
- @param liclist: List of deprecated licenses.
- '''
- self.qatracker = qatracker
- self.liclist = liclist
- self.liclist_deprecated = liclist_deprecated
-
- def check(
- self, pkg, package, ebuild, y_ebuild):
- '''
- @param pkg: Package in which we check (object).
- @param package: Package in which we check (string).
- @param ebuild: Ebuild which we check (object).
- @param y_ebuild: Ebuild which we check (string).
- '''
-
- # Parse the LICENSE variable, remove USE conditions and flatten
it.
- licenses = portage.dep.use_reduce(
- pkg._metadata["LICENSE"], matchall=1, flat=True)
-
- # Check each entry to ensure that it exists in
${PORTDIR}/licenses/.
- for lic in licenses:
- # Need to check for "||" manually as no portage
- # function will remove it without removing values.
- if lic not in self.liclist and lic != "||":
- self.qatracker.add_error(
- "LICENSE.invalid",
- package + "/" + y_ebuild + ".ebuild:
%s" % lic)
- elif lic in self.liclist_deprecated:
- self.qatracker.add_error(
- "LICENSE.deprecated",
- "%s: %s" % (ebuild.relative_path, lic))
diff --git a/pym/repoman/modules/scan/metadata/__init__.py
b/pym/repoman/modules/scan/metadata/__init__.py
index 2506521..ed0c59d 100644
--- a/pym/repoman/modules/scan/metadata/__init__.py
+++ b/pym/repoman/modules/scan/metadata/__init__.py
@@ -34,6 +34,14 @@ module_spec = {
'func_desc': {
},
},
+ 'license-metadata': {
+ 'name': "license",
+ 'class': "LicenseChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
}
}
diff --git a/pym/repoman/modules/scan/metadata/license.py
b/pym/repoman/modules/scan/metadata/license.py
new file mode 100644
index 000..b022b20
--- /dev/null
+++ b/pym/repoman/modules/scan/metadata/license.py
@@ -0,0 +1,53 @@
+
+'''license.py
+Perform checks on the LICENSE variable.
+'''
+
+# import our initialized portage instance
+from repoman._portage import portage
+
+
+class LicenseChecks(object):
+ '''Perform checks on the LICENSE variable.'''
+
+ def __init__(self, **kwargs):
+ '''
+ @param qatracker: QATracker instance
+ @param repo_metadata: dictionary of various repository items.
+ '''
+ self.qatracker = kwargs.get('qatracker')
+ self.repo_metadata = kwargs.get('repo_metadata')
+
+ def check(self, **kwargs):
+ '''
+ @param xpkg: Package in which we check (string).
+ @param ebuild: Ebuild which we check (object).
+ @param y_ebuild: Ebuild which we check (string).
+ '''
+ xpkg = kwargs.get('xpkg')
+ ebuild = kwargs.get('ebuild')
+ y_ebuild = kwargs.get('y_ebuild')
+ if not kwargs.get('badlicsyntax'):
+ # Parse the LICENSE variable, remove USE conditions and
flatte
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/directories/, pym/repoman/
commit: 53c62710cc5c5fa7c2a11a01a825edaee454c073
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 23:23:52 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Fri Jan 22 18:44:13 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=53c62710
repoman: Migrate code to a new MtimeChecks class in directories plugin
pym/repoman/modules/scan/directories/__init__.py | 8
pym/repoman/modules/scan/directories/mtime.py| 24
pym/repoman/scanner.py | 5 +
3 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/pym/repoman/modules/scan/directories/__init__.py
b/pym/repoman/modules/scan/directories/__init__.py
index 7fe9f0e..b9daef0 100644
--- a/pym/repoman/modules/scan/directories/__init__.py
+++ b/pym/repoman/modules/scan/directories/__init__.py
@@ -18,6 +18,14 @@ module_spec = {
'func_kwargs': {
},
},
+ 'mtime-module': {
+ 'name': "mtime",
+ 'class': "MtimeChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_kwargs': {
+ },
+ },
}
}
diff --git a/pym/repoman/modules/scan/directories/mtime.py
b/pym/repoman/modules/scan/directories/mtime.py
new file mode 100644
index 000..e113cdd
--- /dev/null
+++ b/pym/repoman/modules/scan/directories/mtime.py
@@ -0,0 +1,24 @@
+
+
+class MtimeChecks(object):
+
+ def __init__(self, **kwargs):
+ self.vcs_settings = kwargs.get('vcs_settings')
+
+ def check(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
+ changed = kwargs.get('changed')
+ pkg = kwargs.get('pkg')
+ if not self.vcs_settings.vcs_preserves_mtime:
+ if ebuild.ebuild_path not in changed.new_ebuilds and \
+ ebuild.ebuild_path not in
changed.ebuilds:
+ pkg.mtime = None
+ return {'continue': False}
+
+ @property
+ def runInPkgs(self):
+ return (False, [])
+
+ @property
+ def runInEbuilds(self):
+ return (True, [self.check])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 8657c73..b00dbd9 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -293,6 +293,7 @@ class Scanner(object):
('arches', 'ArchChecks'), ('depend',
'DependChecks'),
('use_flags', 'USEFlagChecks'), ('ruby',
'RubyEclassChecks'),
('license', 'LicenseChecks'), ('restrict',
'RestrictChecks'),
+ ('mtime', 'MtimeChecks'),
]:
if mod[0]:
mod_class =
MODULE_CONTROLLER.get_class(mod[0])
@@ -321,10 +322,6 @@ class Scanner(object):
continue
# Syntax Checks
- if not self.vcs_settings.vcs_preserves_mtime:
- if dynamic_data['ebuild'].ebuild_path not in
self.changed.new_ebuilds and \
- dynamic_data['ebuild'].ebuild_path not
in self.changed.ebuilds:
- dynamic_data['pkg'].mtime = None
try:
# All ebuilds should have utf_8 encoding.
f = io.open(
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/metadata/, pym/repoman/, ...
commit: a475cee940d23a530b533545505c07cf8500e03d
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 23:10:48 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Fri Jan 22 18:44:13 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a475cee9
repoman: Migrate RestrictChecks to a plugin module
pym/repoman/modules/scan/metadata/__init__.py | 8 ++
.../scan/metadata}/restrict.py | 29 +++---
pym/repoman/scanner.py | 7 +-
3 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/pym/repoman/modules/scan/metadata/__init__.py
b/pym/repoman/modules/scan/metadata/__init__.py
index ed0c59d..6ab44f6 100644
--- a/pym/repoman/modules/scan/metadata/__init__.py
+++ b/pym/repoman/modules/scan/metadata/__init__.py
@@ -42,6 +42,14 @@ module_spec = {
'func_desc': {
},
},
+ 'restrict-metadata': {
+ 'name': "restrict",
+ 'class': "RestrictChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
}
}
diff --git a/pym/repoman/checks/ebuilds/variables/restrict.py
b/pym/repoman/modules/scan/metadata/restrict.py
similarity index 54%
rename from pym/repoman/checks/ebuilds/variables/restrict.py
rename to pym/repoman/modules/scan/metadata/restrict.py
index 215b792..93ca298 100644
--- a/pym/repoman/checks/ebuilds/variables/restrict.py
+++ b/pym/repoman/modules/scan/metadata/restrict.py
@@ -12,21 +12,23 @@ from repoman.qa_data import valid_restrict
class RestrictChecks(object):
'''Perform checks on the RESTRICT variable.'''
- def __init__(self, qatracker):
+ def __init__(self, **kwargs):
'''
@param qatracker: QATracker instance
'''
- self.qatracker = qatracker
+ self.qatracker = kwargs.get('qatracker')
- def check(self, pkg, package, ebuild, y_ebuild):
+ def check(self, **kwargs):
+ xpkg = kwargs.get('xpkg')
+ ebuild = kwargs.get('ebuild')
+ y_ebuild = kwargs.get('y_ebuild')
myrestrict = None
try:
myrestrict = portage.dep.use_reduce(
- pkg._metadata["RESTRICT"], matchall=1,
flat=True)
+ ebuild.metadata["RESTRICT"], matchall=1,
flat=True)
except portage.exception.InvalidDependString as e:
- self. qatracker.add_error(
- "RESTRICT.syntax",
+ self.qatracker.add_error("RESTRICT.syntax",
"%s: RESTRICT: %s" % (ebuild.relative_path, e))
del e
@@ -36,6 +38,15 @@ class RestrictChecks(object):
if mybadrestrict:
for mybad in mybadrestrict:
- self.qatracker.add_error(
- "RESTRICT.invalid",
- package + "/" + y_ebuild +
".ebuild: %s" % mybad)
+
self.qatracker.add_error("RESTRICT.invalid",
+ "%s/%s.ebuild: %s" % (xpkg,
y_ebuild, mybad))
+ return {'continue': False}
+
+ @property
+ def runInPkgs(self):
+ return (False, [])
+
+ @property
+ def runInEbuilds(self):
+ return (True, [self.check])
+
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 1f792bd..8657c73 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -18,7 +18,6 @@ from portage import _unicode_encode
from portage.dep import Atom
from portage.output import green
from repoman.checks.ebuilds.checks import run_checks
-from repoman.checks.ebuilds.variables.restrict import RestrictChecks
from repoman.modules.commit import repochecks
from repoman.profile import check_profiles, dev_profile_keywords, setup_profile
from repoman.repos import repo_metadata
@@ -209,8 +208,6 @@ class Scanner(object):
self.modules[mod_class.__name__] =
mod_class(**self.kwargs)
# initialize our checks classes here before the big xpkg loop
- self.restrictcheck = RestrictChecks(self.qatracker)
-
def scan_pkgs(self, can_force):
dynamic_data = {'can_force': can_force}
@@ -295,7 +292,7 @@ class Scanner(object):
('description', 'DescriptionChecks'), (None,
'KeywordChecks'),
('arches', 'ArchChecks'), ('depend',
'DependChecks'),
('use_flags', 'USEFlagChecks'), ('ruby',
'
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/variables/, ...
commit: 9ea80b2623c9ffb895ce8ed93d5271765c08ccde
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 17:36:26 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Fri Jan 22 18:44:10 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=9ea80b26
repoman: Migrate DescriptionChecks to the plugin system
pym/repoman/modules/scan/metadata/__init__.py| 8
.../scan/metadata}/description.py| 20 ++--
pym/repoman/scanner.py | 5 +
3 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/pym/repoman/modules/scan/metadata/__init__.py
b/pym/repoman/modules/scan/metadata/__init__.py
index eba6565..2506521 100644
--- a/pym/repoman/modules/scan/metadata/__init__.py
+++ b/pym/repoman/modules/scan/metadata/__init__.py
@@ -26,6 +26,14 @@ module_spec = {
'func_desc': {
},
},
+ 'description-metadata': {
+ 'name': "description",
+ 'class': "DescriptionChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
}
}
diff --git a/pym/repoman/checks/ebuilds/variables/description.py
b/pym/repoman/modules/scan/metadata/description.py
similarity index 66%
rename from pym/repoman/checks/ebuilds/variables/description.py
rename to pym/repoman/modules/scan/metadata/description.py
index a2b1057..3570607 100644
--- a/pym/repoman/checks/ebuilds/variables/description.py
+++ b/pym/repoman/modules/scan/metadata/description.py
@@ -9,20 +9,19 @@ from repoman.qa_data import max_desc_len
class DescriptionChecks(object):
'''Perform checks on the DESCRIPTION variable.'''
- def __init__(self, qatracker):
+ def __init__(self, **kwargs):
'''
@param qatracker: QATracker instance
'''
- self.qatracker = qatracker
+ self.qatracker = kwargs.get('qatracker')
- def check(self, pkg, ebuild):
+ def checkTooLong(self, **kwargs):
'''
@param pkg: Package in which we check (object).
@param ebuild: Ebuild which we check (object).
'''
- self._checkTooLong(pkg, ebuild)
-
- def _checkTooLong(self, pkg, ebuild):
+ ebuild = kwargs.get('ebuild')
+ pkg = kwargs.get('pkg')
# 14 is the length of DESCRIPTION=""
if len(pkg._metadata['DESCRIPTION']) > max_desc_len:
self.qatracker.add_error(
@@ -30,3 +29,12 @@ class DescriptionChecks(object):
"%s: DESCRIPTION is %d characters (max %d)" %
(ebuild.relative_path, len(
pkg._metadata['DESCRIPTION']),
max_desc_len))
+ return {'continue': False}
+
+ @property
+ def runInPkgs(self):
+ return (False, [])
+
+ @property
+ def runInEbuilds(self):
+ return (True, [self.checkTooLong])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 955440e..bb856b8 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -21,7 +21,6 @@ from repoman.checks.ebuilds.checks import run_checks
from repoman.checks.ebuilds.eclasses.ruby import RubyEclassChecks
from repoman.check_missingslot import check_missingslot
from repoman.checks.ebuilds.use_flags import USEFlagChecks
-from repoman.checks.ebuilds.variables.description import DescriptionChecks
from repoman.checks.ebuilds.variables.license import LicenseChecks
from repoman.checks.ebuilds.variables.restrict import RestrictChecks
from repoman.modules.commit import repochecks
@@ -216,7 +215,6 @@ class Scanner(object):
# initialize our checks classes here before the big xpkg loop
self.use_flag_checks = USEFlagChecks(self.qatracker, uselist)
self.rubyeclasscheck = RubyEclassChecks(self.qatracker)
- self.descriptioncheck = DescriptionChecks(self.qatracker)
self.licensecheck = LicenseChecks(self.qatracker, liclist,
liclist_deprecated)
self.restrictcheck = RestrictChecks(self.qatracker)
@@ -301,6 +299,7 @@ class Scanner(object):
for mod in [('ebuild', 'Ebuild'), ('live',
'LiveEclassChecks'),
('eapi', 'EAPIChecks'), ('ebuild_metadata',
'EbuildMetadata'),
('thirdpartymirrors', 'ThirdPartyMirrors'),
+ ('description', 'DescriptionChecks'),
]:
if mod[0]:
mod_class =
MODULE_CONTROLLER.get_class(mod[0])
@@ -347,8 +346,6 @@ class Scan
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/, pym/repoman/modules/scan/use/
commit: 15b63b027a092af63ebae792b8fad0cf877f8a12
Author: Brian Dolbec gentoo org>
AuthorDate: Fri Jan 8 01:37:39 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Fri Jan 22 18:44:11 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=15b63b02
repoman: Create USEFlagChecks class plugin
pym/repoman/modules/scan/use/__init__.py | 23 ++
.../ebuilds => modules/scan/use}/use_flags.py | 36 ++
pym/repoman/scanner.py | 8 ++---
3 files changed, 49 insertions(+), 18 deletions(-)
diff --git a/pym/repoman/modules/scan/use/__init__.py
b/pym/repoman/modules/scan/use/__init__.py
new file mode 100644
index 000..e400719
--- /dev/null
+++ b/pym/repoman/modules/scan/use/__init__.py
@@ -0,0 +1,23 @@
+# Copyright 2015-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+doc = """Use plug-in module for repoman.
+Performs use flag checks on ebuilds."""
+__doc__ = doc[:]
+
+
+module_spec = {
+ 'name': 'use',
+ 'description': doc,
+ 'provides':{
+ 'use-module': {
+ 'name': "use_flags",
+ 'class': "USEFlagChecks",
+ 'description': doc,
+ 'functions': ['check', 'getUsedUseFlags'],
+ 'func_desc': {
+ },
+ },
+ }
+}
+
diff --git a/pym/repoman/checks/ebuilds/use_flags.py
b/pym/repoman/modules/scan/use/use_flags.py
similarity index 74%
rename from pym/repoman/checks/ebuilds/use_flags.py
rename to pym/repoman/modules/scan/use/use_flags.py
index ac21b47..acc7dd3 100644
--- a/pym/repoman/checks/ebuilds/use_flags.py
+++ b/pym/repoman/modules/scan/use/use_flags.py
@@ -9,31 +9,39 @@ from repoman._portage import portage
from portage import eapi
from portage.eapi import eapi_has_iuse_defaults, eapi_has_required_use
+from repoman.modules.scan.scanbase import ScanBase
-class USEFlagChecks(object):
+class USEFlagChecks(ScanBase):
'''Performs checks on USE flags listed in the ebuilds and
metadata.xml'''
- def __init__(self, qatracker, globalUseFlags):
- '''
+ def __init__(self, **kwargs):
+ '''Class init
+
@param qatracker: QATracker instance
@param globalUseFlags: Global USE flags
'''
- self.qatracker = qatracker
- self.globalUseFlags = globalUseFlags
+ super(USEFlagChecks, self).__init__(**kwargs)
+ self.qatracker = kwargs.get('qatracker')
+ self.globalUseFlags = kwargs.get('uselist')
self.useFlags = []
self.defaultUseFlags = []
self.usedUseFlags = set()
- def check(self, pkg, package, ebuild, y_ebuild, localUseFlags):
+ def check(self, **kwargs):
'''Perform the check.
@param pkg: Package in which we check (object).
- @param package: Package in which we check (string).
+ @param xpkg: Package in which we check (string).
@param ebuild: Ebuild which we check (object).
@param y_ebuild: Ebuild which we check (string).
- @param localUseFlags: Local USE flags of the package
+ @param muselist: Local USE flags of the package
'''
+ pkg = kwargs.get('pkg')
+ package = kwargs.get('xpkg')
+ ebuild = kwargs.get('ebuild')
+ y_ebuild = kwargs.get('y_ebuild')
+ localUseFlags = kwargs.get('muselist')
# reset state variables for the run
self.useFlags = []
self.defaultUseFlags = []
@@ -41,10 +49,9 @@ class USEFlagChecks(object):
self._checkGlobal(pkg)
self._checkMetadata(package, ebuild, y_ebuild, localUseFlags)
self._checkRequiredUSE(pkg, ebuild)
-
- def getUsedUseFlags(self):
- '''Get the USE flags that this check has seen'''
- return self.usedUseFlags
+ used_useflags =
kwargs.get('used_useflags').union(self.usedUseFlags)
+ return {'continue': False, 'ebuild_UsedUseFlags':
self.usedUseFlags,
+ 'used_useflags': used_useflags}
def _checkGlobal(self, pkg):
for myflag in pkg._metadata["IUSE"].split():
@@ -88,3 +95,8 @@ class USEFlagChecks(object):
"REQUIRED_USE.syntax",
"%s: REQUIRED_USE: %s" %
(ebuild.relative_path, e))
del e
+
+ @property
+ def runInEbuilds(self):
+ '''Ebuild level scans'''
+ return (True, [self.check])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 7f770c3..0227a93 100644
--- a/p
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/arches/
commit: 85dd0fc4477d86b9e795b6a29990ffbf4a70c740
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 19:11:22 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Fri Jan 22 18:44:11 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=85dd0fc4
repoman: Create a new ArchChecks class plugin
pym/repoman/modules/scan/arches/__init__.py | 23 +++
pym/repoman/modules/scan/arches/arches.py | 64 +
pym/repoman/scanner.py | 47 +
3 files changed, 89 insertions(+), 45 deletions(-)
diff --git a/pym/repoman/modules/scan/arches/__init__.py
b/pym/repoman/modules/scan/arches/__init__.py
new file mode 100644
index 000..b570dac
--- /dev/null
+++ b/pym/repoman/modules/scan/arches/__init__.py
@@ -0,0 +1,23 @@
+# Copyright 2015-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+doc = """Arches plug-in module for repoman.
+Performs archs checks on ebuilds."""
+__doc__ = doc[:]
+
+
+module_spec = {
+ 'name': 'arches',
+ 'description': doc,
+ 'provides':{
+ 'archs-module': {
+ 'name': "arches",
+ 'class': "ArchChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
+ }
+}
+
diff --git a/pym/repoman/modules/scan/arches/arches.py
b/pym/repoman/modules/scan/arches/arches.py
new file mode 100644
index 000..2c32028
--- /dev/null
+++ b/pym/repoman/modules/scan/arches/arches.py
@@ -0,0 +1,64 @@
+# -*- coding:utf-8 -*-
+
+
+class ArchChecks(object):
+
+ def __init__(self, **kwargs):
+ self.options = kwargs.get('options')
+ self.repo_settings = kwargs.get('repo_settings')
+ self.profiles = kwargs.get('profiles')
+
+ def check(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
+ if self.options.ignore_arches:
+ arches = [[
+ self.repo_settings.repoman_settings["ARCH"],
self.repo_settings.repoman_settings["ARCH"],
+
self.repo_settings.repoman_settings["ACCEPT_KEYWORDS"].split()]]
+ else:
+ arches = set()
+ for keyword in ebuild.keywords:
+ if keyword[0] == "-":
+ continue
+ elif keyword[0] == "~":
+ arch = keyword[1:]
+ if arch == "*":
+ for expanded_arch in
self.profiles:
+ if expanded_arch ==
"**":
+ continue
+ arches.add(
+ (keyword,
expanded_arch, (
+
expanded_arch, "~" + expanded_arch)))
+ else:
+ arches.add((keyword, arch,
(arch, keyword)))
+ else:
+ # For ebuilds with stable keywords,
check if the
+ # dependencies are satisfiable for
unstable
+ # configurations, since use.stable.mask
is not
+ # applied for unstable configurations
(see bug
+ # 563546).
+ if keyword == "*":
+ for expanded_arch in
self.profiles:
+ if expanded_arch ==
"**":
+ continue
+ arches.add(
+ (keyword,
expanded_arch, (expanded_arch,)))
+ arches.add(
+ (keyword,
expanded_arch,
+
(expanded_arch, "~" + expanded_arch)))
+ else:
+ arches.add((keyword, keyword,
(keyword,)))
+ arches.add((keyword, keyword,
+ (keyword, "~" +
keyword)))
+ if not arches:
+ # Use an empty profile for checking
dependencies of
+
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/ebuild/, pym/repoman/checks/ebuilds/, pym/repoman/
commit: fbbcc17244ef31f9505a581917e37b85e494a4b0
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jan 4 04:44:05 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Fri Jan 22 18:44:13 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=fbbcc172
repoman: Create new MultiCheck class plugin
Move ebuilds/ checks.py and errors.py to the scan/ebuild plugin
Remove the checks_init from main(), initialize it in the MultiCheck
class where it is needed.
pym/repoman/checks/ebuilds/__init__.py | 0
pym/repoman/main.py| 2 -
pym/repoman/modules/scan/ebuild/__init__.py| 8
.../ebuilds => modules/scan/ebuild}/checks.py | 2 +-
.../ebuilds => modules/scan/ebuild}/errors.py | 0
pym/repoman/modules/scan/ebuild/multicheck.py | 43 ++
pym/repoman/scanner.py | 21 +--
7 files changed, 53 insertions(+), 23 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/__init__.py
b/pym/repoman/checks/ebuilds/__init__.py
deleted file mode 100644
index e69de29..000
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 8784685..890e034 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -26,7 +26,6 @@ from portage.util import formatter
from repoman.actions import Actions
from repoman.argparser import parse_args
-from repoman.checks.ebuilds.checks import checks_init
from repoman.qa_data import (
format_qa_output, format_qa_output_column, qahelp,
qawarnings, qacats)
@@ -65,7 +64,6 @@ def repoman_main(argv):
if options.experimental_inherit == 'y':
# This is experimental, so it's non-fatal.
qawarnings.add("inherit.missing")
- checks_init(experimental_inherit=True)
# Set this to False when an extraordinary issue (generally
# something other than a QA issue) makes it impossible to
diff --git a/pym/repoman/modules/scan/ebuild/__init__.py
b/pym/repoman/modules/scan/ebuild/__init__.py
index 9747bf0..038cef3 100644
--- a/pym/repoman/modules/scan/ebuild/__init__.py
+++ b/pym/repoman/modules/scan/ebuild/__init__.py
@@ -26,6 +26,14 @@ module_spec = {
'func_desc': {
},
},
+ 'multicheck-module': {
+ 'name': "multicheck",
+ 'class': "MultiCheck",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_kwargs': {
+ },
+ },
}
}
diff --git a/pym/repoman/checks/ebuilds/checks.py
b/pym/repoman/modules/scan/ebuild/checks.py
similarity index 99%
rename from pym/repoman/checks/ebuilds/checks.py
rename to pym/repoman/modules/scan/ebuild/checks.py
index 5420e51..be59b05 100644
--- a/pym/repoman/checks/ebuilds/checks.py
+++ b/pym/repoman/modules/scan/ebuild/checks.py
@@ -21,7 +21,7 @@ from portage.eapi import (
eapi_has_src_prepare_and_src_configure, eapi_has_dosed_dohard,
eapi_exports_AA, eapi_has_pkg_pretend)
-import repoman.checks.ebuilds.errors as errors
+from . import errors
class LineCheck(object):
diff --git a/pym/repoman/checks/ebuilds/errors.py
b/pym/repoman/modules/scan/ebuild/errors.py
similarity index 100%
rename from pym/repoman/checks/ebuilds/errors.py
rename to pym/repoman/modules/scan/ebuild/errors.py
diff --git a/pym/repoman/modules/scan/ebuild/multicheck.py
b/pym/repoman/modules/scan/ebuild/multicheck.py
new file mode 100644
index 000..989d695
--- /dev/null
+++ b/pym/repoman/modules/scan/ebuild/multicheck.py
@@ -0,0 +1,43 @@
+
+import io
+
+from portage import _encodings, _unicode_encode
+
+from .checks import run_checks, checks_init
+
+
+class MultiCheck(object):
+ '''Class to run multiple different checks on an ebuild'''
+
+ def __init__(self, **kwargs):
+ self.qatracker = kwargs.get('qatracker')
+ self.options = kwargs.get('options')
+ checks_init(self.options.experimental_inherit == 'y')
+
+ def check(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
+ pkg = kwargs.get('pkg')
+ try:
+ # All ebuilds should have utf_8 encoding.
+ f = io.open(
+ _unicode_encode(ebuild.full_path,
encoding=_encodings['fs'],
+ errors='strict'),
+ mode='r', encoding=_encodings['repo.content'])
+ try:
+ for check_name, e in run_checks(f, pkg):
+ self.qatracker.add_error(
+ check_name,
ebuild.relative_path + ': %s' % e)
+ finally:
+ f.close()
+ except UnicodeDecodeError:
+
