[gentoo-commits] repo/gentoo:master commit in: dev-python/pbr/
commit: 28c1721a745705f3ff2504fcc816afdd839d1c46
Author: Matthew Thode gentoo org>
AuthorDate: Tue Sep 22 06:37:41 2015 +
Commit: Matt Thode gentoo org>
CommitDate: Tue Sep 22 06:37:41 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28c1721a
dev-python/pbr: adding git dep and changeing test scructure slightly
Package-Manager: portage-2.2.20.1
dev-python/pbr/pbr-1.8.0.ebuild | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/dev-python/pbr/pbr-1.8.0.ebuild b/dev-python/pbr/pbr-1.8.0.ebuild
index f42181a..6311750 100644
--- a/dev-python/pbr/pbr-1.8.0.ebuild
+++ b/dev-python/pbr/pbr-1.8.0.ebuild
@@ -17,6 +17,7 @@ SLOT="0"
KEYWORDS="~amd64 ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
+# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and
https://bugs.gentoo.org/show_bug.cgi?id=561038
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
@@ -33,12 +34,10 @@ DEPEND="
>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
dev-python/virtualenv[${PYTHON_USEDEP}]
+ dev-vcs/git
)"
PDEPEND="dev-python/pip[${PYTHON_USEDEP}]"
-# Requ'd for testsuite
-DISTUTILS_IN_SOURCE_BUILD=1
-
# This normally actually belongs here.
python_prepare_all() {
# This test passes when run within the source and doesn't represent a
failure, but rather
@@ -59,6 +58,10 @@ python_prepare_all() {
}
python_test() {
- # Note; Tests, that have been removed, pass once package is emerged.
- esetup.py testr
+ distutils_install_for_testing
+
+ rm -rf .testrepository || die "couldn't remove '.testrepository' under
${EPTYHON}"
+
+ testr init || die "testr init failed under ${EPYTHON}"
+ testr run || die "testr run failed under ${EPYTHON}"
}
[gentoo-commits] repo/gentoo:master commit in: net-proxy/squid/
commit: 384715d9776e57b007da94aa44a04e3fbce48639
Author: Eray Aslan gentoo org>
AuthorDate: Tue Sep 22 06:28:48 2015 +
Commit: Eray Aslan gentoo org>
CommitDate: Tue Sep 22 06:28:48 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=384715d9
net-proxy/squid: security bump to squid-3.5.9
Package-Manager: portage-2.2.21
net-proxy/squid/Manifest | 1 +
net-proxy/squid/squid-3.5.9.ebuild | 250 +
2 files changed, 251 insertions(+)
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index bada621..bdea487 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,3 +1,4 @@
DIST squid-3.5.6.tar.xz 2291152 SHA256
cd080e8d5eaabebf6808792751322bd05f2a9c8fe4377f54c7155682ef6c38d5 SHA512
f6c2550cdb5b2f3317105c986caddf06d010bffa0c61d065cffcde72e5bc30c4608486c79c4b25418dfb9f0a8d7ef1d2fabb6b07d1f0262a19fafc945af98bef
WHIRLPOOL
863c6f73c3c26737d98cbff15afa5b6630310226ee9ec10a3e38f646b1416137e998f9bb1e5b492e5871129aed3c98e729b3a757d35088162e671d310a887336
DIST squid-3.5.7.tar.xz 2294580 SHA256
ec6f861bddee007b1dd320667a26ddc9ff76847bbe4cbb59c0134588e65c8699 SHA512
13757da759c1a64fe13d451cff40c4ae30b18c2939f6971b4ef25e24b771ea973e3357f05ec89fccff51acc9e2c77418880b05f6020d58b7633141b928aaf349
WHIRLPOOL
9ce722647f6144ae5192a0a177d5d085252039eed3a7cbdf1fcb638c32097bf21710db7108fc98bdba7c15daefb79dee5912b4d0c41cbc0e0b0fda695ee1
DIST squid-3.5.8.tar.xz 2295644 SHA256
f402a21d4fae8b3e9df13683dc530366e4b1753df21e91c05a0a9514a1abfc62 SHA512
df371934b141fd0e57223ef2a801b71ae2c88c918e1ebd17a82105d33a8f6d439da65cd6437b42a3857f0d64ce461ea31d01299d452ede3650a44cf6826e16e1
WHIRLPOOL
9ca3f07b3068a439299b30e8be924208bc36e336f7929c593563bf6dadf9eaaa051c213e34eafc1ec6db43540b61367bd666c7c172e370d600aa6823779bd192
+DIST squid-3.5.9.tar.xz 2296384 SHA256
9e9a3dc16e6f97258f2c3589dc6163bec20fb9369aec1fe03612dbca76d185d3 SHA512
e9db2eb1674feb4242c5498d24c44ba53eb1ac8df71465301a6e2462051788b45d38e779edc38a944c7ac903bfef0dde52a9b0e167ef15d71084b7b6e405c666
WHIRLPOOL
48c9866f36882051072fde81521189c463d35a72954f0d891b0f65f7caa49f078b1ad5229244b3c9bd51e8c4f07c947313eacffc3d94ac211c95f432deed3657
diff --git a/net-proxy/squid/squid-3.5.9.ebuild
b/net-proxy/squid/squid-3.5.9.ebuild
new file mode 100644
index 000..1c2065f
--- /dev/null
+++ b/net-proxy/squid/squid-3.5.9.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils linux-info pam toolchain-funcs user versionator
+
+DESCRIPTION="A full-featured web proxy cache"
+HOMEPAGE="http://www.squid-cache.org/";
+SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~x86-fbsd"
+IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux
logrotate test \
+ ecap esi ssl-crtd \
+ mysql postgres sqlite \
+ qos tproxy \
+ +htcp +wccp +wccpv2 \
+ pf-transparent ipf-transparent kqueue \
+ elibc_uclibc kernel_linux"
+
+COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
+ pam? ( virtual/pam )
+ ldap? ( net-nds/openldap )
+ kerberos? ( virtual/krb5 )
+ qos? ( net-libs/libnetfilter_conntrack )
+ ssl? ( dev-libs/openssl:* dev-libs/nettle >=net-libs/gnutls-3.1.5 )
+ sasl? ( dev-libs/cyrus-sasl )
+ ecap? ( net-libs/libecap:1 )
+ esi? ( dev-libs/expat dev-libs/libxml2 )
+ !x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
+ >=sys-libs/db-4:*
+ dev-lang/perl
+ dev-libs/libltdl:0"
+DEPEND="${COMMON_DEPEND}
+ ecap? ( virtual/pkgconfig )
+ sys-apps/ed
+ test? ( dev-util/cppunit )"
+RDEPEND="${COMMON_DEPEND}
+ samba? ( net-fs/samba )
+ mysql? ( dev-perl/DBD-mysql )
+ postgres? ( dev-perl/DBD-Pg )
+ selinux? ( sec-policy/selinux-squid )
+ sqlite? ( dev-perl/DBD-SQLite )
+ !<=sci-biology/meme-4.8.1-r1"
+
+REQUIRED_USE="tproxy? ( caps )
+ qos? ( caps )"
+
+pkg_pretend() {
+ if use tproxy; then
+ local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_SOCKET
~NETFILTER_XT_TARGET_TPROXY"
+ linux-info_pkg_setup
+ fi
+}
+
+pkg_setup() {
+ enewgroup squid
+ enewuser squid -1 -1 /var/cache/squid squid
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-3.5.7-gentoo.patch"
+ epatch "${FILESDIR}/${PN}-kernel-headers-4.2.patch"
+ sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
+ INSTALL QUICKSTART \
+ scripts/fileno-to-pathname.pl \
+ scripts/check_cache.pl \
+ tools/cachemgr.cgi.8 \
+ tools/purge/conffile.hh \
+ tools/purge/README || die
+ sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
+ INS
[gentoo-commits] repo/gentoo:master commit in: net-fs/samba/
commit: 2b01fa5a6176cda29103183ccecf3f391c27d291
Author: Lars Wendler gentoo org>
AuthorDate: Tue Sep 22 06:23:48 2015 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Sep 22 06:23:48 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b01fa5a
net-fs/samba: AD Domain Controller only works with heimdal (bug #560370)
Package-Manager: portage-2.2.21
Signed-off-by: Lars Wendler gentoo.org>
net-fs/samba/samba-4.2.4-r1.ebuild | 2 +-
net-fs/samba/samba-4.3.0.ebuild| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-fs/samba/samba-4.2.4-r1.ebuild
b/net-fs/samba/samba-4.2.4-r1.ebuild
index edc4797..2d125c0 100644
--- a/net-fs/samba/samba-4.2.4-r1.ebuild
+++ b/net-fs/samba/samba-4.2.4-r1.ebuild
@@ -68,7 +68,7 @@ RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-samba )
"
-REQUIRED_USE="addc? ( gnutls )
+REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
ads? ( acl gnutls ldap )
${PYTHON_REQUIRED_USE}"
diff --git a/net-fs/samba/samba-4.3.0.ebuild b/net-fs/samba/samba-4.3.0.ebuild
index f13f8b2..91f03be 100644
--- a/net-fs/samba/samba-4.3.0.ebuild
+++ b/net-fs/samba/samba-4.3.0.ebuild
@@ -67,7 +67,7 @@ RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-samba )
"
-REQUIRED_USE="addc? ( gnutls )
+REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
ads? ( acl gnutls ldap )
${PYTHON_REQUIRED_USE}"
[gentoo-commits] repo/gentoo:master commit in: kde-apps/libkdcraw/
commit: d6d2ff75e70faaed7b71d4a6096faf33241dd7b2 Author: Jeroen Roovers gentoo org> AuthorDate: Tue Sep 22 05:59:59 2015 + Commit: Jeroen Roovers gentoo org> CommitDate: Tue Sep 22 06:00:45 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6d2ff75 kde-apps/libkdcraw: Stable for PPC64 (bug #558198). Package-Manager: portage-2.2.20.1 RepoMan-Options: --ignore-arches kde-apps/libkdcraw/libkdcraw-4.14.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/libkdcraw/libkdcraw-4.14.3-r1.ebuild b/kde-apps/libkdcraw/libkdcraw-4.14.3-r1.ebuild index 51d6718..cb52d08 100644 --- a/kde-apps/libkdcraw/libkdcraw-4.14.3-r1.ebuild +++ b/kde-apps/libkdcraw/libkdcraw-4.14.3-r1.ebuild @@ -7,7 +7,7 @@ EAPI=5 inherit kde4-base DESCRIPTION="KDE digital camera raw image library wrapper" -KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux" IUSE="debug" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: mail-filter/maildrop/files/, mail-filter/maildrop/
commit: 3c9a4aadc606b9c5a55baa847c3cfd6bf353594b
Author: Eray Aslan gentoo org>
AuthorDate: Tue Sep 22 05:44:06 2015 +
Commit: Eray Aslan gentoo org>
CommitDate: Tue Sep 22 05:44:06 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c9a4aad
mail-filter/maildrop: version bump. do not setuid unnecessarily
Gentoo-Bug: 560678
mail-filter/maildrop/Manifest | 1 +
.../maildrop/files/maildrop-testsuite-r2.patch | 65 +
mail-filter/maildrop/maildrop-2.8.3.ebuild | 145 +
mail-filter/maildrop/metadata.xml | 1 +
4 files changed, 212 insertions(+)
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 35a7797..ddefc26 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -1 +1,2 @@
DIST maildrop-2.6.0.tar.bz2 2174922 SHA256
afc115119b2d3197c565002e158c2cb69d525288bf72c71919c3c74096b824a9 SHA512
210841add8aff389589802f15ea74776815ecfd0dd9d5fb4f244d101e3d3f5dbb833a38f1d539b869c49685cfe34b0e6e014a5888c2537c9d89c68d754248db4
WHIRLPOOL
c6d8f2be69a02fa757ac4dd653c22c79c8da6c2c1c112d48e0d4c491238d20e4c093d01f728ea337b1ba12bc75d88c5a252ff036114fe2339666776f2be44e80
+DIST maildrop-2.8.3.tar.bz2 1992695 SHA256
58245ccd759382761c4cdbeaefbd37622e01f1c48e71251b06ea085a890ce6c9 SHA512
25168945764eda5c74641e205e3c784ca2ae27c15a5a6ddfe7a1c7b238cd6c3d5b0a3f7ce8b405b578d067f6f2aae5d7d6110da8bc89f91ac1c7fdc224ffd054
WHIRLPOOL
9d8ea100ad125e814663c76539b41f208448b3259193008fade1291de7ec98efe8cf5b9f8b7f267acc9be78ccba1b28a8165d99d59d7d6ada4b99aa10cd163ea
diff --git a/mail-filter/maildrop/files/maildrop-testsuite-r2.patch
b/mail-filter/maildrop/files/maildrop-testsuite-r2.patch
new file mode 100644
index 000..479a8f5
--- /dev/null
+++ b/mail-filter/maildrop/files/maildrop-testsuite-r2.patch
@@ -0,0 +1,65 @@
+--- libs/maildrop/configure.ac 2015-06-27 17:55:08.0 +
libs/maildrop/configure.ac 2015-09-22 05:23:33.0 +
+@@ -195,6 +195,15 @@
+ AC_DEFINE_UNQUOTED(MAXLONGSIZE, $MAXLONGSIZE,
+ [ Maximum character size of a long ])
+
++dnl check for en_US locale
++check_en_US() {
++locale -a | grep en_US.utf8 > /dev/null
++return $?
++}
++AC_MSG_CHECKING([for en_US.utf8])
++AM_CONDITIONAL([HAS_EN_US], [check_en_US])
++AM_COND_IF([HAS_EN_US],[AC_MSG_RESULT([yes])],[AC_MSG_RESULT([not found])])
++
+ dnl Checks for library functions.
+
+ AC_FUNC_CLOSEDIR_VOID
+--- libs/maildrop/Makefile.am 2015-06-27 17:55:08.0 +
libs/maildrop/Makefile.am 2015-09-22 05:24:29.0 +
+@@ -75,9 +75,13 @@
+ maildrop.lsm testsuite.txt.idn testsuite.txt.noidn testsuite2
+
+ check-am:
++if HAS_EN_US
+ @chmod +x testsuite
+ ./testsuite | cmp -s - $(srcdir)/$(TESTSUITE)
+ @SHELL@ $(srcdir)/testsuite2
++else
++ echo ' Need en_US.utf8 to run tests'
++endif
+
+ noinst_DATA=maildrop.html maildrop.1 maildropfilter.html maildropfilter.7 \
+ maildropgdbm.html maildropgdbm.7
+--- libs/rfc2045/configure.ac 2014-02-16 09:00:13.0 +
libs/rfc2045/configure.ac 2015-09-22 05:28:18.0 +
+@@ -60,6 +60,15 @@
+ AC_CHECK_FUNC(strncasecmp,,CFLAGS="$CFLAGS -Dstrncasecmp=strnicmp")
+ AC_CHECK_FUNC(strcasecmp,,CFLAGS="$CFLAGS -Dstrcasecmp=stricmp")
+
++dnl check for en_US locale
++check_en_US() {
++locale -a | grep en_US.utf8 > /dev/null
++return $?
++}
++AC_MSG_CHECKING([for en_US.utf8])
++AM_CONDITIONAL([HAS_EN_US], [check_en_US])
++AM_COND_IF([HAS_EN_US],[AC_MSG_RESULT([yes])],[AC_MSG_RESULT([not found])])
++
+ AC_ARG_WITH(package, [], package="$withval",
+ [
+ package="$PACKAGE"
+--- libs/rfc2045/Makefile.am 2015-02-28 17:59:41.0 +
libs/rfc2045/Makefile.am 2015-09-22 05:29:08.0 +
+@@ -76,6 +76,10 @@
+ endif
+
+ check-am:
++if HAS_EN_US
+ @SHELL@ $(srcdir)/testsuite | cmp -s - $(srcdir)/$(TESTSUITE)
+ @SHELL@ $(srcdir)/testsuitemm | cmp -s - $(srcdir)/testsuitemm.txt
+ @SHELL@ $(srcdir)/testrfc3676parsersuite | diff -U 3
$(srcdir)/testrfc3676parsersuite.txt -
++else
++ echo ' Need en_US.utf8 to run tests'
++endif
diff --git a/mail-filter/maildrop/maildrop-2.8.3.ebuild
b/mail-filter/maildrop/maildrop-2.8.3.ebuild
new file mode 100644
index 000..afc63ac
--- /dev/null
+++ b/mail-filter/maildrop/maildrop-2.8.3.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="Mail delivery agent/filter"
+[[ -z ${PV/?.?/} ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+[[ -z ${PV/?.?.?/} ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+[[ -z ${SRC_URI} ]] &&
SRC_URI="http://www.courier-mta.org/beta/${PN}/${P%%_pre}.tar.bz2";
+HOMEPAGE="http://www.courier-mta.org/maildrop/";
+
+LICENSE="GPL-3"
+SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/
commit: b720516ae51e1a58fe9d4f1afbafaf26ae433daf
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Sep 22 05:40:39 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Sep 22 05:40:39 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b720516a
dev-lang/erlang: Stable for PPC64 (bug #552444).
Package-Manager: portage-2.2.20.1
RepoMan-Options: --ignore-arches
dev-lang/erlang/erlang-17.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/erlang/erlang-17.5.ebuild
b/dev-lang/erlang/erlang-17.5.ebuild
index 069811e..0d9af90 100644
--- a/dev-lang/erlang/erlang-17.5.ebuild
+++ b/dev-lang/erlang/erlang-17.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
LICENSE="ErlPL-1.1"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-freebsd
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="compat-ethread doc emacs halfword hipe java kpoll odbc smp sctp ssl
systemd tk wxwidgets"
RDEPEND=">=dev-lang/perl-5.6.1
[gentoo-commits] repo/gentoo:master commit in: dev-lang/spidermonkey/
commit: 8cc7ac9d55709545f8b6e8ded6c382ab594be3ef
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Sep 22 05:34:38 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Sep 22 05:34:38 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cc7ac9d
dev-lang/spidermonkey: Stable for PPC64 (bug #555086).
Package-Manager: portage-2.2.20.1
RepoMan-Options: --ignore-arches
dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild
b/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild
index 354fadc..0f11d08 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.7.0-r3.ebuild
@@ -13,7 +13,7 @@
SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.tar.gz";
LICENSE="NPL-1.1"
SLOT="0/js"
-KEYWORDS="alpha amd64 ~arm ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd"
IUSE="threadsafe unicode"
S="${WORKDIR}/js/src"
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/contracts/
commit: 8dbe956fb7a962720bad0d1d0758a1a35760f03a Author: Hans de Graaff gentoo org> AuthorDate: Tue Sep 22 04:56:43 2015 + Commit: Hans de Graaff gentoo org> CommitDate: Tue Sep 22 05:18:45 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dbe956f dev-ruby/contracts: add ~alpha keyword to all new versions Package-Manager: portage-2.2.20.1 dev-ruby/contracts/contracts-0.11.0.ebuild | 2 +- dev-ruby/contracts/contracts-0.12.0.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ruby/contracts/contracts-0.11.0.ebuild b/dev-ruby/contracts/contracts-0.11.0.ebuild index 66e9357..f86eb54 100644 --- a/dev-ruby/contracts/contracts-0.11.0.ebuild +++ b/dev-ruby/contracts/contracts-0.11.0.ebuild @@ -17,5 +17,5 @@ HOMEPAGE="https://github.com/egonSchiele/contracts.ruby"; LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86" IUSE="" diff --git a/dev-ruby/contracts/contracts-0.12.0.ebuild b/dev-ruby/contracts/contracts-0.12.0.ebuild index 66e9357..f86eb54 100644 --- a/dev-ruby/contracts/contracts-0.12.0.ebuild +++ b/dev-ruby/contracts/contracts-0.12.0.ebuild @@ -17,5 +17,5 @@ HOMEPAGE="https://github.com/egonSchiele/contracts.ruby"; LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86" IUSE=""
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/recog/
commit: d8ffc3195559003e5645485ce3b944aac13188ce
Author: Hans de Graaff gentoo org>
AuthorDate: Tue Sep 22 05:14:53 2015 +
Commit: Hans de Graaff gentoo org>
CommitDate: Tue Sep 22 05:18:47 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8ffc319
dev-ruby/recog: version bump
Package-Manager: portage-2.2.20.1
dev-ruby/recog/Manifest| 1 +
dev-ruby/recog/recog-2.0.13.ebuild | 37 +
2 files changed, 38 insertions(+)
diff --git a/dev-ruby/recog/Manifest b/dev-ruby/recog/Manifest
index 497ea59..78bbca4 100644
--- a/dev-ruby/recog/Manifest
+++ b/dev-ruby/recog/Manifest
@@ -1,2 +1,3 @@
DIST recog-2.0.12.gem 196608 SHA256
49754e782aff74a1b9f95e48c2baafa5c4ec54d534013616d6dadb2b0d95fdd0 SHA512
d88347313807969ced0106a9134a70aa933d0ad8681067746c0c931a072add2466bf17e2eeb5c090e9be8f45eede66613659b942ca98f58fd0bc15d7ee523058
WHIRLPOOL
b035279dbd74e6ddbe12b90a5433c5fe66055f8a71fa3be2c61b13dc364fafbf95deea021d9e6f1d38225d3ffae675abd23892f2b296b463e6348e7b6f98855e
+DIST recog-2.0.13.gem 197632 SHA256
77bfc87f5863a2b5461fa72ddea0833e6ab970fbdd2e7bab3794c8121dd76455 SHA512
f7b1149085e916688021a3ecce3d5b54cebbb2c80ac1d597d8a1cdff3da3e81d14405854bdcbc74a58167e72d59146b8a34546e2c83df6d79f37062788acfd2f
WHIRLPOOL
4c88f27c4e95698b42007994ef21f8f4c646f6c4c2738afb1c94e1e410e5b691e0d0c42cd3a49cc6a43f909f46f59a2e7cca129dd39e3fdc3b18f75d04be8033
DIST recog-2.0.6.gem 188928 SHA256
333d867db310b908342f857ee4f3f60b869386ff7b908e06f4dec8b9352ceb97 SHA512
408e83889632127d584ce8d09244c63246807aa5f89d88c082bbfd441a2e708cd67f23aebf23fa08c5db6bfd7ff771071daf64df9a66224aa5f04fcaba3d1387
WHIRLPOOL
2aaef470b15e3b8ac99d99bc3f8975447d5aa3d05220540d61f4972083f8cf6a0b04ba89e88aefc0dfd355f59f6f1bd5e9754bf00b6b5a5a953ef21f42fc3509
diff --git a/dev-ruby/recog/recog-2.0.13.ebuild
b/dev-ruby/recog/recog-2.0.13.ebuild
new file mode 100644
index 000..761c372
--- /dev/null
+++ b/dev-ruby/recog/recog-2.0.13.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pattern recognition for hosts, services, and content"
+HOMEPAGE="https://github.com/rapid7/${PN}";
+
+LICENSE="BSD-2"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/nokogiri"
+
+ruby_add_bdepend "test? (
+ dev-ruby/regexp_parser
+ dev-ruby/rspec:3
+ dev-util/aruba
+ dev-util/cucumber
+)"
+
+all_ruby_prepare() {
+ sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+}
+
+each_ruby_test() {
+ RSPEC_VERSION=3 ruby-ng_rspec
+ ruby-ng_cucumber
+}
[gentoo-commits] repo/gentoo:master commit in: sys-power/bbswitch/
commit: 6ac251c9a63310214897d01b46f686f8d2a64b8b
Author: Matthew Thode gentoo org>
AuthorDate: Tue Sep 22 05:14:06 2015 +
Commit: Matt Thode gentoo org>
CommitDate: Tue Sep 22 05:14:06 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ac251c9
sys-power/bbswitch: fixing build bug 513542
Package-Manager: portage-2.2.20.1
sys-power/bbswitch/bbswitch-0.8.ebuild | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/sys-power/bbswitch/bbswitch-0.8.ebuild
b/sys-power/bbswitch/bbswitch-0.8.ebuild
index bedd898..aa7df51 100644
--- a/sys-power/bbswitch/bbswitch-0.8.ebuild
+++ b/sys-power/bbswitch/bbswitch-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -29,6 +29,10 @@ pkg_setup() {
BUILD_PARAMS="KVERSION=${KV_FULL}"
}
+src_prepare() {
+ sed -i 's/^KDIR.*$/KDIR\ \:= \/usr\/src\/linux/g' Makefile || die
+}
+
src_install() {
insinto /etc/modprobe.d
newins "${FILESDIR}"/bbswitch.modprobe bbswitch.conf
[gentoo-commits] repo/gentoo:master commit in: profiles/arch/powerpc/
commit: ee7db46c829c8cbaf1b9978d8a268dc8f6c732f3 Author: Jeroen Roovers gentoo org> AuthorDate: Tue Sep 22 05:03:22 2015 + Commit: Jeroen Roovers gentoo org> CommitDate: Tue Sep 22 05:03:22 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee7db46c Mask USE=mkl for PowerPC (bug #555896). profiles/arch/powerpc/package.use.mask | 4 profiles/arch/powerpc/use.mask | 4 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask index 7964067..6087274 100644 --- a/profiles/arch/powerpc/package.use.mask +++ b/profiles/arch/powerpc/package.use.mask @@ -318,10 +318,6 @@ dev-java/icedtea systemtap # sci-chemistry/msms not available for this arch sci-chemistry/vmd msms -# Justin Lecher (13 Aug 2010) -# MKL not available on this arch -media-gfx/povray mkl - # Bernard Cafarelli (26 Apr 2010) # This is for x86/amd64 only sys-devel/llvm udis86 diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask index 7b8cf0d..ee86b3a 100644 --- a/profiles/arch/powerpc/use.mask +++ b/profiles/arch/powerpc/use.mask @@ -1,6 +1,10 @@ # PPC Specific use flags # +# Jeroen Roovers (22 Sep 2015) +# sci-libs/mkl is not supported on PPC +mkl + # Jeroen Roovers (25 May 2015) # PowerPC has no support for this bootloader (bug #550322) gnuefi
[gentoo-commits] repo/gentoo:master commit in: sci-libs/armadillo/
commit: 834460c5a3d0480a8e7fc04d6f5358f092ca70f4
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Sep 22 05:04:06 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Sep 22 05:04:06 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=834460c5
sci-libs/armadillo: Mark ~ppc64 (bug #555896).
Package-Manager: portage-2.2.20.1
sci-libs/armadillo/armadillo-4.650.4.ebuild | 2 +-
sci-libs/armadillo/armadillo-5.400.2.ebuild | 2 +-
sci-libs/armadillo/armadillo-5.500.2.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-libs/armadillo/armadillo-4.650.4.ebuild
b/sci-libs/armadillo/armadillo-4.650.4.ebuild
index fe85583..0679a08 100644
--- a/sci-libs/armadillo/armadillo-4.650.4.ebuild
+++ b/sci-libs/armadillo/armadillo-4.650.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
LICENSE="MPL-2.0"
SLOT="0/4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="arpack blas debug doc examples hdf5 lapack mkl tbb test"
REQUIRED_USE="test? ( lapack )"
diff --git a/sci-libs/armadillo/armadillo-5.400.2.ebuild
b/sci-libs/armadillo/armadillo-5.400.2.ebuild
index c785a40..3dc475d 100644
--- a/sci-libs/armadillo/armadillo-5.400.2.ebuild
+++ b/sci-libs/armadillo/armadillo-5.400.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
LICENSE="MPL-2.0"
SLOT="0/5"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
REQUIRED_USE="test? ( lapack )"
diff --git a/sci-libs/armadillo/armadillo-5.500.2.ebuild
b/sci-libs/armadillo/armadillo-5.500.2.ebuild
index c785a40..3dc475d 100644
--- a/sci-libs/armadillo/armadillo-5.500.2.ebuild
+++ b/sci-libs/armadillo/armadillo-5.500.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
LICENSE="MPL-2.0"
SLOT="0/5"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
REQUIRED_USE="test? ( lapack )"
[gentoo-commits] repo/gentoo:master commit in: sys-fs/f2fs-tools/
commit: a30fa7152365c6889c3f80260bf5cd112004c26d
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Sep 22 04:46:51 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Sep 22 04:58:16 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a30fa715
sys-fs/f2fs-tools: Stable for PPC64 (bug #555874).
Package-Manager: portage-2.2.20.1
RepoMan-Options: --ignore-arches
sys-fs/f2fs-tools/f2fs-tools-1.4.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.4.1.ebuild
b/sys-fs/f2fs-tools/f2fs-tools-1.4.1.ebuild
index a480d3b..b137746 100644
--- a/sys-fs/f2fs-tools/f2fs-tools-1.4.1.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.4.1.ebuild
@@ -12,7 +12,7 @@
SRC_URI="https://dev.gentoo.org/~blueness/f2fs-tools/${P}.tar.gz";
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~mips ~ppc ppc64 x86"
IUSE=""
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: dev-lisp/sbcl/files/, dev-lisp/sbcl/
commit: e53567187f146ee1f52d537d6f2efacb6a91f4c1
Author: Andrey Grozin gentoo org>
AuthorDate: Tue Sep 22 04:50:18 2015 +
Commit: Andrey Grozin gentoo org>
CommitDate: Tue Sep 22 04:50:18 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5356718
dev-lisp/sbcl: comment out a test in posix-tests.lisp
Bugs: 560276, 561018
Package-Manager: portage-2.2.20.1
dev-lisp/sbcl/files/sb-posix-test-1.2.15.patch | 40 ++
dev-lisp/sbcl/metadata.xml | 2 --
dev-lisp/sbcl/sbcl-1.2.15.ebuild | 2 ++
3 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/dev-lisp/sbcl/files/sb-posix-test-1.2.15.patch
b/dev-lisp/sbcl/files/sb-posix-test-1.2.15.patch
new file mode 100644
index 000..517208a
--- /dev/null
+++ b/dev-lisp/sbcl/files/sb-posix-test-1.2.15.patch
@@ -0,0 +1,40 @@
+diff -r -U1 sbcl-1.2.15.orig/contrib/sb-posix/posix-tests.lisp
sbcl-1.2.15/contrib/sb-posix/posix-tests.lisp
+--- sbcl-1.2.15.orig/contrib/sb-posix/posix-tests.lisp 2015-08-31
00:59:03.0 +0600
sbcl-1.2.15/contrib/sb-posix/posix-tests.lisp 2015-09-22
10:19:20.0 +0600
+@@ -169,19 +169,19 @@
+
+-(deftest rmdir.error.3
+- (handler-case
+- (sb-posix:rmdir #-win32 "/" #+win32 (sb-ext:posix-getenv "windir"))
+-(sb-posix:syscall-error (c)
+- (typep
+- (sb-posix:syscall-errno c)
+- '(member
+- #+(or darwin openbsd)
+- #.sb-posix:eisdir
+- #+win32
+- #.sb-posix::eacces
+- #+win32
+- #.sb-posix::enotempty
+- #+sunos
+- #.sb-posix::einval
+- #-(or darwin openbsd win32 sunos)
+- #.sb-posix::ebusy t)
++;(deftest rmdir.error.3
++; (handler-case
++; (sb-posix:rmdir #-win32 "/" #+win32 (sb-ext:posix-getenv "windir"))
++;(sb-posix:syscall-error (c)
++; (typep
++; (sb-posix:syscall-errno c)
++; '(member
++; #+(or darwin openbsd)
++; #.sb-posix:eisdir
++; #+win32
++; #.sb-posix::eacces
++; #+win32
++; #.sb-posix::enotempty
++; #+sunos
++; #.sb-posix::einval
++; #-(or darwin openbsd win32 sunos)
++; #.sb-posix::ebusy t)
+
diff --git a/dev-lisp/sbcl/metadata.xml b/dev-lisp/sbcl/metadata.xml
index 04e46ea..bad39a3 100644
--- a/dev-lisp/sbcl/metadata.xml
+++ b/dev-lisp/sbcl/metadata.xml
@@ -28,8 +28,6 @@
GLIBC. SBCL 0.8.17 and later support Unicode.
- Include support for dev-lisp/asdf in
SBCL
- Include support for the SBCL low level
debugger
Enable if the user plans to run the
package under a pax enabled hardened kernel
diff --git a/dev-lisp/sbcl/sbcl-1.2.15.ebuild b/dev-lisp/sbcl/sbcl-1.2.15.ebuild
index fd1bea7..bc2ac4d 100644
--- a/dev-lisp/sbcl/sbcl-1.2.15.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.2.15.ebuild
@@ -98,6 +98,8 @@ src_prepare() {
epatch "${FILESDIR}"/concurrency-test-1.2.6.patch
# bugs #486552, #527666, #517004
epatch "${FILESDIR}"/bsd-sockets-test-1.2.11.patch
+ # bugs #560276, #561018
+ epatch "${FILESDIR}"/sb-posix-test-1.2.15.patch
epatch "${FILESDIR}"/${PN}-1.2.11-solaris.patch
epatch "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch
[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/
commit: 121be60bd696400c22617d3652bda9872a50100e
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Sep 22 04:44:03 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Sep 22 04:44:03 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=121be60b
sys-fs/btrfs-progs: Stable for PPC64 (bug #552446).
Package-Manager: portage-2.2.20.1
RepoMan-Options: --ignore-arches
sys-fs/btrfs-progs/btrfs-progs-4.0.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.0.1.ebuild
b/sys-fs/btrfs-progs/btrfs-progs-4.0.1.ebuild
index 0bf8aaa..567ec67 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.0.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.0.1.ebuild
@@ -10,7 +10,7 @@ libbtrfs_soname=0
if [[ ${PV} != ]]; then
MY_PV=v${PV}
- KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~sparc x86"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz";
S="${WORKDIR}"/${PN}-${MY_PV}
else
[gentoo-commits] repo/gentoo:master commit in: media-gfx/gif2png/
commit: 2d9ae288549dfe974b90a64b1b2d0aab5407c2fb
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Sep 22 04:44:35 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Sep 22 04:44:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d9ae288
media-gfx/gif2png: Stable for PPC64 (bug #535440).
Package-Manager: portage-2.2.20.1
RepoMan-Options: --ignore-arches
media-gfx/gif2png/gif2png-2.5.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/gif2png/gif2png-2.5.9.ebuild
b/media-gfx/gif2png/gif2png-2.5.9.ebuild
index 47e3bfb..1a1a5cf 100644
--- a/media-gfx/gif2png/gif2png-2.5.9.ebuild
+++ b/media-gfx/gif2png/gif2png-2.5.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz";
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RDEPEND=">=media-libs/libpng-1.2:0
[gentoo-commits] repo/gentoo:master commit in: net-dns/avahi/
commit: 870e13353da2452cf1e739ee32409d1dcf6b7517
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Sep 22 04:42:02 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Sep 22 04:42:02 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=870e1335
net-dns/avahi: Stable for PPC64 (bug #554784).
Package-Manager: portage-2.2.20.1
RepoMan-Options: --ignore-arches
net-dns/avahi/avahi-0.6.31-r8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-dns/avahi/avahi-0.6.31-r8.ebuild
b/net-dns/avahi/avahi-0.6.31-r8.ebuild
index 9e8f71f..8755b1e 100644
--- a/net-dns/avahi/avahi-0.6.31-r8.ebuild
+++ b/net-dns/avahi/avahi-0.6.31-r8.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://avahi.org/download/${P}.tar.gz";
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc
x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6
kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils"
REQUIRED_USE="
[gentoo-commits] repo/gentoo:master commit in: sys-fs/ntfs3g/
commit: 8e7796cb6cedd49827ce9f65f1a83377ca4ea776
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Sep 22 04:34:18 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Sep 22 04:34:18 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e7796cb
sys-fs/ntfs3g: Stable for PPC64 (bug #548248).
Package-Manager: portage-2.2.20.1
RepoMan-Options: --ignore-arches
sys-fs/ntfs3g/ntfs3g-2014.2.15-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/ntfs3g/ntfs3g-2014.2.15-r1.ebuild
b/sys-fs/ntfs3g/ntfs3g-2014.2.15-r1.ebuild
index 06aaeca..73b413c 100644
--- a/sys-fs/ntfs3g/ntfs3g-2014.2.15-r1.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2014.2.15-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz";
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ppc ~ppc64 sparc x86 ~amd64-linux ~arm-linux
~x86-linux"
+KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86 ~amd64-linux ~arm-linux
~x86-linux"
IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr"
RDEPEND="!
[gentoo-commits] repo/gentoo:master commit in: sys-libs/libnih/
commit: 9c098a2b3a43fb4e596758c63aaff3076b949412
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Sep 22 04:38:22 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Sep 22 04:38:22 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c098a2b
sys-libs/libnih: Mark ~ppc64 (bug #559770).
Package-Manager: portage-2.2.20.1
RepoMan-Options: --ignore-arches
sys-libs/libnih/libnih-1.0.3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-libs/libnih/libnih-1.0.3-r3.ebuild
b/sys-libs/libnih/libnih-1.0.3-r3.ebuild
index dd1ab1c..bc47d17 100644
--- a/sys-libs/libnih/libnih-1.0.3-r3.ebuild
+++ b/sys-libs/libnih/libnih-1.0.3-r3.ebuild
@@ -12,7 +12,7 @@
SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+d
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~x86"
IUSE="+dbus nls static-libs +threads"
# The configure phase will check for valgrind headers, and the tests will use
[gentoo-commits] repo/gentoo:master commit in: sys-auth/consolekit/
commit: 6024ed20aedfd7e512ae3a22687224c3d5162b51
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Sep 22 04:39:03 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Sep 22 04:39:03 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6024ed20
sys-auth/consolekit: Mark ~ppc64 (bug #559770).
Package-Manager: portage-2.2.20.1
RepoMan-Options: --ignore-arches
sys-auth/consolekit/consolekit-1.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-auth/consolekit/consolekit-1.0.0.ebuild
b/sys-auth/consolekit/consolekit-1.0.0.ebuild
index 8bbb497..b161960 100644
--- a/sys-auth/consolekit/consolekit-1.0.0.ebuild
+++ b/sys-auth/consolekit/consolekit-1.0.0.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.ta
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
IUSE="acl cgroups debug doc kernel_linux pam policykit selinux test"
COMMON_DEPEND=">=dev-libs/glib-2.40:2=
[gentoo-commits] repo/gentoo:master commit in: dev-util/ninja/
commit: fdf63de3ec663c710faab7fd9bc9e033ef6205f9
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Sep 22 04:32:16 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Sep 22 04:32:16 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdf63de3
dev-util/ninja: Stable for PPC64 (bug #560762).
Package-Manager: portage-2.2.20.1
RepoMan-Options: --ignore-arches
dev-util/ninja/ninja-1.6.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/ninja/ninja-1.6.0.ebuild
b/dev-util/ninja/ninja-1.6.0.ebuild
index 158cf4f..88f9d6a 100644
--- a/dev-util/ninja/ninja-1.6.0.ebuild
+++ b/dev-util/ninja/ninja-1.6.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/martine/ninja.git";
else
SRC_URI="https://github.com/martine/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh
sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos"
+ KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ppc64 ~s390 ~sh
sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos"
fi
DESCRIPTION="A small build system similar to make"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libuv/
commit: 0a16c26c7091dcc03f195862f00f77b05141b27f
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Sep 22 04:36:03 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Sep 22 04:36:03 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a16c26c
dev-libs/libuv: Stable for PPC64 (bug #555182).
Package-Manager: portage-2.2.20.1
RepoMan-Options: --ignore-arches
dev-libs/libuv/libuv-1.4.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/libuv/libuv-1.4.2.ebuild
b/dev-libs/libuv/libuv-1.4.2.ebuild
index a783206..c4d4c09 100644
--- a/dev-libs/libuv/libuv-1.4.2.ebuild
+++ b/dev-libs/libuv/libuv-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
LICENSE="BSD BSD-2 ISC MIT"
SLOT="0/1"
-KEYWORDS="amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-admin/cgmanager/
commit: 3bf56347414dee6c31bb6bb0fb74367aae93add3
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Sep 22 04:38:54 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Sep 22 04:38:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bf56347
app-admin/cgmanager: Mark ~ppc64 (bug #559770).
Package-Manager: portage-2.2.20.1
app-admin/cgmanager/cgmanager-0.39.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-admin/cgmanager/cgmanager-0.39.ebuild
b/app-admin/cgmanager/cgmanager-0.39.ebuild
index b574877..f8e9f30 100644
--- a/app-admin/cgmanager/cgmanager-0.39.ebuild
+++ b/app-admin/cgmanager/cgmanager-0.39.ebuild
@@ -12,7 +12,7 @@
SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz";
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
IUSE="pam selinux"
RDEPEND="sys-libs/libnih[dbus]
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libconfig/
commit: a880480839f3ef2328ca1562366e66e983eca9df
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Sep 22 04:31:15 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Sep 22 04:31:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8804808
dev-libs/libconfig: Stable for PPC64 (bug #560872).
Package-Manager: portage-2.2.20.1
RepoMan-Options: --ignore-arches
dev-libs/libconfig/libconfig-1.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/libconfig/libconfig-1.5.ebuild
b/dev-libs/libconfig/libconfig-1.5.ebuild
index 1835e65..dbc224f 100644
--- a/dev-libs/libconfig/libconfig-1.5.ebuild
+++ b/dev-libs/libconfig/libconfig-1.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.hyperrealm.com/${PN}/${P}.tar.gz";
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ppc64 ~sparc ~x86 ~x86-linux"
IUSE="+cxx examples static-libs"
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libdbusmenu-qt/
commit: 7b03a03ea9cf60e021e982eb7693cb44a75a4a05
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Sep 22 04:33:27 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Sep 22 04:33:27 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b03a03e
dev-libs/libdbusmenu-qt: Stable for PPC64 (bug #558660).
Package-Manager: portage-2.2.20.1
RepoMan-Options: --ignore-arches
dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild
b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild
index 0f31507..3f2d85a 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild
@@ -12,14 +12,14 @@ inherit multibuild multilib virtualx ${BZR_ECLASS}
cmake-multilib
DESCRIPTION="A library providing Qt implementation of DBusMenu specification"
HOMEPAGE="https://launchpad.net/libdbusmenu-qt/";
if [[ ${PV} == * ]] ; then
- KEYWORDS=""
+ KEYWORDS="ppc64"
else
MY_PV=${PV/_pre/+14.10.}
SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${MY_PV}.orig.tar.gz";
# upstream has no permissions to use some kde written code so repack git
# repo every time
#SRC_URI="https://dev.gentoo.org/~scarabeus/${P}.tar.xz";
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
~amd64-linux ~x86-linux"
PATCHES=( "${FILESDIR}/${P}-optionaltests.patch" )
fi
[gentoo-commits] repo/gentoo:master commit in: sys-block/thin-provisioning-tools/
commit: 30dce2ee491e586dee400cb812063684bcfac60e
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Sep 22 04:29:01 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Sep 22 04:29:01 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30dce2ee
sys-block/thin-provisioning-tools: Stable for PPC64 (bug #555116).
Package-Manager: portage-2.2.20.1
RepoMan-Options: --ignore-arches
sys-block/thin-provisioning-tools/thin-provisioning-tools-0.4.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.4.1.ebuild
b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.4.1.ebuild
index 1e7e57b..166c4f2 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.4.1.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.4.1.ebuild
@@ -13,7 +13,7 @@
SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}${EXT} -> ${BASE_A}"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86
~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="dev-libs/expat
[gentoo-commits] repo/gentoo:master commit in: app-portage/eix/
commit: 2532b19a7eae733109ebc4420b98febb88bf5058
Author: Jeroen Roovers gentoo org>
AuthorDate: Tue Sep 22 04:15:06 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Tue Sep 22 04:15:06 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2532b19a
app-portage/eix: Stable for HPPA PPC64 (bug #558994).
Package-Manager: portage-2.2.20.1
RepoMan-Options: --ignore-arches
app-portage/eix/eix-0.30.11.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-portage/eix/eix-0.30.11.ebuild
b/app-portage/eix/eix-0.30.11.ebuild
index f6d8e7b..e35f242 100644
--- a/app-portage/eix/eix-0.30.11.ebuild
+++ b/app-portage/eix/eix-0.30.11.ebuild
@@ -13,7 +13,7 @@
SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.bz2";
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd
~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh
~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux
~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE="debug +dep doc nls optimization security strong-optimization
strong-security sqlite swap-remote tools"
BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 )
[gentoo-commits] repo/gentoo:master commit in: www-plugins/chrome-binary-plugins/
commit: ae03d4da9cf90fbf3132e4e986b5883b51ebdfca Author: Mike Gilbert gentoo org> AuthorDate: Tue Sep 22 02:49:39 2015 + Commit: Mike Gilbert gentoo org> CommitDate: Tue Sep 22 02:50:07 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae03d4da www-plugins/chrome-binary-plugins: automated update Package-Manager: portage-2.2.20_p164 www-plugins/chrome-binary-plugins/Manifest| 4 ++-- ...2454.93_p1.ebuild => chrome-binary-plugins-45.0.2454.99_p1.ebuild} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest index 64f504c..75fcf4d 100644 --- a/www-plugins/chrome-binary-plugins/Manifest +++ b/www-plugins/chrome-binary-plugins/Manifest @@ -1,6 +1,6 @@ DIST google-chrome-beta_46.0.2490.33-1_amd64.deb 47267736 SHA256 7bd8c2666c8d1579ef71b6fe9a78581e459039bce6f8159beea15a791f9ac0ce SHA512 ad19104bc0d32f8393af50c914956a6cc864bacaa6e5ab9d6b0a8482ef6ec4a6a63449a271924aec1a7323e6edb2e9558fc3eca3a8035f3679c7bbc5c374c603 WHIRLPOOL 56e0805ba4205e04f779f6aaffb90990407f4bae40dbbdb6fdb8110f8fc7d5373bfb23a7eef76b1d3926d9503ffcedf4e1ccbb5daf1b2a27ab47a23d5f2d40b9 DIST google-chrome-beta_46.0.2490.33-1_i386.deb 46800448 SHA256 818e54c8670e60415e2d55f9679deeac6670c0f086956d9694244c5baf660811 SHA512 f04c0248eed08ec50e7bdd6abb7f6e9a2d36055ab6753ab06759eba63385daf95f7f85e97e261223e305822c11d191bb48ed01db204770bbc6c294df363c9d4b WHIRLPOOL 347067b36e9380eef8e3749fc61ed8b1a2af768cb6a6b769ad05a4fe4bf6726b28850612dea201de1a72d1c42382c6ca5dadaa5772920d432a71810c601cba48 -DIST google-chrome-stable_45.0.2454.93-1_amd64.deb 48057428 SHA256 96bbc7cf5ae261527a64e178fa4bc4f244f1b4ad3405a13ad99ac1cc8e3bf480 SHA512 90e04d9684fc39510dd6ef78fab39dc267d945fd433dfc476ea2132d27e7c8c6424368604618a8ec468ab6dcefb32ddd32a269bc9adda402ce5c53c02378a4cb WHIRLPOOL 4062afcfff906752ff95f75b762466e51108db12ebc4666198bfa7e02ed7b595aea5e5b940abd8b178460b9d653dd338bce99f530b66554d680c96dea9c1dc8a -DIST google-chrome-stable_45.0.2454.93-1_i386.deb 47005078 SHA256 8fe110d79fe45db9b27f27dcee76f0848b7373fca7cc21ccc2a44a0599afcdbe SHA512 5f8399ac0034044d6b5b7838bf237a543521415c42a6fd2c4c36f5ceacbd282d21a1ca1850291b6aa80bdee5cf6ab1a0ee46b759e55fc7574e0107b51d58 WHIRLPOOL b7cf507613fa81a6f0f78d01a659344753341b9c6c264866fd7e15d4c72aa8505575df240c8d9b474e2b7c1c9abd5ba14851f9a04b2d575b8365a20da393 +DIST google-chrome-stable_45.0.2454.99-1_amd64.deb 47817354 SHA256 ae1971ad83a347b9901637c8d32d7ac50b6da2e24ec8fdb8603646b97f11f29a SHA512 7da0db9b8c288b40c345da4031354a7aa314dc0748661158eb50765568b14c4eb6d733a79c44b2e46b3c91b60e8ff6fd89831cd3674841dce31550fc9cdfd124 WHIRLPOOL d488160d423570c8cfc1f4a11aeb050a409837ab3181f1b57e5078df4d549baf8d1d8dbde6756e8056c22f46105a47c23dc0133b7ff38dc47fe6d6ba7eb6f4ed +DIST google-chrome-stable_45.0.2454.99-1_i386.deb 46985732 SHA256 2dd481039f0595a15f9eff775a6d63a37c778a8e31afc043e8613bb6f11e8ca1 SHA512 c0957fc6908436b05c382690815a720c3357ed800b2e811b72433c5b5c5f332289a513ee27b192799f0401964a25c8338f9ea84da43c149287979cf6fc06d639 WHIRLPOOL 418d9a6a9fc8ce98d6054c69bf4fda6a804d7a2f1b161ab1b84879373516c2fde2b6b98968b6fffc9bd4ad522601a03731a9b5f7724ad94ee904210869608935 DIST google-chrome-unstable_47.0.2508.0-1_amd64.deb 47471144 SHA256 50c3dec0ce5b003199221d7515c03b03fe43aefcf7e17421e189b519cfb88df9 SHA512 250a7fbab9cc50ac0cf3d7ae876c7c888d1ca632c639a44d5d8c8554ec367d76ba33d5d1596b94e60b275d00ef6c17337e1aa313ac9c8a0f633d6a1c74e8d752 WHIRLPOOL 6d38bb00ffa36914f9a07bb8488cf66c40c417824470fa8b5ae3de7fb4a5437be5f07295c693d21375ac2205487ef4718aa9a89c2a74daf9fbb1d35ef7cbd560 DIST google-chrome-unstable_47.0.2508.0-1_i386.deb 46861344 SHA256 f0d74f3d43d5ddc5f2ac259c6050f15dd99acb135988bf5220fc7be787c15783 SHA512 a91757c99909b7d60d4d2b307730f471ca548bf323533fbab5a571b568d6af455fef79ed02ad2d659910aa3bf5e24cd69e371f8eb68c4eaf360b6671c174ffe3 WHIRLPOOL d1b3657c1a36a76753c93f90246f1a599e355651816195b1b75b2e7c261a1199d9379fa4cef25f922001408bef73dbcfc70a36e0a74122d80ef91ee83f40e439 diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-45.0.2454.93_p1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-45.0.2454.99_p1.ebuild similarity index 100% rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-45.0.2454.93_p1.ebuild rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-45.0.2454.99_p1.ebuild
[gentoo-commits] repo/gentoo:master commit in: www-client/google-chrome/
commit: a411269c91ec4e7cc67ae37012a9c3de8c069be7 Author: Mike Gilbert gentoo org> AuthorDate: Tue Sep 22 02:49:49 2015 + Commit: Mike Gilbert gentoo org> CommitDate: Tue Sep 22 02:50:09 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a411269c www-client/google-chrome: automated update Package-Manager: portage-2.2.20_p164 www-client/google-chrome/Manifest | 4 ++-- ...me-45.0.2454.93_p1.ebuild => google-chrome-45.0.2454.99_p1.ebuild} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest index dd57b12..d123b7b 100644 --- a/www-client/google-chrome/Manifest +++ b/www-client/google-chrome/Manifest @@ -1,2 +1,2 @@ -DIST google-chrome-stable_45.0.2454.93-1_amd64.deb 48057428 SHA256 96bbc7cf5ae261527a64e178fa4bc4f244f1b4ad3405a13ad99ac1cc8e3bf480 SHA512 90e04d9684fc39510dd6ef78fab39dc267d945fd433dfc476ea2132d27e7c8c6424368604618a8ec468ab6dcefb32ddd32a269bc9adda402ce5c53c02378a4cb WHIRLPOOL 4062afcfff906752ff95f75b762466e51108db12ebc4666198bfa7e02ed7b595aea5e5b940abd8b178460b9d653dd338bce99f530b66554d680c96dea9c1dc8a -DIST google-chrome-stable_45.0.2454.93-1_i386.deb 47005078 SHA256 8fe110d79fe45db9b27f27dcee76f0848b7373fca7cc21ccc2a44a0599afcdbe SHA512 5f8399ac0034044d6b5b7838bf237a543521415c42a6fd2c4c36f5ceacbd282d21a1ca1850291b6aa80bdee5cf6ab1a0ee46b759e55fc7574e0107b51d58 WHIRLPOOL b7cf507613fa81a6f0f78d01a659344753341b9c6c264866fd7e15d4c72aa8505575df240c8d9b474e2b7c1c9abd5ba14851f9a04b2d575b8365a20da393 +DIST google-chrome-stable_45.0.2454.99-1_amd64.deb 47817354 SHA256 ae1971ad83a347b9901637c8d32d7ac50b6da2e24ec8fdb8603646b97f11f29a SHA512 7da0db9b8c288b40c345da4031354a7aa314dc0748661158eb50765568b14c4eb6d733a79c44b2e46b3c91b60e8ff6fd89831cd3674841dce31550fc9cdfd124 WHIRLPOOL d488160d423570c8cfc1f4a11aeb050a409837ab3181f1b57e5078df4d549baf8d1d8dbde6756e8056c22f46105a47c23dc0133b7ff38dc47fe6d6ba7eb6f4ed +DIST google-chrome-stable_45.0.2454.99-1_i386.deb 46985732 SHA256 2dd481039f0595a15f9eff775a6d63a37c778a8e31afc043e8613bb6f11e8ca1 SHA512 c0957fc6908436b05c382690815a720c3357ed800b2e811b72433c5b5c5f332289a513ee27b192799f0401964a25c8338f9ea84da43c149287979cf6fc06d639 WHIRLPOOL 418d9a6a9fc8ce98d6054c69bf4fda6a804d7a2f1b161ab1b84879373516c2fde2b6b98968b6fffc9bd4ad522601a03731a9b5f7724ad94ee904210869608935 diff --git a/www-client/google-chrome/google-chrome-45.0.2454.93_p1.ebuild b/www-client/google-chrome/google-chrome-45.0.2454.99_p1.ebuild similarity index 100% rename from www-client/google-chrome/google-chrome-45.0.2454.93_p1.ebuild rename to www-client/google-chrome/google-chrome-45.0.2454.99_p1.ebuild
[gentoo-commits] repo/gentoo:master commit in: net-libs/libbtbb/
commit: 433de74a2dff50ec3f7660453a7cb35ead4fb5c4
Author: Zero_Chaos gentoo org>
AuthorDate: Tue Sep 22 02:36:10 2015 +
Commit: Richard Farina gentoo org>
CommitDate: Tue Sep 22 02:36:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433de74a
net-libs/libbtbb: fix wireshark plugin naming issues with patch from upstream
Package-Manager: portage-2.2.20.1
net-libs/libbtbb/Manifest | 1 +
.../libbtbb/{libbtbb-2015.09.2.ebuild => libbtbb-2015.09.2-r1.ebuild} | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index a6cf815..222fa65 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1 +1,2 @@
DIST libbtbb-2015-09-R2.tar.gz 222045 SHA256
35ce44636649163f0d9a4de5905f686470f54c79b408959760db8c8182853161 SHA512
e300ec09de34644a0cd2f4aba2fe0b03021aaa0b0fe5035022f1e698ff10867adfd84850d0d40e9c070fbd622efee1b614221c1f5b1818f1d4f5d58cc3f31919
WHIRLPOOL
99d8c621b263cd3cd82e423eabff21d4979b0407c31430aa26424d273c9e3ed802e68833e3a100588a46a9a2126a84d0be56e41c1b609ea2eed4a3d64203c995
+DIST libbtbb-2015.09.2-rename-plugins.patch.xz 15636 SHA256
391a51ef542deecbb680d7d14f1649e8190096bce38a38965bc00fe1e97ad038 SHA512
40af251835fae9031a28720bf15ec9a903eac5fc42f38a0edf234021861e3c64e3fb77c03675ac7623b6dae901988d28f3ef90d53ea9e2b62b2d692ca0bf2d2f
WHIRLPOOL
eb15206c66f6293d509affa855f186ccfbb32c9d745675217c1228e7d07c0ef587bd6f997f664c1141e9fa0f4c453faefed3b82982b4099b53b81ec233b2dfec
diff --git a/net-libs/libbtbb/libbtbb-2015.09.2.ebuild
b/net-libs/libbtbb/libbtbb-2015.09.2-r1.ebuild
similarity index 94%
rename from net-libs/libbtbb/libbtbb-2015.09.2.ebuild
rename to net-libs/libbtbb/libbtbb-2015.09.2-r1.ebuild
index 3d12be1..2ed51c5 100644
--- a/net-libs/libbtbb/libbtbb-2015.09.2.ebuild
+++ b/net-libs/libbtbb/libbtbb-2015.09.2-r1.ebuild
@@ -17,7 +17,8 @@ else
MY_PV=${PV/\./-}
MY_PV=${MY_PV/./-R}
S=${WORKDIR}/${PN}-${MY_PV}
-
SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz ->
${PN}-${MY_PV}.tar.gz"
+
SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz ->
${PN}-${MY_PV}.tar.gz \
+
https://dev.gentoo.org/~zerochaos/distfiles/libbtbb-2015.09.2-rename-plugins.patch.xz";
KEYWORDS="~amd64 ~arm ~x86"
fi
@@ -49,6 +50,7 @@ which_plugins() {
src_prepare(){
CMAKE_USE_DIR="${S}"
BUILD_DIR="${S}"_build
+ epatch "${WORKDIR}"/${P}-rename-plugins.patch
cmake-utils_src_prepare
if use wireshark-plugins; then
[gentoo-commits] proj/portage:master commit in: bin/, pym/repoman/
commit: 510591de64c2dbca08c7ce6e27f6f3341cae8642 Author: Brian Dolbec gentoo org> AuthorDate: Tue Sep 22 00:17:29 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Tue Sep 22 00:17:29 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=510591de repoman: Move the pythonpath modification code back into the repoman bin bin/repoman | 5 +++-- pym/repoman/main.py | 4 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/bin/repoman b/bin/repoman index 05d842f..819e0f5 100755 --- a/bin/repoman +++ b/bin/repoman @@ -26,8 +26,9 @@ except KeyboardInterrupt: sys.exit(1) from os import path as osp -pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym") -sys.path.insert(0, pym_path) +if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")): + pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym") + sys.path.insert(0, pym_path) import portage portage._internal_caller = True from repoman.main import repoman_main diff --git a/pym/repoman/main.py b/pym/repoman/main.py index 808c55e..e232558 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -8,10 +8,6 @@ import io import logging import sys -from os import path as osp -if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")): - pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__ #, "pym") - sys.path.insert(0, pym_path) # import our centrally initialized portage instance from repoman._portage import portage portage._internal_caller = True
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 3769fd0b8cfa080197cf154b2742bc2d7895ae15
Author: Brian Dolbec gentoo org>
AuthorDate: Sat Sep 19 04:27:19 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Sep 21 23:42:47 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=3769fd0b
repoamn/actions.py: Split out sign_manifest()
pym/repoman/actions.py | 31 ++-
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py
index 5b55ff8..4f516da 100644
--- a/pym/repoman/actions.py
+++ b/pym/repoman/actions.py
@@ -186,19 +186,7 @@ class Actions(object):
digestgen(mysettings=self.repoman_settings,
myportdb=self.repo_settings.portdb)
if self.repo_settings.sign_manifests:
- try:
- for x in sorted(vcs_files_to_cps(
- chain(myupdates, myremoved,
mymanifests),
- self.scanner.repolevel,
self.scanner.reposplit, self.scanner.categories)):
- self.repoman_settings["O"] =
os.path.join(self.repo_settings.repodir, x)
- manifest_path =
os.path.join(self.repoman_settings["O"], "Manifest")
- if not need_signature(manifest_path):
- continue
- gpgsign(manifest_path,
self.repoman_settings, self.options)
- except portage.exception.PortageException as e:
- portage.writemsg("!!! %s\n" % str(e))
- portage.writemsg("!!! Disabled
FEATURES='sign'\n")
- self.repo_settings.sign_manifests = False
+ self.sign_manifests(myupdates, myremoved, mymanifests)
if self.vcs_settings.vcs == 'git':
# It's not safe to use the git commit -a option since
there might
@@ -821,3 +809,20 @@ class Actions(object):
modified = True
if modified:
portage.util.write_atomic(x, b''.join(mylines),
mode='wb')
+
+
+ def sign_manifest(self, myupdates, myremoved, mymanifests):
+ try:
+ for x in sorted(vcs_files_to_cps(
+ chain(myupdates, myremoved, mymanifests),
+ self.scanner.repolevel, self.scanner.reposplit,
self.scanner.categories)):
+ self.repoman_settings["O"] =
os.path.join(self.repo_settings.repodir, x)
+ manifest_path =
os.path.join(self.repoman_settings["O"], "Manifest")
+ if not need_signature(manifest_path):
+ continue
+ gpgsign(manifest_path, self.repoman_settings,
self.options)
+ except portage.exception.PortageException as e:
+ portage.writemsg("!!! %s\n" % str(e))
+ portage.writemsg("!!! Disabled FEATURES='sign'\n")
+ self.repo_settings.sign_manifests = False
+
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 6a7e4358e3fbf359d77623b007c1a68c901a1790
Author: Brian Dolbec gentoo org>
AuthorDate: Sat Sep 19 04:10:03 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Sep 21 23:42:47 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=6a7e4358
repoman/actions.py: Split out priming_commit()
pym/repoman/actions.py | 91 ++
1 file changed, 48 insertions(+), 43 deletions(-)
diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py
index 2318ce2..af50c1b 100644
--- a/pym/repoman/actions.py
+++ b/pym/repoman/actions.py
@@ -208,49 +208,7 @@ class Actions(object):
# will change and need a priming commit before the Manifest
# can be committed.
if (myupdates or myremoved) and myheaders:
- myfiles = myupdates + myremoved
- fd, commitmessagefile = tempfile.mkstemp(".repoman.msg")
- mymsg = os.fdopen(fd, "wb")
- mymsg.write(_unicode_encode(commitmessage))
- mymsg.close()
-
- separator = '-' * 78
-
- print()
- print(green("Using commit message:"))
- print(green(separator))
- print(commitmessage)
- print(green(separator))
- print()
-
- # Having a leading ./ prefix on file paths can trigger
a bug in
- # the cvs server when committing files to multiple
directories,
- # so strip the prefix.
- myfiles = [f.lstrip("./") for f in myfiles]
-
- commit_cmd = [self.vcs_settings.vcs]
- commit_cmd.extend(self.vcs_settings.vcs_global_opts)
- commit_cmd.append("commit")
- commit_cmd.extend(self.vcs_settings.vcs_local_opts)
- commit_cmd.extend(["-F", commitmessagefile])
- commit_cmd.extend(myfiles)
-
- try:
- if self.options.pretend:
- print("(%s)" % (" ".join(commit_cmd),))
- else:
- retval = spawn(commit_cmd,
env=self.repo_settings.commit_env)
- if retval != os.EX_OK:
- writemsg_level(
- "!!! Exiting on %s
(shell) "
- "error code: %s\n" %
(self.vcs_settings.vcs, retval),
- level=logging.ERROR,
noiselevel=-1)
- sys.exit(retval)
- finally:
- try:
- os.unlink(commitmessagefile)
- except OSError:
- pass
+ self.priming_commit(myupdates, myremoved, commitmessage)
# When files are removed and re-added, the cvs server will put
/Attic/
# inside the $Header path. This code detects the problem and
corrects it
@@ -809,3 +767,50 @@ class Actions(object):
os.unlink(commitmessagefile)
except OSError:
pass
+
+
+ def priming_commit(self, myupdates, myremoved, commitmessage):
+ myfiles = myupdates + myremoved
+ fd, commitmessagefile = tempfile.mkstemp(".repoman.msg")
+ mymsg = os.fdopen(fd, "wb")
+ mymsg.write(_unicode_encode(commitmessage))
+ mymsg.close()
+
+ separator = '-' * 78
+
+ print()
+ print(green("Using commit message:"))
+ print(green(separator))
+ print(commitmessage)
+ print(green(separator))
+ print()
+
+ # Having a leading ./ prefix on file paths can trigger a bug in
+ # the cvs server when committing files to multiple directories,
+ # so strip the prefix.
+ myfiles = [f.lstrip("./") for f in myfiles]
+
+ commit_cmd = [self.vcs_settings.vcs]
+ commit_cmd.extend(self.vcs_settings.vcs_global_opts)
+ commit_cmd.append("commit")
+ commit_cmd.extend(self.vcs_settings.vcs_local_opts)
+ commit_cmd.extend(["-F", commitmessagefile])
+ commit_cmd.extend(myfiles)
+
+ try:
+ if self.options.pretend:
+ print("(%s)" % (" ".join(commit_cmd),))
+ else:
+ retva
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/eclasses/
commit: c7708b5906e9036464a63f7c87eaf56282fbd251
Author: Tom Wijsman gentoo org>
AuthorDate: Wed Jun 4 13:58:31 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Sep 21 23:42:43 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c7708b59
repoman/main.py: Split Ruby checks to checks/ebuild/eclass/ruby.py
pym/repoman/checks/ebuilds/eclasses/__init__.py | 0
pym/repoman/checks/ebuilds/eclasses/ruby.py | 32 +
pym/repoman/main.py | 18 --
3 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/eclasses/__init__.py
b/pym/repoman/checks/ebuilds/eclasses/__init__.py
new file mode 100644
index 000..e69de29
diff --git a/pym/repoman/checks/ebuilds/eclasses/ruby.py
b/pym/repoman/checks/ebuilds/eclasses/ruby.py
new file mode 100644
index 000..abfb166
--- /dev/null
+++ b/pym/repoman/checks/ebuilds/eclasses/ruby.py
@@ -0,0 +1,32 @@
+
+'''live.py
+Performs Ruby eclass checks
+'''
+
+from repoman.qa_data import ruby_deprecated
+
+
+class RubyEclassChecks(object):
+ '''Performs checks for the usage of Ruby eclasses in ebuilds'''
+
+ def __init__(self, qatracker):
+ '''
+ @param qatracker: QATracker instance
+ '''
+ self.qatracker = qatracker
+ self.old_ruby_eclasses = ["ruby-ng", "ruby-fakegem", "ruby"]
+
+ def check(self, pkg, ebuild):
+ is_inherited = lambda eclass: eclass in pkg.inherited
+ is_old_ruby_eclass_inherited = filter(
+ is_inherited, self.old_ruby_eclasses)
+
+ if is_old_ruby_eclass_inherited:
+ ruby_intersection =
pkg.iuse.all.intersection(ruby_deprecated)
+
+ if ruby_intersection:
+ for myruby in ruby_intersection:
+ self.qatracker.add_error(
+ "IUSE.rubydeprecated",
+ (ebuild.relative_path + ":
Deprecated ruby target: %s")
+ % myruby)
\ No newline at end of file
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 39c8e1a..4ded687 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -51,6 +51,7 @@ from repoman.argparser import parse_args
from repoman.checks.directories.files import FileChecks
from repoman.checks.ebuilds.checks import run_checks, checks_init
from repoman.checks.ebuilds.eclasses.live import LiveEclassChecks
+from repoman.checks.ebuilds.eclasses.ruby import RubyEclassChecks
from repoman.checks.ebuilds.fetches import FetchChecks
from repoman.checks.ebuilds.keywords import KeywordChecks
from repoman.checks.ebuilds.isebuild import IsEbuild
@@ -67,7 +68,7 @@ from repoman.profile import check_profiles, dev_keywords,
setup_profile
from repoman.qa_data import (
format_qa_output, format_qa_output_column, qahelp,
qawarnings, qacats, max_desc_len, missingvars,
- ruby_deprecated, suspect_virtual, suspect_rdepend, valid_restrict)
+ suspect_virtual, suspect_rdepend, valid_restrict)
from repoman.qa_tracker import QATracker
from repoman.repos import RepoSettings, repo_metadata
from repoman.scan import Changes, scan
@@ -290,6 +291,7 @@ thirdparty = ThirdPartyMirrors(repoman_settings, qatracker)
use_flag_checks = USEFlagChecks(qatracker, uselist)
keywordcheck = KeywordChecks(qatracker, options)
liveeclasscheck = LiveEclassChecks(qatracker)
+rubyeclasscheck = RubyEclassChecks(qatracker)
##
for xpkg in effective_scanlist:
@@ -615,18 +617,8 @@ for xpkg in effective_scanlist:
ebuild_used_useflags = use_flag_checks.getUsedUseFlags()
used_useflags = used_useflags.union(ebuild_used_useflags)
#
-
- # Check for outdated RUBY targets
- old_ruby_eclasses = ["ruby-ng", "ruby-fakegem", "ruby"]
- is_old_ruby_eclass_inherited = filter(
- lambda e: e in inherited, old_ruby_eclasses)
- if is_old_ruby_eclass_inherited:
- ruby_intersection =
pkg.iuse.all.intersection(ruby_deprecated)
- if ruby_intersection:
- for myruby in ruby_intersection:
-
qatracker.add_error("IUSE.rubydeprecated",
- (ebuild.relative_path + ":
Deprecated ruby target: %s")
- % myruby)
+ rubyeclasscheck.check(pkg, ebuild)
+ #
# license checks
if not badlicsyntax:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 4d38fd403a374a07def13421cd276c0b2de84605
Author: Brian Dolbec gentoo org>
AuthorDate: Sat Sep 19 04:34:01 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Sep 21 23:42:47 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4d38fd40
repoman/actions.py: Split out get_new_commit_message()
pym/repoman/actions.py | 39 ++-
1 file changed, 22 insertions(+), 17 deletions(-)
diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py
index 4f516da..9d97b20 100644
--- a/pym/repoman/actions.py
+++ b/pym/repoman/actions.py
@@ -111,24 +111,8 @@ class Actions(object):
else:
raise
if not commitmessage or not commitmessage.strip():
- msg_prefix = ""
- if self.scanner.repolevel > 1:
- msg_prefix =
"/".join(self.scanner.reposplit[1:]) + ": "
+ commitmessage = self.get_new_commit_message(qa_output)
- try:
- editor = os.environ.get("EDITOR")
- if editor and
utilities.editor_is_executable(editor):
- commitmessage =
utilities.get_commit_message_with_editor(
- editor, message=qa_output,
prefix=msg_prefix)
- else:
- commitmessage =
utilities.get_commit_message_with_stdin()
- except KeyboardInterrupt:
- logging.fatal("Interrupted; exiting...")
- sys.exit(1)
- if (not commitmessage or not commitmessage.strip()
- or commitmessage.strip() == msg_prefix):
- print("* no commit message? aborting commit.")
- sys.exit(1)
commitmessage = commitmessage.rstrip()
myupdates, broken_changelog_manifests = self.changelogs(
@@ -826,3 +810,24 @@ class Actions(object):
portage.writemsg("!!! Disabled FEATURES='sign'\n")
self.repo_settings.sign_manifests = False
+
+ def get_new_commit_message(self, qa_output):
+ msg_prefix = ""
+ if self.scanner.repolevel > 1:
+ msg_prefix = "/".join(self.scanner.reposplit[1:]) + ": "
+
+ try:
+ editor = os.environ.get("EDITOR")
+ if editor and utilities.editor_is_executable(editor):
+ commitmessage =
utilities.get_commit_message_with_editor(
+ editor, message=qa_output,
prefix=msg_prefix)
+ else:
+ commitmessage =
utilities.get_commit_message_with_stdin()
+ except KeyboardInterrupt:
+ logging.fatal("Interrupted; exiting...")
+ sys.exit(1)
+ if (not commitmessage or not commitmessage.strip()
+ or commitmessage.strip() == msg_prefix):
+ print("* no commit message? aborting commit.")
+ sys.exit(1)
+ return commitmessage
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: befc99fa5ff79af530be6e3126a300e182866a2f
Author: Brian Dolbec gentoo org>
AuthorDate: Sat Sep 19 02:07:27 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Sep 21 23:42:46 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=befc99fa
repoman/actions.py: Break out changes detectection into sudo vcs plugins
pym/repoman/actions.py | 215 +++--
1 file changed, 120 insertions(+), 95 deletions(-)
diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py
index 611c0dd..1f70815 100644
--- a/pym/repoman/actions.py
+++ b/pym/repoman/actions.py
@@ -74,102 +74,9 @@ class Actions(object):
self._vcs_deleted(mydeleted)
- if self.vcs_settings.vcs == "cvs":
- mycvstree = cvstree.getentries("./", recursive=1)
- mychanged = cvstree.findchanged(mycvstree, recursive=1,
basedir="./")
- mynew = cvstree.findnew(mycvstree, recursive=1,
basedir="./")
- myremoved = portage.cvstree.findremoved(mycvstree,
recursive=1, basedir="./")
- bin_blob_pattern = re.compile("^-kb$")
- no_expansion = set(portage.cvstree.findoption(
- mycvstree, bin_blob_pattern, recursive=1,
basedir="./"))
-
- if self.vcs_settings.vcs == "svn":
- with repoman_popen("svn status") as f:
- svnstatus = f.readlines()
- mychanged = [
- "./" + elem.split()[-1:][0]
- for elem in svnstatus
- if (elem[:1] in "MR" or elem[1:2] in "M")]
- mynew = [
- "./" + elem.split()[-1:][0]
- for elem in svnstatus
- if elem.startswith("A")]
- myremoved = [
- "./" + elem.split()[-1:][0]
- for elem in svnstatus
- if elem.startswith("D")]
-
- # Subversion expands keywords specified in svn:keywords
properties.
- with repoman_popen("svn propget -R svn:keywords") as f:
- props = f.readlines()
- expansion = dict(
- ("./" + prop.split(" - ")[0], prop.split(" -
")[1].split())
- for prop in props if " - " in prop)
-
- elif self.vcs_settings.vcs == "git":
- with repoman_popen(
- "git diff-index --name-only "
- "--relative --diff-filter=M HEAD") as f:
- mychanged = f.readlines()
- mychanged = ["./" + elem[:-1] for elem in mychanged]
-
- with repoman_popen(
- "git diff-index --name-only "
- "--relative --diff-filter=A HEAD") as f:
- mynew = f.readlines()
- mynew = ["./" + elem[:-1] for elem in mynew]
-
- with repoman_popen(
- "git diff-index --name-only "
- "--relative --diff-filter=D HEAD") as f:
- myremoved = f.readlines()
- myremoved = ["./" + elem[:-1] for elem in myremoved]
-
- if self.vcs_settings.vcs == "bzr":
- with repoman_popen("bzr status -S .") as f:
- bzrstatus = f.readlines()
- mychanged = [
- "./" + elem.split()[-1:][0].split('/')[-1:][0]
- for elem in bzrstatus
- if elem and elem[1:2] == "M"]
- mynew = [
- "./" + elem.split()[-1:][0].split('/')[-1:][0]
- for elem in bzrstatus
- if elem and (elem[1:2] in "NK" or elem[0:1] ==
"R")]
- myremoved = [
- "./" + elem.split()[-1:][0].split('/')[-1:][0]
- for elem in bzrstatus
- if elem.startswith("-")]
- myremoved = [
- "./" + elem.split()[-3:-2][0].split('/')[-1:][0]
- for elem in bzrstatus
- if elem and (elem[1:2] == "K" or elem[0:1] ==
"R")]
- # Bazaar expands nothing.
-
- if self.vcs_settings.vcs == "hg":
- with repoman_popen("hg status --no-status --modified
.") as f:
- mychanged = f.r
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 5d91183c50d57d7ddb06721a64f2ae6f95b6aeea
Author: Brian Dolbec gentoo org>
AuthorDate: Sat Sep 19 02:59:11 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Sep 21 23:42:46 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=5d91183c
repoman/actions.py: Split out the commit footer to a function
pym/repoman/actions.py | 95 ++
1 file changed, 49 insertions(+), 46 deletions(-)
diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py
index 1f70815..e9bf147 100644
--- a/pym/repoman/actions.py
+++ b/pym/repoman/actions.py
@@ -133,53 +133,8 @@ class Actions(object):
sys.exit(1)
commitmessage = commitmessage.rstrip()
changelog_msg = commitmessage
- portage_version = getattr(portage, "VERSION", None)
- gpg_key = self.repoman_settings.get("PORTAGE_GPG_KEY", "")
- dco_sob = self.repoman_settings.get("DCO_SIGNED_OFF_BY", "")
- if portage_version is None:
- sys.stderr.write("Failed to insert portage version in
message!\n")
- sys.stderr.flush()
- portage_version = "Unknown"
-
- report_options = []
- if self.options.force:
- report_options.append("--force")
- if self.options.ignore_arches:
- report_options.append("--ignore-arches")
- if self.scanner.include_arches is not None:
- report_options.append(
- "--include-arches=\"%s\"" %
- " ".join(sorted(self.scanner.include_arches)))
-
- if self.vcs_settings.vcs == "git":
- # Use new footer only for git (see bug #438364).
- commit_footer = "\n\nPackage-Manager: portage-%s" %
portage_version
- if report_options:
- commit_footer += "\nRepoMan-Options: " + "
".join(report_options)
- if self.repo_settings.sign_manifests:
- commit_footer += "\nManifest-Sign-Key: %s" %
(gpg_key, )
- if dco_sob:
- commit_footer += "\nSigned-off-by: %s" %
(dco_sob, )
- else:
- unameout = platform.system() + " "
- if platform.system() in ["Darwin", "SunOS"]:
- unameout += platform.processor()
- else:
- unameout += platform.machine()
- commit_footer = "\n\n"
- if dco_sob:
- commit_footer += "Signed-off-by: %s\n" %
(dco_sob, )
- commit_footer += "(Portage version: %s/%s/%s" % \
- (portage_version, self.vcs_settings.vcs,
unameout)
- if report_options:
- commit_footer += ", RepoMan options: " + "
".join(report_options)
- if self.repo_settings.sign_manifests:
- commit_footer += ", signed Manifest commit with
key %s" % \
- (gpg_key, )
- else:
- commit_footer += ", unsigned Manifest commit"
- commit_footer += ")"
+ commit_footer = self.get_commit_footer()
commitmessage += commit_footer
broken_changelog_manifests = []
@@ -797,3 +752,51 @@ class Actions(object):
expansion = {}
return (mynew, mychanged, myremoved, no_expansion, expansion)
+
+ def get_commit_footer(self):
+ portage_version = getattr(portage, "VERSION", None)
+ gpg_key = self.repoman_settings.get("PORTAGE_GPG_KEY", "")
+ dco_sob = self.repoman_settings.get("DCO_SIGNED_OFF_BY", "")
+ report_options = []
+ if self.options.force:
+ report_options.append("--force")
+ if self.options.ignore_arches:
+ report_options.append("--ignore-arches")
+ if self.scanner.include_arches is not None:
+ report_options.append(
+ "--include-arches=\"%s\"" %
+ " ".join(sorted(self.scanner.include_arches)))
+
+ if portage_version is None:
+ sys.stderr.write("Failed to insert portage version in
message!\n")
+ sys.stderr.flush()
+ portage_version = "Unknown"
+ # Use new footer only for git (see bug #438364).
+ if self.vcs_settings.vcs in ["git"]:
+ commit_footer = "\n\nP
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: a0849ae0b37956da75b517b8d0b38c839261f4ba Author: Brian Dolbec gentoo org> AuthorDate: Sat Sep 19 04:26:39 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Mon Sep 21 23:42:47 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a0849ae0 repoman/actions.py: Splitout clear_attic() pym/repoman/actions.py | 38 +- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py index 974de62..5b55ff8 100644 --- a/pym/repoman/actions.py +++ b/pym/repoman/actions.py @@ -166,23 +166,7 @@ class Actions(object): # inside the $Header path. This code detects the problem and corrects it # so that the Manifest will generate correctly. See bug #169500. # Use binary mode in order to avoid potential character encoding issues. - cvs_header_re = re.compile(br'^#\s*\$Header.*\$$') - attic_str = b'/Attic/' - attic_replace = b'/' - for x in myheaders: - f = open( - _unicode_encode(x, encoding=_encodings['fs'], errors='strict'), - mode='rb') - mylines = f.readlines() - f.close() - modified = False - for i, line in enumerate(mylines): - if cvs_header_re.match(line) is not None and \ - attic_str in line: - mylines[i] = line.replace(attic_str, attic_replace) - modified = True - if modified: - portage.util.write_atomic(x, b''.join(mylines), mode='wb') + self.clear_attic(myheaders) if self.scanner.repolevel == 1: utilities.repoman_sez( @@ -817,3 +801,23 @@ class Actions(object): print( "* Files with headers will" " cause the manifests to be changed and committed separately.") + + + def clear_attic(self, myheaders): + cvs_header_re = re.compile(br'^#\s*\$Header.*\$$') + attic_str = b'/Attic/' + attic_replace = b'/' + for x in myheaders: + f = open( + _unicode_encode(x, encoding=_encodings['fs'], errors='strict'), + mode='rb') + mylines = f.readlines() + f.close() + modified = False + for i, line in enumerate(mylines): + if cvs_header_re.match(line) is not None and \ + attic_str in line: + mylines[i] = line.replace(attic_str, attic_replace) + modified = True + if modified: + portage.util.write_atomic(x, b''.join(mylines), mode='wb')
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 458d0ca69f6e1d9fb0b673e48d86211a591581ee
Author: Brian Dolbec gentoo org>
AuthorDate: Sat Sep 19 03:25:28 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Sep 21 23:42:46 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=458d0ca6
repoman/actions.py: Split out the changelog code to it's own function
pym/repoman/actions.py | 191 +
1 file changed, 99 insertions(+), 92 deletions(-)
diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py
index e9bf147..d70dd82 100644
--- a/pym/repoman/actions.py
+++ b/pym/repoman/actions.py
@@ -132,102 +132,14 @@ class Actions(object):
print("* no commit message? aborting commit.")
sys.exit(1)
commitmessage = commitmessage.rstrip()
- changelog_msg = commitmessage
+
+ myupdates, broken_changelog_manifests = self.changelogs(
+ myupdates, mymanifests, myremoved,
mychanged, myautoadd,
+ mynew, commitmessage)
commit_footer = self.get_commit_footer()
commitmessage += commit_footer
- broken_changelog_manifests = []
- if self.options.echangelog in ('y', 'force'):
- logging.info("checking for unmodified ChangeLog files")
- committer_name =
utilities.get_committer_name(env=self.repoman_settings)
- for x in sorted(vcs_files_to_cps(
- chain(myupdates, mymanifests, myremoved),
- self.scanner.repolevel, self.scanner.reposplit,
self.scanner.categories)):
- catdir, pkgdir = x.split("/")
- checkdir = self.repo_settings.repodir + "/" + x
- checkdir_relative = ""
- if self.scanner.repolevel < 3:
- checkdir_relative =
os.path.join(pkgdir, checkdir_relative)
- if self.scanner.repolevel < 2:
- checkdir_relative =
os.path.join(catdir, checkdir_relative)
- checkdir_relative = os.path.join(".",
checkdir_relative)
-
- changelog_path =
os.path.join(checkdir_relative, "ChangeLog")
- changelog_modified = changelog_path in
self.scanner.changed.changelogs
- if changelog_modified and
self.options.echangelog != 'force':
- continue
-
- # get changes for this package
- cdrlen = len(checkdir_relative)
- check_relative = lambda e:
e.startswith(checkdir_relative)
- split_relative = lambda e: e[cdrlen:]
- clnew = list(map(split_relative,
filter(check_relative, mynew)))
- clremoved = list(map(split_relative,
filter(check_relative, myremoved)))
- clchanged = list(map(split_relative,
filter(check_relative, mychanged)))
-
- # Skip ChangeLog generation if only the
Manifest was modified,
- # as discussed in bug #398009.
- nontrivial_cl_files = set()
- nontrivial_cl_files.update(clnew, clremoved,
clchanged)
-
nontrivial_cl_files.difference_update(['Manifest'])
- if not nontrivial_cl_files and
self.options.echangelog != 'force':
- continue
-
- new_changelog = utilities.UpdateChangeLog(
- checkdir_relative, committer_name,
changelog_msg,
-
os.path.join(self.repo_settings.repodir, 'skel.ChangeLog'),
- catdir, pkgdir,
- new=clnew, removed=clremoved,
changed=clchanged,
- pretend=self.options.pretend)
- if new_changelog is None:
- writemsg_level(
- "!!! Updating the ChangeLog
failed\n",
- level=logging.ERROR,
noiselevel=-1)
- sys.exit(1)
-
- # if the ChangeLog was just created, add it to
vcs
- if new_changelog:
- myautoadd.append(changelog_path)
- # myautoadd is appended to myupdat
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 9f63c395ee23b00d77d00e667a28624de5baff49
Author: Brian Dolbec gentoo org>
AuthorDate: Thu Sep 17 15:29:11 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Sep 21 23:42:46 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=9f63c395
repoman: Move the primary checks loop to it's own class and file
Only minimal changes were done for this initial move.
The _scan_ebuilds() needs major hacking up into manageable chunks.
Clean out code separation demarcation lines
These lines were originally used to mark places where code was removed.
And replaced with a class instance and/or function call.
Signed-off-by: Brian Dolbec gentoo.org>
pym/repoman/main.py| 756 ++---
pym/repoman/scanner.py | 715 ++
2 files changed, 743 insertions(+), 728 deletions(-)
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index e3d0472..2b2f91d 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -4,7 +4,6 @@
from __future__ import print_function, unicode_literals
-import copy
import errno
import io
import logging
@@ -15,7 +14,6 @@ import sys
import tempfile
import platform
from itertools import chain
-from pprint import pformat
from os import path as osp
if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))),
".portage_not_installed")):
@@ -30,14 +28,12 @@ portage._disable_legacy_globals()
from portage import os
from portage import _encodings
from portage import _unicode_encode
-from _emerge.Package import Package
from _emerge.UserQuery import UserQuery
import portage.checksum
import portage.const
import portage.repository.config
-from portage import cvstree, normalize_path
+from portage import cvstree
from portage import util
-from portage.dep import Atom
from portage.process import find_binary, spawn
from portage.output import (
bold, create_color_func, green, nocolor, red)
@@ -47,40 +43,18 @@ from portage.util import writemsg_level
from portage.package.ebuild.digestgen import digestgen
from repoman.argparser import parse_args
-from repoman.checks.directories.files import FileChecks
-from repoman.checks.ebuilds.checks import run_checks, checks_init
-from repoman.checks.ebuilds.eclasses.live import LiveEclassChecks
-from repoman.checks.ebuilds.eclasses.ruby import RubyEclassChecks
-from repoman.checks.ebuilds.fetches import FetchChecks
-from repoman.checks.ebuilds.keywords import KeywordChecks
-from repoman.checks.ebuilds.isebuild import IsEbuild
-from repoman.checks.ebuilds.thirdpartymirrors import ThirdPartyMirrors
-from repoman.checks.ebuilds.manifests import Manifests
-from repoman.check_missingslot import check_missingslot
-from repoman.checks.ebuilds.misc import bad_split_check, pkg_invalid
-from repoman.checks.ebuilds.pkgmetadata import PkgMetadata
-from repoman.checks.ebuilds.use_flags import USEFlagChecks
-from repoman.checks.ebuilds.variables.description import DescriptionChecks
-from repoman.checks.ebuilds.variables.eapi import EAPIChecks
-from repoman.checks.ebuilds.variables.license import LicenseChecks
-from repoman.checks.ebuilds.variables.restrict import RestrictChecks
-from repoman.ebuild import Ebuild
+from repoman.checks.ebuilds.checks import checks_init
from repoman.errors import err
from repoman.gpg import gpgsign, need_signature
-from repoman.modules.commit import repochecks
-from repoman.profile import check_profiles, dev_profile_keywords, setup_profile
from repoman.qa_data import (
format_qa_output, format_qa_output_column, qahelp,
- qawarnings, qacats, missingvars,
- suspect_virtual, suspect_rdepend)
-from repoman.qa_tracker import QATracker
-from repoman.repos import RepoSettings, repo_metadata
-from repoman.scan import Changes, scan
+ qawarnings, qacats)
+from repoman.repos import RepoSettings
+from repoman.scanner import Scanner
from repoman._subprocess import repoman_popen, repoman_getstatusoutput
from repoman import utilities
from repoman.vcs.vcs import (
git_supports_gpg_sign, vcs_files_to_cps, VCSSettings)
-from repoman.vcs.vcsstatus import VCSStatus
if sys.hexversion >= 0x300:
@@ -90,21 +64,11 @@ util.initialize_logger()
bad = create_color_func("BAD")
-live_eclasses = portage.const.LIVE_ECLASSES
-non_ascii_re = re.compile(r'[^\x00-\x7f]')
-
# A sane umask is needed for files that portage creates.
os.umask(0o22)
-def sort_key(item):
- return item[2].sub_path
-
def repoman_main(argv):
- # Repoman sets it's own ACCEPT_KEYWORDS and we don't want it to
- # behave incrementally.
- repoman_incrementals = tuple(
- x for x in portage.const.INCREMENTALS if x != 'ACCEPT_KEYWORDS')
config_root = os.environ.get("PORTAGE_CONFIGROOT")
repoman_settings = portage.config(config_root=config_root,
local_config=False)
@@ -142,30 +106,9 @@ def repoman_main(argv):
repo_settings = R
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 1ab7562ec6027e5edd118e66a9e39d2353d8bc87
Author: Brian Dolbec gentoo org>
AuthorDate: Thu Sep 17 02:39:34 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Sep 21 23:42:45 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=1ab7562e
repoman/repos.py: Fix a regression where the repo is not in repos.conf
The regression was introduced when a variable was used to reduce the size of
some long lines. The variable was not being reset after the repo was added, so
the remaining code was looking at a stale config.
It turned out the variable was a dupe of an already properly updated class wide
one.
Signed-off-by: Brian Dolbec gentoo.org>
pym/repoman/repos.py | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pym/repoman/repos.py b/pym/repoman/repos.py
index 700c064..de99fdf 100644
--- a/pym/repoman/repos.py
+++ b/pym/repoman/repos.py
@@ -30,12 +30,12 @@ class RepoSettings(object):
self.repoman_settings = repoman_settings
self.vcs_settings = vcs_settings
- repoman_repos = self.repoman_settings.repositories
+ self.repositories = self.repoman_settings.repositories
# Ensure that current repository is in the list of enabled
repositories.
self.repodir = os.path.realpath(portdir_overlay)
try:
- repoman_repos.get_repo_for_location(self.repodir)
+ self.repositories.get_repo_for_location(self.repodir)
except KeyError:
self._add_repo(config_root, portdir_overlay)
@@ -47,15 +47,15 @@ class RepoSettings(object):
# Constrain dependency resolution to the master(s)
# that are specified in layout.conf.
- self.repo_config =
repoman_repos.get_repo_for_location(self.repodir)
+ self.repo_config =
self.repositories.get_repo_for_location(self.repodir)
self.portdb.porttrees =
list(self.repo_config.eclass_db.porttrees)
self.portdir = self.portdb.porttrees[0]
self.commit_env = os.environ.copy()
# list() is for iteration on a copy.
- for repo in list(repoman_repos):
+ for repo in list(self.repositories):
# all paths are canonical
if repo.location not in
self.repo_config.eclass_db.porttrees:
- del repoman_repos[repo.name]
+ del self.repositories[repo.name]
if self.repo_config.allow_provide_virtual:
qawarnings.add("virtual.oldstyle")
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/variables/
commit: f1407272871994cd83a18398b566566a61d4f9d0
Author: Tom Wijsman gentoo org>
AuthorDate: Fri Jun 6 15:09:43 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Sep 21 23:42:44 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f1407272
repoman/main.py: Split LICENSE checks to checks/ebuild/variables/
pym/repoman/checks/ebuilds/variables/license.py | 47 +
pym/repoman/main.py | 21 +++
2 files changed, 52 insertions(+), 16 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/variables/license.py
b/pym/repoman/checks/ebuilds/variables/license.py
new file mode 100644
index 000..bdc859c
--- /dev/null
+++ b/pym/repoman/checks/ebuilds/variables/license.py
@@ -0,0 +1,47 @@
+
+'''description.py
+Perform checks on the LICENSE variable.
+'''
+
+# import our initialized portage instance
+from repoman._portage import portage
+
+
+class LicenseChecks(object):
+ '''Perform checks on the LICENSE variable.'''
+
+ def __init__(self, qatracker, liclist, liclist_deprecated):
+ '''
+ @param qatracker: QATracker instance
+ @param liclist: List of licenses.
+ @param liclist: List of deprecated licenses.
+ '''
+ self.qatracker = qatracker
+ self.liclist = liclist
+ self.liclist_deprecated = liclist_deprecated
+
+ def check(
+ self, pkg, package, ebuild, y_ebuild):
+ '''
+ @param pkg: Package in which we check (object).
+ @param package: Package in which we check (string).
+ @param ebuild: Ebuild which we check (object).
+ @param y_ebuild: Ebuild which we check (string).
+ '''
+
+ # Parse the LICENSE variable, remove USE conditions and flatten
it.
+ licenses = portage.dep.use_reduce(
+ pkg._metadata["LICENSE"], matchall=1, flat=True)
+
+ # Check each entry to ensure that it exists in
${PORTDIR}/licenses/.
+ for lic in licenses:
+ # Need to check for "||" manually as no portage
+ # function will remove it without removing values.
+ if lic not in self.liclist and lic != "||":
+ self.qatracker.add_error(
+ "LICENSE.invalid",
+ package + "/" + y_ebuild + ".ebuild:
%s" % lic)
+ elif lic in self.liclist_deprecated:
+ self.qatracker.add_error(
+ "LICENSE.deprecated",
+ "%s: %s" % (ebuild.relative_path, lic))
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 7b36852..08d79eb 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -63,6 +63,7 @@ from repoman.checks.ebuilds.pkgmetadata import PkgMetadata
from repoman.checks.ebuilds.use_flags import USEFlagChecks
from repoman.checks.ebuilds.variables.description import DescriptionChecks
from repoman.checks.ebuilds.variables.eapi import EAPIChecks
+from repoman.checks.ebuilds.variables.license import LicenseChecks
from repoman.ebuild import Ebuild
from repoman.errors import err
from repoman.modules.commit import repochecks
@@ -299,6 +300,7 @@ liveeclasscheck = LiveEclassChecks(qatracker)
rubyeclasscheck = RubyEclassChecks(qatracker)
eapicheck = EAPIChecks(qatracker, repo_settings)
descriptioncheck = DescriptionChecks(qatracker)
+licensecheck = LicenseChecks(qatracker, liclist, liclist_deprecated)
##
for xpkg in effective_scanlist:
@@ -617,22 +619,9 @@ for xpkg in effective_scanlist:
# license checks
if not badlicsyntax:
- # Parse the LICENSE variable, remove USE conditions and
- # flatten it.
- licenses = portage.dep.use_reduce(myaux["LICENSE"],
matchall=1, flat=True)
- # Check each entry to ensure that it exists in PORTDIR's
- # license directory.
- for lic in licenses:
- # Need to check for "||" manually as no portage
- # function will remove it without removing
values.
- if lic not in liclist and lic != "||":
- qatracker.add_error(
- "LICENSE.invalid",
- xpkg + "/" + y_ebuild +
".ebuild: %s" % lic)
- elif lic in liclist_deprecated:
- qatracker.add_error(
- "LICENSE.deprecated",
- "
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 8553e18d54009d5fb804a7a9d65ae0d8f7de2cba
Author: Brian Dolbec gentoo org>
AuthorDate: Sat Sep 19 00:48:05 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Sep 21 23:42:46 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=8553e18d
repoman: Move the remaining actions to an Actions class
Fix regression from which always runs commit mode.
Error found by Mike Gilbert
actions.py: Assign repoman_settings from the repo_settings variable
Add a return to the end perform(), it just didn't seem right to leave it
hanging.
pym/repoman/{main.py => actions.py} | 662 +--
pym/repoman/main.py | 756 ++--
2 files changed, 302 insertions(+), 1116 deletions(-)
diff --git a/pym/repoman/main.py b/pym/repoman/actions.py
old mode 100755
new mode 100644
similarity index 66%
copy from pym/repoman/main.py
copy to pym/repoman/actions.py
index 2b2f91d..611c0dd
--- a/pym/repoman/main.py
+++ b/pym/repoman/actions.py
@@ -1,337 +1,80 @@
-#!/usr/bin/python -bO
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-from __future__ import print_function, unicode_literals
import errno
import io
import logging
+import platform
import re
import signal
import subprocess
import sys
import tempfile
-import platform
from itertools import chain
-from os import path as osp
-if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))),
".portage_not_installed")):
- pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__
#, "pym")
- sys.path.insert(0, pym_path)
-# import our centrally initialized portage instance
-from repoman._portage import portage
-portage._internal_caller = True
-portage._disable_legacy_globals()
-
+from _emerge.UserQuery import UserQuery
+import portage
+from portage import cvstree
from portage import os
from portage import _encodings
from portage import _unicode_encode
-from _emerge.UserQuery import UserQuery
-import portage.checksum
-import portage.const
-import portage.repository.config
-from portage import cvstree
-from portage import util
-from portage.process import find_binary, spawn
from portage.output import (
- bold, create_color_func, green, nocolor, red)
-from portage.output import ConsoleStyleFile, StyleWriter
-from portage.util import formatter
-from portage.util import writemsg_level
+ bold, create_color_func, green, red)
from portage.package.ebuild.digestgen import digestgen
+from portage.process import find_binary, spawn
+from portage.util import writemsg_level
-from repoman.argparser import parse_args
-from repoman.checks.ebuilds.checks import checks_init
+from repoman._subprocess import repoman_popen, repoman_getstatusoutput
from repoman.errors import err
from repoman.gpg import gpgsign, need_signature
-from repoman.qa_data import (
- format_qa_output, format_qa_output_column, qahelp,
- qawarnings, qacats)
-from repoman.repos import RepoSettings
-from repoman.scanner import Scanner
-from repoman._subprocess import repoman_popen, repoman_getstatusoutput
from repoman import utilities
-from repoman.vcs.vcs import (
- git_supports_gpg_sign, vcs_files_to_cps, VCSSettings)
-
-
-if sys.hexversion >= 0x300:
- basestring = str
-
-util.initialize_logger()
+from repoman.vcs.vcs import git_supports_gpg_sign, vcs_files_to_cps
bad = create_color_func("BAD")
-# A sane umask is needed for files that portage creates.
-os.umask(0o22)
-
-
-def repoman_main(argv):
- config_root = os.environ.get("PORTAGE_CONFIGROOT")
- repoman_settings = portage.config(config_root=config_root,
local_config=False)
-
- if repoman_settings.get("NOCOLOR", "").lower() in ("yes", "true") or \
- repoman_settings.get('TERM') == 'dumb' or \
- not sys.stdout.isatty():
- nocolor()
-
- options, arguments = parse_args(
- sys.argv, qahelp, repoman_settings.get("REPOMAN_DEFAULT_OPTS",
""))
-
- if options.version:
- print("Portage", portage.VERSION)
- sys.exit(0)
-
- 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
- # commit (like if Manifest generation fails).
- can_force = True
-
- portdir, portdir_overlay, mydir =
utilities.FindPortdir(repoman_settings)
- if portdir is None:
- sys.exit(1)
-
- myreporoot = os.path.basename(portdir_overlay)
- myreporoot += mydir[len(portdir_overlay):]
-
- vcs_settings = VCSSettings(options, repoman_settings)
-
- repo_settings = RepoSettings(
- con
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, bin/
commit: 56b11d66acf0d0cb92e54f7e43e1b963320df5b2
Author: Brian Dolbec gentoo org>
AuthorDate: Thu Sep 17 04:07:02 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Sep 21 23:42:45 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=56b11d66
repoman: Create repoman_main()
Create an initial repoamn_main()
Update bin/repoman script
Clean up unused variables
Move commitmessage from global scope to the function.
Clean up some demarcation lines.
Signed-off-by: Brian Dolbec gentoo.org>
bin/repoman |5 +-
pym/repoman/main.py | 2728 +--
2 files changed, 1362 insertions(+), 1371 deletions(-)
diff --git a/bin/repoman b/bin/repoman
index 4e18b6c..05d842f 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -30,11 +30,10 @@ pym_path =
osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")
sys.path.insert(0, pym_path)
import portage
portage._internal_caller = True
-#from repoman.main import repoman_main
+from repoman.main import repoman_main
try:
- #repoman_main(sys.argv[1:])
- from repoman import main
+ repoman_main(sys.argv[1:])
except IOError as e:
if e.errno == errno.EACCES:
print("\nRepoman: Need user access")
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 006afc9..e3d0472 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -88,8 +88,6 @@ if sys.hexversion >= 0x300:
util.initialize_logger()
-commitmessage = None
-
bad = create_color_func("BAD")
live_eclasses = portage.const.LIVE_ECLASSES
@@ -102,1487 +100,1481 @@ def sort_key(item):
return item[2].sub_path
-# Repoman sets it's own ACCEPT_KEYWORDS and we don't want it to
-# behave incrementally.
-repoman_incrementals = tuple(
- x for x in portage.const.INCREMENTALS if x != 'ACCEPT_KEYWORDS')
-config_root = os.environ.get("PORTAGE_CONFIGROOT")
-repoman_settings = portage.config(config_root=config_root, local_config=False)
-
-if repoman_settings.get("NOCOLOR", "").lower() in ("yes", "true") or \
- repoman_settings.get('TERM') == 'dumb' or \
- not sys.stdout.isatty():
- nocolor()
-
-options, arguments = parse_args(
- sys.argv, qahelp, repoman_settings.get("REPOMAN_DEFAULT_OPTS", ""))
-
-if options.version:
- print("Portage", portage.VERSION)
- sys.exit(0)
-
-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
-# commit (like if Manifest generation fails).
-can_force = True
+def repoman_main(argv):
+ # Repoman sets it's own ACCEPT_KEYWORDS and we don't want it to
+ # behave incrementally.
+ repoman_incrementals = tuple(
+ x for x in portage.const.INCREMENTALS if x != 'ACCEPT_KEYWORDS')
+ config_root = os.environ.get("PORTAGE_CONFIGROOT")
+ repoman_settings = portage.config(config_root=config_root,
local_config=False)
-portdir, portdir_overlay, mydir = utilities.FindPortdir(repoman_settings)
-if portdir is None:
- sys.exit(1)
+ if repoman_settings.get("NOCOLOR", "").lower() in ("yes", "true") or \
+ repoman_settings.get('TERM') == 'dumb' or \
+ not sys.stdout.isatty():
+ nocolor()
-myreporoot = os.path.basename(portdir_overlay)
-myreporoot += mydir[len(portdir_overlay):]
-##
+ options, arguments = parse_args(
+ sys.argv, qahelp, repoman_settings.get("REPOMAN_DEFAULT_OPTS",
""))
-vcs_settings = VCSSettings(options, repoman_settings)
+ if options.version:
+ print("Portage", portage.VERSION)
+ sys.exit(0)
+ 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
+ # commit (like if Manifest generation fails).
+ can_force = True
-repo_settings = RepoSettings(
- config_root, portdir, portdir_overlay,
- repoman_settings, vcs_settings, options, qawarnings)
-
-repoman_settings = repo_settings.repoman_settings
+ portdir, portdir_overlay, mydir =
utilities.FindPortdir(repoman_settings)
+ if portdir is None:
+ sys.exit(1)
-portdb = repo_settings.portdb
-##
+ myreporoot = os.path.basename(portdir_overlay)
+ myreporoot += mydir[len(portdir_overlay):]
+
+ vcs_settings = VCSSettings(options, repoman_settings)
+
+ repo_settings = RepoSettings(
+ config_root, portdir, portdir_overlay,
+
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 56cd8391579d206245232b0766d7cfe6c6b82dbc Author: Brian Dolbec gentoo org> AuthorDate: Sat Sep 19 04:03:54 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Mon Sep 21 23:42:47 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=56cd8391 repoman/actions.py: Remove unused variable pym/repoman/actions.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py index 405a8c7..2318ce2 100644 --- a/pym/repoman/actions.py +++ b/pym/repoman/actions.py @@ -110,8 +110,6 @@ class Actions(object): " --commitmsgfile='%s'\n" % self.options.commitmsgfile) else: raise - # We've read the content so the file is no longer needed. - commitmessagefile = None if not commitmessage or not commitmessage.strip(): msg_prefix = "" if self.scanner.repolevel > 1:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 3f47be32adcee89a34234d594b04e81089ea85ce
Author: Brian Dolbec gentoo org>
AuthorDate: Sat Sep 19 04:25:34 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Sep 21 23:42:47 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=3f47be32
repoman/actions.py: Split out thick_manifest()
pym/repoman/actions.py | 101 +
1 file changed, 52 insertions(+), 49 deletions(-)
diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py
index af50c1b..974de62 100644
--- a/pym/repoman/actions.py
+++ b/pym/repoman/actions.py
@@ -146,55 +146,7 @@ class Actions(object):
# committed in one big commit at the end.
print()
elif not self.repo_settings.repo_config.thin_manifest:
- if self.vcs_settings.vcs == 'cvs':
- headerstring = "'\$(Header|Id).*\$'"
- elif self.vcs_settings.vcs == "svn":
- svn_keywords = dict((k.lower(), k) for k in [
- "Rev",
- "Revision",
- "LastChangedRevision",
- "Date",
- "LastChangedDate",
- "Author",
- "LastChangedBy",
- "URL",
- "HeadURL",
- "Id",
- "Header",
- ])
-
- for myfile in myupdates:
-
- # for CVS, no_expansion contains files that are
excluded from expansion
- if self.vcs_settings.vcs == "cvs":
- if myfile in no_expansion:
- continue
-
- # for SVN, expansion contains files that are
included in expansion
- elif self.vcs_settings.vcs == "svn":
- if myfile not in expansion:
- continue
-
- # Subversion keywords are
case-insensitive
- # in svn:keywords properties,
- # but case-sensitive in contents of
files.
- enabled_keywords = []
- for k in expansion[myfile]:
- keyword =
svn_keywords.get(k.lower())
- if keyword is not None:
-
enabled_keywords.append(keyword)
-
- headerstring = "'\$(%s).*\$'" %
"|".join(enabled_keywords)
-
- myout = repoman_getstatusoutput(
- "egrep -q %s %s" % (headerstring,
portage._shell_quote(myfile)))
- if myout[0] == 0:
- myheaders.append(myfile)
-
- print("%s have headers that will change." %
green(str(len(myheaders
- print(
- "* Files with headers will"
- " cause the manifests to be changed and
committed separately.")
+ self.thick_manifest(myupdates, myheaders, no_expansion,
expansion)
logging.info("myupdates: %s", myupdates)
logging.info("myheaders: %s", myheaders)
@@ -814,3 +766,54 @@ class Actions(object):
except OSError:
pass
+
+ def thick_manifest(self, myupdates, myheaders, no_expansion, expansion):
+ if self.vcs_settings.vcs == 'cvs':
+ headerstring = "'\$(Header|Id).*\$'"
+ elif self.vcs_settings.vcs == "svn":
+ svn_keywords = dict((k.lower(), k) for k in [
+ "Rev",
+ "Revision",
+ "LastChangedRevision",
+ "Date",
+ "LastChangedDate",
+ "Author",
+ "LastChangedBy",
+ "URL",
+ "HeadURL",
+ "Id",
+ "Header",
+ ])
+
+ for myfile in myupdates:
+
+
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: f702bf4c75b03b19e214c6d9f5a376afa647dce5
Author: Brian Dolbec gentoo org>
AuthorDate: Sat Sep 19 03:59:10 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Sep 21 23:42:46 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f702bf4c
repoman/actions.py: split out a manifest function
pym/repoman/actions.py | 110 +
1 file changed, 57 insertions(+), 53 deletions(-)
diff --git a/pym/repoman/actions.py b/pym/repoman/actions.py
index d70dd82..405a8c7 100644
--- a/pym/repoman/actions.py
+++ b/pym/repoman/actions.py
@@ -330,59 +330,7 @@ class Actions(object):
level=logging.ERROR,
noiselevel=-1)
sys.exit(retval)
- if True:
- myfiles = mymanifests[:]
- # If there are no header (SVN/CVS keywords) changes in
- # the files, this Manifest commit must include the
- # other (yet uncommitted) files.
- if not myheaders:
- myfiles += myupdates
- myfiles += myremoved
- myfiles.sort()
-
- fd, commitmessagefile = tempfile.mkstemp(".repoman.msg")
- mymsg = os.fdopen(fd, "wb")
- mymsg.write(_unicode_encode(commitmessage))
- mymsg.close()
-
- commit_cmd = []
- if self.options.pretend and self.vcs_settings.vcs is
None:
- # substitute a bogus value for pretend output
- commit_cmd.append("cvs")
- else:
- commit_cmd.append(self.vcs_settings.vcs)
- commit_cmd.extend(self.vcs_settings.vcs_global_opts)
- commit_cmd.append("commit")
- commit_cmd.extend(self.vcs_settings.vcs_local_opts)
- if self.vcs_settings.vcs == "hg":
- commit_cmd.extend(["--logfile",
commitmessagefile])
- commit_cmd.extend(myfiles)
- else:
- commit_cmd.extend(["-F", commitmessagefile])
- commit_cmd.extend(f.lstrip("./") for f in
myfiles)
-
- try:
- if self.options.pretend:
- print("(%s)" % (" ".join(commit_cmd),))
- else:
- retval = spawn(commit_cmd,
env=self.repo_settings.commit_env)
- if retval != os.EX_OK:
- if
self.repo_settings.repo_config.sign_commit and self.vcs_settings.vcs == 'git'
and \
- not
git_supports_gpg_sign():
- # Inform user that
newer git is needed (bug #403323).
- logging.error(
- "Git >=1.7.9 is
required for signed commits!")
-
- writemsg_level(
- "!!! Exiting on %s
(shell) "
- "error code: %s\n" %
(self.vcs_settings.vcs, retval),
- level=logging.ERROR,
noiselevel=-1)
- sys.exit(retval)
- finally:
- try:
- os.unlink(commitmessagefile)
- except OSError:
- pass
+ self.add_manifest(mymanifests, myheaders, myupdates, myremoved,
commitmessage)
print()
if self.vcs_settings.vcs:
@@ -807,3 +755,59 @@ class Actions(object):
myupdates += myautoadd
return myupdates, broken_changelog_manifests
+
+
+ def add_manifest(self, mymanifests, myheaders, myupdates, myremoved,
+ commitmessage):
+ myfiles = mymanifests[:]
+ # If there are no header (SVN/CVS keywords) changes in
+ # the files, this Manifest commit must include the
+ # other (yet uncommitted) files.
+ if not myheaders:
+ myfiles += myupdates
+ myfiles += myremoved
+ myfiles.sort()
+
+ fd, commitmessagefile = tempfile.mkstemp(".repoman.msg")
+ mymsg = os.fdopen(fd, "wb")
+
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/variables/
commit: f662a734a28a9c6a13233693fd08498d371054e0 Author: Tom Wijsman gentoo org> AuthorDate: Fri Jun 6 14:50:26 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Mon Sep 21 23:42:44 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f662a734 repoman/main.py: Split DESCRIPTION checks to checks/ebuild/variables/ .../checks/ebuilds/variables/description.py| 32 ++ pym/repoman/main.py| 13 - 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/pym/repoman/checks/ebuilds/variables/description.py b/pym/repoman/checks/ebuilds/variables/description.py new file mode 100644 index 000..a2b1057 --- /dev/null +++ b/pym/repoman/checks/ebuilds/variables/description.py @@ -0,0 +1,32 @@ + +'''description.py +Perform checks on the DESCRIPTION variable. +''' + +from repoman.qa_data import max_desc_len + + +class DescriptionChecks(object): + '''Perform checks on the DESCRIPTION variable.''' + + def __init__(self, qatracker): + ''' + @param qatracker: QATracker instance + ''' + self.qatracker = qatracker + + def check(self, pkg, ebuild): + ''' + @param pkg: Package in which we check (object). + @param ebuild: Ebuild which we check (object). + ''' + self._checkTooLong(pkg, ebuild) + + def _checkTooLong(self, pkg, ebuild): + # 14 is the length of DESCRIPTION="" + if len(pkg._metadata['DESCRIPTION']) > max_desc_len: + self.qatracker.add_error( + 'DESCRIPTION.toolong', + "%s: DESCRIPTION is %d characters (max %d)" % + (ebuild.relative_path, len( + pkg._metadata['DESCRIPTION']), max_desc_len)) diff --git a/pym/repoman/main.py b/pym/repoman/main.py index 42600cd..7b36852 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -61,6 +61,7 @@ from repoman.check_missingslot import check_missingslot from repoman.checks.ebuilds.misc import bad_split_check, pkg_invalid from repoman.checks.ebuilds.pkgmetadata import PkgMetadata from repoman.checks.ebuilds.use_flags import USEFlagChecks +from repoman.checks.ebuilds.variables.description import DescriptionChecks from repoman.checks.ebuilds.variables.eapi import EAPIChecks from repoman.ebuild import Ebuild from repoman.errors import err @@ -68,7 +69,7 @@ from repoman.modules.commit import repochecks from repoman.profile import check_profiles, dev_keywords, setup_profile from repoman.qa_data import ( format_qa_output, format_qa_output_column, qahelp, - qawarnings, qacats, max_desc_len, missingvars, + qawarnings, qacats, missingvars, suspect_virtual, suspect_rdepend, valid_restrict) from repoman.qa_tracker import QATracker from repoman.repos import RepoSettings, repo_metadata @@ -297,6 +298,7 @@ keywordcheck = KeywordChecks(qatracker, options) liveeclasscheck = LiveEclassChecks(qatracker) rubyeclasscheck = RubyEclassChecks(qatracker) eapicheck = EAPIChecks(qatracker, repo_settings) +descriptioncheck = DescriptionChecks(qatracker) ## for xpkg in effective_scanlist: @@ -436,12 +438,9 @@ for xpkg in effective_scanlist: myqakey = var + ".virtual" qatracker.add_error(myqakey, ebuild.relative_path) - # 14 is the length of DESCRIPTION="" - if len(myaux['DESCRIPTION']) > max_desc_len: - qatracker.add_error( - 'DESCRIPTION.toolong', - "%s: DESCRIPTION is %d characters (max %d)" % - (ebuild.relative_path, len(myaux['DESCRIPTION']), max_desc_len)) + ### + descriptioncheck.check(pkg, ebuild) + ### keywords = myaux["KEYWORDS"].split()
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 9c022fd0fe3d40a5c80e2362da48035d03f237f7
Author: Brian Dolbec gentoo org>
AuthorDate: Thu Sep 17 02:43:27 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Sep 21 23:42:45 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=9c022fd0
repoamn/repos.py: Indent fix
Signed-off-by: Brian Dolbec gentoo.org>
pym/repoman/repos.py | 46 +++---
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/pym/repoman/repos.py b/pym/repoman/repos.py
index de99fdf..f16bf7a 100644
--- a/pym/repoman/repos.py
+++ b/pym/repoman/repos.py
@@ -128,29 +128,29 @@ class RepoSettings(object):
sys.exit(1)
def _add_repo(self, config_root, portdir_overlay):
- self.repo_conf = portage.repository.config
- self.repo_name =
self.repo_conf.RepoConfig._read_valid_repo_name(
- portdir_overlay)[0]
- self.layout_conf_data =
self.repo_conf.parse_layout_conf(portdir_overlay)[0]
- if self.layout_conf_data['repo-name']:
- self.repo_name =
self.layout_conf_data['repo-name']
- tmp_conf_file = io.StringIO(textwrap.dedent("""
- [%s]
- location = %s
- """) % (self.repo_name, portdir_overlay))
- # Ensure that the repository corresponding to $PWD
overrides a
- # repository of the same name referenced by the
existing PORTDIR
- # or PORTDIR_OVERLAY settings.
- self.repoman_settings['PORTDIR_OVERLAY'] = "%s %s" % (
- self.repoman_settings.get('PORTDIR_OVERLAY',
''),
- portage._shell_quote(portdir_overlay))
- self.repositories =
self.repo_conf.load_repository_config(
- self.repoman_settings,
extra_files=[tmp_conf_file])
- # We have to call the config constructor again so that
attributes
- # dependent on config.repositories are initialized
correctly.
- self.repoman_settings = portage.config(
- config_root=config_root, local_config=False,
- repositories=self.repositories)
+ self.repo_conf = portage.repository.config
+ self.repo_name =
self.repo_conf.RepoConfig._read_valid_repo_name(
+ portdir_overlay)[0]
+ self.layout_conf_data =
self.repo_conf.parse_layout_conf(portdir_overlay)[0]
+ if self.layout_conf_data['repo-name']:
+ self.repo_name = self.layout_conf_data['repo-name']
+ tmp_conf_file = io.StringIO(textwrap.dedent("""
+ [%s]
+ location = %s
+ """) % (self.repo_name, portdir_overlay))
+ # Ensure that the repository corresponding to $PWD overrides a
+ # repository of the same name referenced by the existing PORTDIR
+ # or PORTDIR_OVERLAY settings.
+ self.repoman_settings['PORTDIR_OVERLAY'] = "%s %s" % (
+ self.repoman_settings.get('PORTDIR_OVERLAY', ''),
+ portage._shell_quote(portdir_overlay))
+ self.repositories = self.repo_conf.load_repository_config(
+ self.repoman_settings, extra_files=[tmp_conf_file])
+ # We have to call the config constructor again so that
attributes
+ # dependent on config.repositories are initialized correctly.
+ self.repoman_settings = portage.config(
+ config_root=config_root, local_config=False,
+ repositories=self.repositories)
##
# future vcs plugin functions
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/directories/, pym/repoman/checks/herds/, ...
commit: 94fdc2f50b40336bedf6331b8f3d264a3e35fc0e Author: Tom Wijsman gentoo org> AuthorDate: Fri Jun 6 12:24:18 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Mon Sep 21 23:42:44 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=94fdc2f5 repoman: Apply PEP 8 guidelines again (except for W191) pym/repoman/_portage.py | 1 - pym/repoman/_xml.py | 6 -- pym/repoman/checks/directories/files.py | 17 +++-- pym/repoman/checks/ebuilds/checks.py| 2 +- pym/repoman/checks/ebuilds/eclasses/live.py | 2 +- pym/repoman/checks/ebuilds/eclasses/ruby.py | 2 +- pym/repoman/checks/ebuilds/fetches.py | 29 pym/repoman/checks/ebuilds/isebuild.py | 6 +- pym/repoman/checks/ebuilds/manifests.py | 7 +- pym/repoman/checks/ebuilds/misc.py | 11 ++- pym/repoman/checks/ebuilds/pkgmetadata.py | 42 ++- pym/repoman/checks/ebuilds/thirdpartymirrors.py | 8 +- pym/repoman/checks/ebuilds/use_flags.py | 5 -- pym/repoman/checks/herds/metadata.py| 4 - pym/repoman/ebuild.py | 6 +- pym/repoman/errors.py | 2 - pym/repoman/main.py | 97 +++-- pym/repoman/qa_data.py | 2 - pym/repoman/qa_tracker.py | 13 ++-- pym/repoman/repos.py| 35 + pym/repoman/scan.py | 18 ++--- pym/repoman/vcs/vcs.py | 10 ++- pym/repoman/vcs/vcsstatus.py| 17 ++--- 23 files changed, 163 insertions(+), 179 deletions(-) diff --git a/pym/repoman/_portage.py b/pym/repoman/_portage.py index e72ce9f..0f611f7 100644 --- a/pym/repoman/_portage.py +++ b/pym/repoman/_portage.py @@ -23,4 +23,3 @@ sys.path.insert(0, pym_path) import portage portage._internal_caller = True portage._disable_legacy_globals() - diff --git a/pym/repoman/_xml.py b/pym/repoman/_xml.py index d5b5a5e..7bf6698 100644 --- a/pym/repoman/_xml.py +++ b/pym/repoman/_xml.py @@ -15,7 +15,6 @@ from repoman._subprocess import repoman_getstatusoutput class _XMLParser(xml.etree.ElementTree.XMLParser): - def __init__(self, data, **kwargs): xml.etree.ElementTree.XMLParser.__init__(self, **kwargs) self._portage_data = data @@ -27,13 +26,11 @@ class _XMLParser(xml.etree.ElementTree.XMLParser): self.parser.StartDoctypeDeclHandler = \ self._portage_StartDoctypeDeclHandler - def _portage_XmlDeclHandler(self, version, encoding, standalone): if self._base_XmlDeclHandler is not None: self._base_XmlDeclHandler(version, encoding, standalone) self._portage_data["XML_DECLARATION"] = (version, encoding, standalone) - def _portage_StartDoctypeDeclHandler( self, doctypeName, systemId, publicId, has_internal_subset): if self._base_StartDoctypeDeclHandler is not None: @@ -61,7 +58,6 @@ class XmlLint(object): self.binary = None self._check_capable() - def _check_capable(self): if self.options.mode == "manifest": return @@ -74,12 +70,10 @@ class XmlLint(object): # this can be problematic if xmllint changes their output self._is_capable = True - @property def capable(self): return self._is_capable - def check(self, checkdir, repolevel): '''Runs checks on the package metadata.xml file diff --git a/pym/repoman/checks/directories/files.py b/pym/repoman/checks/directories/files.py index 87220c0..b1d77df 100644 --- a/pym/repoman/checks/directories/files.py +++ b/pym/repoman/checks/directories/files.py @@ -13,8 +13,8 @@ from repoman.vcs.vcs import vcs_new_changed class FileChecks(object): - def __init__(self, qatracker, repoman_settings, repo_settings, portdb, - vcs_settings): + def __init__( + self, qatracker, repoman_settings, repo_settings, portdb, vcs_settings): ''' @param qatracker: QATracker instance @param repoman_settings: settings instance @@ -27,7 +27,6 @@ class FileChecks(object): self.repoman_settings = repoman_settings self.vcs_settings = vcs_settings - def check(self, checkdir, checkdirlist, checkdir_relative, changed, new): '''Checks the ebuild sources and files for errors @@ -48,10 +47,12 @@ class FileChecks(object): # prohibited characters). See bug #406877. index = -1 if index != -1: -
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 001dd58b705449b08acb34a085673a69b41b697e
Author: Brian Dolbec gentoo org>
AuthorDate: Thu Sep 17 00:13:13 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Sep 21 23:42:45 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=001dd58b
repoman/main.py: Move some functions out of the main code definition
Move gpgsign and need_signature to their own file: gpg.py
Move sort_key() to the main body ahead of the main code.
Add new file gpg.py
pym/repoman/gpg.py | 79 +
pym/repoman/main.py | 78 +---
2 files changed, 86 insertions(+), 71 deletions(-)
diff --git a/pym/repoman/gpg.py b/pym/repoman/gpg.py
new file mode 100644
index 000..a6c4c5f
--- /dev/null
+++ b/pym/repoman/gpg.py
@@ -0,0 +1,79 @@
+
+import errno
+import logging
+import subprocess
+import sys
+
+import portage
+from portage import os
+from portage import _encodings
+from portage import _unicode_encode
+from portage.exception import MissingParameter
+from portage.process import find_binary
+
+
+# Setup the GPG commands
+def gpgsign(filename, repoman_settings, options):
+ gpgcmd = repoman_settings.get("PORTAGE_GPG_SIGNING_COMMAND")
+ if gpgcmd in [None, '']:
+ raise MissingParameter("PORTAGE_GPG_SIGNING_COMMAND is unset!"
+ " Is make.globals missing?")
+ if "${PORTAGE_GPG_KEY}" in gpgcmd and \
+ "PORTAGE_GPG_KEY" not in repoman_settings:
+ raise MissingParameter("PORTAGE_GPG_KEY is unset!")
+ if "${PORTAGE_GPG_DIR}" in gpgcmd:
+ if "PORTAGE_GPG_DIR" not in repoman_settings:
+ repoman_settings["PORTAGE_GPG_DIR"] = \
+ os.path.expanduser("~/.gnupg")
+ logging.info(
+ "Automatically setting PORTAGE_GPG_DIR to '%s'"
%
+ repoman_settings["PORTAGE_GPG_DIR"])
+ else:
+ repoman_settings["PORTAGE_GPG_DIR"] = \
+
os.path.expanduser(repoman_settings["PORTAGE_GPG_DIR"])
+ if not os.access(repoman_settings["PORTAGE_GPG_DIR"], os.X_OK):
+ raise portage.exception.InvalidLocation(
+ "Unable to access directory:
PORTAGE_GPG_DIR='%s'" %
+ repoman_settings["PORTAGE_GPG_DIR"])
+ gpgvars = {"FILE": filename}
+ for k in ("PORTAGE_GPG_DIR", "PORTAGE_GPG_KEY"):
+ v = repoman_settings.get(k)
+ if v is not None:
+ gpgvars[k] = v
+ gpgcmd = portage.util.varexpand(gpgcmd, mydict=gpgvars)
+ if options.pretend:
+ print("(" + gpgcmd + ")")
+ else:
+ # Encode unicode manually for bug #310789.
+ gpgcmd = portage.util.shlex_split(gpgcmd)
+
+ if sys.hexversion < 0x302 and sys.hexversion >= 0x300
and \
+ not os.path.isabs(gpgcmd[0]):
+ # Python 3.1 _execvp throws TypeError for non-absolute
executable
+ # path passed as bytes (see
http://bugs.python.org/issue8513).
+ fullname = find_binary(gpgcmd[0])
+ if fullname is None:
+ raise
portage.exception.CommandNotFound(gpgcmd[0])
+ gpgcmd[0] = fullname
+
+ gpgcmd = [
+ _unicode_encode(arg, encoding=_encodings['fs'],
errors='strict')
+ for arg in gpgcmd]
+ rValue = subprocess.call(gpgcmd)
+ if rValue == os.EX_OK:
+ os.rename(filename + ".asc", filename)
+ else:
+ raise portage.exception.PortageException(
+ "!!! gpg exited with '" + str(rValue) + "'
status")
+
+def need_signature(filename):
+ try:
+ with open(
+ _unicode_encode(
+ filename, encoding=_encodings['fs'],
errors='strict'),
+ 'rb') as f:
+ return b"BEGIN PGP SIGNED MESSAGE" not in f.readline()
+ except IOError as e:
+ if e.errno in (errno.ENOENT, errno.ESTALE):
+ return False
+ raise
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 4dbc09e..e276aba 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -38,7 +38,6 @@ import portage.repository.config
from portage import cvstree, normalize_path
from portage import util
from portage.dep import Atom
-from portage.exception import MissingParameter
from portage.process import find_binary, spawn
from portage.output import (
bold, create_color_func, green, nocolor, red)
@@ -67,6 +66,7 @@ from repoman.check
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/variables/, pym/repoman/
commit: 4436beeb6f74ffe091cfdfab4975960edf687fbb Author: Tom Wijsman gentoo org> AuthorDate: Fri Jun 6 14:40:39 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Mon Sep 21 23:42:44 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=4436beeb repoman/main.py: Split EAPI checks to checks/ebuilds/variables/eapi.py pym/repoman/checks/ebuilds/variables/__init__.py | 0 pym/repoman/checks/ebuilds/variables/eapi.py | 44 pym/repoman/main.py | 12 +++ 3 files changed, 49 insertions(+), 7 deletions(-) diff --git a/pym/repoman/checks/ebuilds/variables/__init__.py b/pym/repoman/checks/ebuilds/variables/__init__.py new file mode 100644 index 000..e69de29 diff --git a/pym/repoman/checks/ebuilds/variables/eapi.py b/pym/repoman/checks/ebuilds/variables/eapi.py new file mode 100644 index 000..2f8b1cb --- /dev/null +++ b/pym/repoman/checks/ebuilds/variables/eapi.py @@ -0,0 +1,44 @@ + +'''eapi.py +Perform checks on the EAPI variable. +''' + + +class EAPIChecks(object): + '''Perform checks on the EAPI variable.''' + + def __init__(self, qatracker, repo_settings): + ''' + @param qatracker: QATracker instance + @param repo_settings: Repository settings + ''' + self.qatracker = qatracker + self.repo_settings = repo_settings + + def check(self, pkg, ebuild): + ''' + @param pkg: Package in which we check (object). + @param ebuild: Ebuild which we check (object). + ''' + eapi = pkg._metadata["EAPI"] + + if not self._checkBanned(ebuild, eapi): + self._checkDeprecated(ebuild, eapi) + + def _checkBanned(self, ebuild, eapi): + if self.repo_settings.repo_config.eapi_is_banned(eapi): + self.qatracker.add_error( + "repo.eapi.banned", "%s: %s" % (ebuild.relative_path, eapi)) + + return True + + return False + + def _checkDeprecated(self, ebuild, eapi): + if self.repo_settings.repo_config.eapi_is_deprecated(eapi): + self.qatracker.add_error( + "repo.eapi.deprecated", "%s: %s" % (ebuild.relative_path, eapi)) + + return True + + return False diff --git a/pym/repoman/main.py b/pym/repoman/main.py index 1e23387..42600cd 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -61,6 +61,7 @@ from repoman.check_missingslot import check_missingslot from repoman.checks.ebuilds.misc import bad_split_check, pkg_invalid from repoman.checks.ebuilds.pkgmetadata import PkgMetadata from repoman.checks.ebuilds.use_flags import USEFlagChecks +from repoman.checks.ebuilds.variables.eapi import EAPIChecks from repoman.ebuild import Ebuild from repoman.errors import err from repoman.modules.commit import repochecks @@ -295,6 +296,7 @@ use_flag_checks = USEFlagChecks(qatracker, uselist) keywordcheck = KeywordChecks(qatracker, options) liveeclasscheck = LiveEclassChecks(qatracker) rubyeclasscheck = RubyEclassChecks(qatracker) +eapicheck = EAPIChecks(qatracker, repo_settings) ## for xpkg in effective_scanlist: @@ -396,13 +398,9 @@ for xpkg in effective_scanlist: inherited = pkg.inherited live_ebuild = live_eclasses.intersection(inherited) - if repo_settings.repo_config.eapi_is_banned(eapi): - qatracker.add_error( - "repo.eapi.banned", "%s: %s" % (ebuild.relative_path, eapi)) - - elif repo_settings.repo_config.eapi_is_deprecated(eapi): - qatracker.add_error( - "repo.eapi.deprecated", "%s: %s" % (ebuild.relative_path, eapi)) + ### + eapicheck.check(pkg, ebuild) + ### for k, v in myaux.items(): if not isinstance(v, basestring):
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/variables/, pym/repoman/
commit: f5b8099f789b28533ffbe3dea814ebcae5c67ada Author: Tom Wijsman gentoo org> AuthorDate: Fri Jun 6 15:23:33 2014 + Commit: Brian Dolbec gentoo org> CommitDate: Mon Sep 21 23:42:44 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=f5b8099f repoman/main.py: Split RESTRICT checks to checks/ebuild/variables/ pym/repoman/checks/ebuilds/variables/restrict.py | 41 pym/repoman/main.py | 25 --- 2 files changed, 47 insertions(+), 19 deletions(-) diff --git a/pym/repoman/checks/ebuilds/variables/restrict.py b/pym/repoman/checks/ebuilds/variables/restrict.py new file mode 100644 index 000..215b792 --- /dev/null +++ b/pym/repoman/checks/ebuilds/variables/restrict.py @@ -0,0 +1,41 @@ + +'''restrict.py +Perform checks on the RESTRICT variable. +''' + +# import our initialized portage instance +from repoman._portage import portage + +from repoman.qa_data import valid_restrict + + +class RestrictChecks(object): + '''Perform checks on the RESTRICT variable.''' + + def __init__(self, qatracker): + ''' + @param qatracker: QATracker instance + ''' + self.qatracker = qatracker + + def check(self, pkg, package, ebuild, y_ebuild): + myrestrict = None + + try: + myrestrict = portage.dep.use_reduce( + pkg._metadata["RESTRICT"], matchall=1, flat=True) + except portage.exception.InvalidDependString as e: + self. qatracker.add_error( + "RESTRICT.syntax", + "%s: RESTRICT: %s" % (ebuild.relative_path, e)) + del e + + if myrestrict: + myrestrict = set(myrestrict) + mybadrestrict = myrestrict.difference(valid_restrict) + + if mybadrestrict: + for mybad in mybadrestrict: + self.qatracker.add_error( + "RESTRICT.invalid", + package + "/" + y_ebuild + ".ebuild: %s" % mybad) diff --git a/pym/repoman/main.py b/pym/repoman/main.py index 08d79eb..8497833 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -64,6 +64,7 @@ from repoman.checks.ebuilds.use_flags import USEFlagChecks from repoman.checks.ebuilds.variables.description import DescriptionChecks from repoman.checks.ebuilds.variables.eapi import EAPIChecks from repoman.checks.ebuilds.variables.license import LicenseChecks +from repoman.checks.ebuilds.variables.restrict import RestrictChecks from repoman.ebuild import Ebuild from repoman.errors import err from repoman.modules.commit import repochecks @@ -71,7 +72,7 @@ from repoman.profile import check_profiles, dev_keywords, setup_profile from repoman.qa_data import ( format_qa_output, format_qa_output_column, qahelp, qawarnings, qacats, missingvars, - suspect_virtual, suspect_rdepend, valid_restrict) + suspect_virtual, suspect_rdepend) from repoman.qa_tracker import QATracker from repoman.repos import RepoSettings, repo_metadata from repoman.scan import Changes, scan @@ -301,6 +302,7 @@ rubyeclasscheck = RubyEclassChecks(qatracker) eapicheck = EAPIChecks(qatracker, repo_settings) descriptioncheck = DescriptionChecks(qatracker) licensecheck = LicenseChecks(qatracker, liclist, liclist_deprecated) +restrictcheck = RestrictChecks(qatracker) ## for xpkg in effective_scanlist: @@ -623,24 +625,9 @@ for xpkg in effective_scanlist: licensecheck.check(pkg, xpkg, ebuild, y_ebuild) # - # restrict checks - myrestrict = None - try: - myrestrict = portage.dep.use_reduce( - myaux["RESTRICT"], matchall=1, flat=True) - except portage.exception.InvalidDependString as e: - qatracker.add_error( - "RESTRICT.syntax", - "%s: RESTRICT: %s" % (ebuild.relative_path, e)) - del e - if myrestrict: - myrestrict = set(myrestrict) - mybadrestrict = myrestrict.difference(valid_restrict) - if mybadrestrict: - for mybad in mybadrestrict: - qatracker.add_error( - "RESTRICT.invalid", - xpkg + "/" + y_ebuild + ".ebuild: %s" % mybad) + # + restrictcheck.check(pkg, xpkg, ebuild, y_ebuild) + #
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: 3d375a8705fbf6f0ad6f08ca5ffcadf656c9a8a1
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Nov 17 02:07:13 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Sep 21 23:42:45 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=3d375a87
repoman/main.py: Update dependency.perlcore error to us qatracker
Update the original code added after the re-write had started.
This brings it up to date with teh new stats tracking class instance.
pym/repoman/main.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 8497833..4dbc09e 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -560,7 +560,9 @@ for xpkg in effective_scanlist:
qatracker.add_error('dependency.perlcore',
ebuild.relative_path +
": %s: please
use '%s' instead of '%s'" %
- (mytype,
atom.replace("perl-core/","virtual/perl-"), atom))
+ (mytype,
+
atom.replace("perl-core/","virtual/perl-"),
+ atom))
if buildtime and \
not is_blocker and \
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/, pym/repoman/
commit: 1850a6ebe46abcee14fbf6d28901b186150c2a18
Author: Tom Wijsman gentoo org>
AuthorDate: Wed Jun 4 14:17:49 2014 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Sep 21 23:42:44 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=1850a6eb
repoman/main.py: More KEYWORDS checks to checks/ebuilds/keywords.py
pym/repoman/checks/ebuilds/keywords.py | 64 ++
pym/repoman/main.py| 32 +
2 files changed, 59 insertions(+), 37 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/keywords.py
b/pym/repoman/checks/ebuilds/keywords.py
index b724269..235c751 100644
--- a/pym/repoman/checks/ebuilds/keywords.py
+++ b/pym/repoman/checks/ebuilds/keywords.py
@@ -21,7 +21,7 @@ class KeywordChecks(object):
def check(
self, pkg, package, ebuild, y_ebuild, keywords, ebuild_archs,
changed,
- live_ebuild):
+ live_ebuild, kwlist, profiles):
'''Perform the check.
@param pkg: Package in which we check (object).
@@ -33,21 +33,32 @@ class KeywordChecks(object):
@param changed: Changes instance
@param slot_keywords: A dictionary of keywords per slot.
@param live_ebuild: A boolean that determines if this is a live
ebuild.
+ @param kwlist: A list of all global keywords.
+ @param profiles: A list of all profiles.
'''
if not self.options.straight_to_stable:
self._checkAddedWithStableKeywords(
package, ebuild, y_ebuild, keywords, changed)
+
self._checkForDroppedKeywords(
pkg, ebuild, ebuild_archs, live_ebuild)
+ self._checkForInvalidKeywords(
+ pkg, package, y_ebuild, kwlist, profiles)
+
+ self._checkForMaskLikeKeywords(
+ package, y_ebuild, keywords, kwlist)
+
self.slot_keywords[pkg.slot].update(ebuild_archs)
+ def _isKeywordStable(self, keyword):
+ return not keyword.startswith("~") and not
keyword.startswith("-")
+
def _checkAddedWithStableKeywords(
self, package, ebuild, y_ebuild, keywords, changed):
catdir, pkgdir = package.split("/")
- is_stable = lambda kw: not kw.startswith("~") and not
kw.startswith("-")
- stable_keywords = list(filter(is_stable, keywords))
+ stable_keywords = list(filter(self._isKeywordStable, keywords))
if stable_keywords:
if ebuild.ebuild_path in changed.new_ebuilds and catdir
!= "virtual":
stable_keywords.sort()
@@ -64,6 +75,47 @@ class KeywordChecks(object):
elif ebuild_archs and "*" not in ebuild_archs and not
live_ebuild:
dropped_keywords =
previous_keywords.difference(ebuild_archs)
if dropped_keywords:
- self.qatracker.add_error("KEYWORDS.dropped",
- "%s: %s" %
- (ebuild.relative_path, "
".join(sorted(dropped_keywords
+ self.qatracker.add_error(
+ "KEYWORDS.dropped", "%s: %s" % (
+ ebuild.relative_path,
+ "
".join(sorted(dropped_keywords
+
+ def _checkForInvalidKeywords(
+ self, pkg, package, y_ebuild, kwlist, profiles):
+ myuse = pkg._metadata["KEYWORDS"].split()
+
+ for mykey in myuse:
+ if mykey not in ("-*", "*", "~*"):
+ myskey = mykey
+
+ if not self._isKeywordStable(myskey[:1]):
+ myskey = myskey[1:]
+
+ if myskey not in kwlist:
+ self.qatracker.add_error(
+ "KEYWORDS.invalid",
+ "%s/%s.ebuild: %s" % (
+ package, y_ebuild,
mykey))
+ elif myskey not in profiles:
+ self.qatracker.add_error(
+ "KEYWORDS.invalid",
+ "%s/%s.ebuild: %s (profile
invalid)" % (
+ package, y_ebuild,
mykey))
+
+ def _checkForMaskLikeKeywords(
+ self, package, y_ebuild, keywords, kwlist):
+
+ # KEYWORDS="-*" is a stupid replacement for package.mask
+ # and screws general KEYWORDS seman
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: e5c1c0899f0cf8e1331a1e523a27703fe84fb8c9 Author: Brian Dolbec gentoo org> AuthorDate: Thu Sep 17 04:06:24 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Mon Sep 21 23:42:45 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e5c1c089 repoman: Change name of dev_keywords() due to variable name conflict Signed-off-by: Brian Dolbec gentoo.org> pym/repoman/main.py| 4 ++-- pym/repoman/profile.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pym/repoman/main.py b/pym/repoman/main.py index e276aba..006afc9 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -68,7 +68,7 @@ from repoman.ebuild import Ebuild from repoman.errors import err from repoman.gpg import gpgsign, need_signature from repoman.modules.commit import repochecks -from repoman.profile import check_profiles, dev_keywords, setup_profile +from repoman.profile import check_profiles, dev_profile_keywords, setup_profile from repoman.qa_data import ( format_qa_output, format_qa_output_column, qahelp, qawarnings, qacats, missingvars, @@ -243,7 +243,7 @@ scanlist = scan(repolevel, reposplit, startdir, categories, repo_settings) -dev_keywords = dev_keywords(profiles) +dev_keywords = dev_profile_keywords(profiles) qatracker = QATracker() diff --git a/pym/repoman/profile.py b/pym/repoman/profile.py index 11b93c7..0aedbe8 100644 --- a/pym/repoman/profile.py +++ b/pym/repoman/profile.py @@ -28,7 +28,7 @@ class ProfileDesc(object): valid_profile_types = frozenset(['dev', 'exp', 'stable']) -def dev_keywords(profiles): +def dev_profile_keywords(profiles): """ Create a set of KEYWORDS values that exist in 'dev' profiles. These are used
[gentoo-commits] proj/portage: New tag: v2.2.21
commit: Commit: Brian Dolbec gentoo org> CommitDate: Mon Sep 21 23:42:03 2015 + New tag: v2.2.21
[gentoo-commits] proj/portage:master commit in: /
commit: 0f7269a8abd84f5bdfee717c6e9f8c065357e20f Author: Brian Dolbec gentoo org> AuthorDate: Mon Sep 21 22:11:10 2015 + Commit: Brian Dolbec gentoo org> CommitDate: Mon Sep 21 22:11:10 2015 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=0f7269a8 Update version and RELEASE-NOTES for a release RELEASE-NOTES | 39 +++ setup.py | 2 +- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 285f6d5..e54892b 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -1,6 +1,45 @@ Release Notes; upgrade information mainly. Features/major bugfixes are listed in NEWS +portage-2.2.21 +== +* Bug Fixes: +- Bug 550006 quickpkg: support FEATURES=xattr +- Bug 550324 Fix missed rename of cleanconfig to cleanconfmem +- Bug 550898 rename ia to ia64 +- Bug 550886 enable absolute_import for Python 2 +- Bug 550906 handle submodule import in _LazyImportFrom._get_target +- Bug 552340 Redirect /dev/fd bash test to /dev/null +- Bug 554084 unpack: avoid useless chmods to improve speed +- Bug 554108 use mkdtemp to avoid cgroup interference +- Bug 554578 convert str to Atom for DbapiProvidesIndex +- Bug 554928 depgraph._want_update_pkg: handle _UNREACHABLE_DEPTH +- Bug 556172 slot_conflict_handler: suggest --verbose-conflicts +- Bug 556464 depgraph._select_files: use _iter_match_pkgs for tbz2 arguments +- Bug 555698 circular_dependency_handler: limit USE combination search +- Bug 556764 similar_name_search: used indexed repos where appropriate +- Bug 557426 sync repositories in parallel +- Bug 557962 Manifest.write: stable/predictable Manifest mtime for rsync +- Bug 558322 SyncRepos._sync: call postsync.d hooks earlier +- Bug 557192 egencache: stable use.local.desc mtime for rsync +- Bug 559044 emerge --search: fix duplication of results +- Bug 296085 RsyncSync: add sync-rsync-vcs-ignore option +- Bug 559122 sync: include metadata/layout.conf with profile submodule +- Bug 560466 match_from_list: restrict =* to match only on version part boundaries +* git sync: Respect PORTAGE_QUIET +* several man page updates + + +portage-2.2.20.1 +== +# Note this was a branch release based of the 2.2.20 release +# expressly for the new git based ebuild tree +* Bug Fixes: +- Bug 550324 Fix missed rename of cleanconfig to cleanconfmem +- included a few man page updates +- a couplerepoman changes for the new git based tree + + portage-2.2.20 == * Bug Fixes: diff --git a/setup.py b/setup.py index b1e83b0..3a1a321 100755 --- a/setup.py +++ b/setup.py @@ -612,7 +612,7 @@ def get_manpages(): setup( name = 'portage', - version = '2.2.20', + version = '2.2.21', url = 'https://wiki.gentoo.org/wiki/Project:Portage', author = 'Gentoo Portage Development Team', author_email = 'dev-port...@gentoo.org',
[gentoo-commits] proj/linux-patches: New tag: 4.2-3
commit: Commit: Mike Pagano gentoo org> CommitDate: Mon Sep 21 23:37:03 2015 + New tag: 4.2-3
[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/
commit: 61de86140e055a58496c3c2fb1ab99d0513b
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Sep 21 23:33:37 2015 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Sep 21 23:34:59 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61de
sys-apps/portage: New version: 2.2.21
Fixes bugs 550006, 550324, 550898, 550906, 552340, 554084, 554108,
554578, 554928, 556172, 556464, 555698, 556764, 557426, 557962,
558322, 557192, 559044, 296085, 559122, 560466.
Package-Manager: portage-2.2.21
sys-apps/portage/Manifest | 1 +
sys-apps/portage/portage-2.2.21.ebuild | 365 +
2 files changed, 366 insertions(+)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c456e13..d3a22c4 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,4 +2,5 @@ DIST portage-2.2.14.tar.bz2 896674 SHA256
8dd65971e0f1c31dca922b0f7be06e622aabbe
DIST portage-2.2.18.tar.bz2 942561 SHA256
e0d54f2fbcdc8b5fce716475183fa6e889b6fa8178c92d65a850df73f1636560 SHA512
be4f95bc04a61cdb371fc66a03d2183961bfd458e9b2b89cf8cab8c9e70bde4119be266177d947e31429627609ed75a75c21abfe4b674ca529632d5728e8e8a6
WHIRLPOOL
f334bf5198d2214de557a046ed3217e23d48d8f8d7d64fb0bd2611dd5c8725139eaf7d1e1065f822d8816f3979e86d6a6f8df4d2f4605df0b5c157d6bbf09a6d
DIST portage-2.2.20.1.tar.bz2 950298 SHA256
84dd3ed1d9fd0a3336e956d057590c75834a906ae62a450411232fe5a842475c SHA512
5f7373da20d448059e8fdc8a3593eaca780be3184f0494bac66f5eea7c33d00dd61b9e74cbe9a52413f08cef29d426ed8751e20e16be09178468c18d77a6ae2e
WHIRLPOOL
99643ce0ab74c5df64fb5239948c6102bc39847ff88eaf210c069c0c9587c1e8bdd1a032a7e61c1225b6113645387861d439e9c4f103df4d0f042b73e1afc328
DIST portage-2.2.20.tar.bz2 950293 SHA256
483ce0b20960840f6499452ca4ef7df36fde08f835dcadf3cdd118c1ff7207a4 SHA512
fffb43a4c25a70cae071246fde7e379107535e607b9e8dd9fb513315a10750db92209bb436f532930a44cac06ba43aade06a7c2b0a1d675fd816968ba0fce7ae
WHIRLPOOL
aa1e560007cdafebd2bf56964d61e55a91fef4be5cd9bc50560891140287f6827ecda9d99e31ceb4e5a64691863fde325b51594cfdcfe88eb260fba47dad5fb9
+DIST portage-2.2.21.tar.bz2 962238 SHA256
6dbaedfb677d450f1033650059b658d0e183460e28cd7e91aa2161bfb4e52672 SHA512
2df19d2818e24c0b33f43f3ce12da0cdcc44c8d6cae16ba914dba84f22bab8bdde422dec98a9253d1577fc1438649d6b640a00dfe862e85e10476abe15e8db33
WHIRLPOOL
84a66a8ea8d3ef352f6108edd31790e7513c906ecaba7d54338e73d3ef8d2c7572eb01611d483ad88093ed1c26cd637c7441f4c5bd9f84f41f0478dfd3a96b89
DIST portage-2.2.8.tar.bz2 874672 SHA256
c1074e01173df5384e003598dbc5f64f09e92f83fd26faab2f88f9f0bc64aa7e SHA512
acc47d94ff8c08e5a7bf2d4c4e600863430dd1e7d0bb8b4254d6477a498933cae663db84debf9487d2243c2cba689629ef8e8b6cf108e10d40e89e8e8d7e1257
WHIRLPOOL
d54290ede8d3d85e5211cda7e86ed740178121ef2f47cf0858c27941d8679d29c11445befff962986d40a47ded50d0d4654de19e7d4aef3fdf2546655a0d6fe2
diff --git a/sys-apps/portage/portage-2.2.21.ebuild
b/sys-apps/portage/portage-2.2.21.ebuild
new file mode 100644
index 000..42e1a4a
--- /dev/null
+++ b/sys-apps/portage/portage-2.2.21.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=(
+ pypy
+ python3_3 python3_4
+ python2_7
+)
+# Note: substituted below
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1 multilib
+
+DESCRIPTION="Portage is the package management and distribution system for
Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage";
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
+
+DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
+ >=app-arch/tar-1.27
+ dev-lang/python-exec:2
+ >=sys-apps/sed-4.0.5 sys-devel/patch
+ doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+ epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+RDEPEND="
+ >=app-arch/tar-1.27
+ dev-lang/python-exec:2
+ !build? (
+ >=sys-apps/sed-4.0.5
+ app-shells/bash:0[readline]
+ >=app-admin/eselect-1.2
+ )
+ elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+ elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+ elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+ >=app-misc/pax-utils-0.1.17
+ selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USED
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-sources/
commit: b1f02256b662a2e4b1c4779ec2b9b5e1e9842a69 Author: Mike Pagano gentoo org> AuthorDate: Mon Sep 21 23:34:52 2015 + Commit: Mike Pagano gentoo org> CommitDate: Mon Sep 21 23:34:52 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1f02256 sys-kernel/gentoo-sources: Linux patch 4.1.8 Package-Manager: portage-2.2.20.1 sys-kernel/gentoo-sources/Manifest | 3 +++ .../gentoo-sources/gentoo-sources-4.1.8.ebuild | 31 ++ 2 files changed, 34 insertions(+) diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest index 89d83e8..2224c8d 100644 --- a/sys-kernel/gentoo-sources/Manifest +++ b/sys-kernel/gentoo-sources/Manifest @@ -65,6 +65,9 @@ DIST genpatches-4.1-10.extras.tar.xz 16184 SHA256 5d4492d3d535b3904fe917532b52d3 DIST genpatches-4.1-11.base.tar.xz 233284 SHA256 4189cfd2c7d1a1d7f28c8a596ad36741ce087c7c4cfbe0d5d20a0ee889328d18 SHA512 e5944edf832070d6072ab8efc242165afcfb689874687196c96389c6176ca9772e72e82836aba40ad05840536acae6efd6e72890efd692d903018d47489a90f8 WHIRLPOOL 13cb400b330443025f77dee6c710ca9886991a7032fa3ff925d53ed4fc03d07ece5647dca65de1a149073362db1d7a0b374a21d980eafcae09a4b01584c64cb6 DIST genpatches-4.1-11.experimental.tar.xz 215988 SHA256 6d1c5a4af77c2d81d05c27903e2d15f18beada25a335674ea372762ea6aaff8f SHA512 7504f4b3d0ee47b9b2d720258b6873cfed9b28e04aa9860857e3ec0ad6ef6f36304312c4cc907efd9b2ca6adcedd265ed1f1ba446d6da4eed7c096d7038d9245 WHIRLPOOL 199055e5305141b850dae96d6eab64e7f6870e1eba9d667a9f042d7652adb4485dcd2c30192dffa3d16c994f4d11b5cbc08bd0e4ebca97f51d85e3b1365fc1f9 DIST genpatches-4.1-11.extras.tar.xz 16168 SHA256 be4078adaac6d679a563709dc7528b92587a463877c28d7c49117b5ddd842fe1 SHA512 9a561564511e3a15648f88f1b230e8985e33b3dac92a082cd8d4a5ccf0da8f8eb030fde59f6a0c5664c478751f710e2f2f8f3cf4b13293329444ed702c70732c WHIRLPOOL 46a021f1801aae12167bfb5378ee62cb058a13b18d48c006b9e7fc4a086803c8c509070cee059c5eb817abec317285f7e1157f6f286ed53a4ce7ad761c7d2e36 +DIST genpatches-4.1-12.base.tar.xz 266104 SHA256 d99620d6fa052732357a9b050a878d6ed7f1f3b03c1ae59d99132db8244829cc SHA512 4128fd323a7451692b512b249226f25ed5a0d5aebdf48832495d3d72351ccf61b7d7ecbccdd85915eff023fcb9fcbb408a1c01f2bb58535434153ca00d5ef0a3 WHIRLPOOL 2c9d9f8c989a319fb1b06ff8f2e29feeabed05c41546eb91a0bfa5bf2d586a7ef39c01d1e100519c844e419c92ece745b7192f3e3839c2fcf9dd08d971143c35 +DIST genpatches-4.1-12.experimental.tar.xz 215960 SHA256 8d0659bda61873ce16612e919b7ba6ccb8b5b9b5362ab218a886bf2ccb2684c8 SHA512 b1392299fed208e973eed70174f55ab6e70c0f5c7cbe5e29a12dc27ca9fdb09448314fd3a32b1d4abfa529065d76e7ddbc66cc60019b1d9c66d1b96d0d146dd9 WHIRLPOOL 4e7189dae91ffcf37d70dd9d2547a8e2092cece356e004e9282d5c0aa3d5d992cb7423496ef9f28503e687052b21468e456f83772989a023fe0f8d33a2bdf00a +DIST genpatches-4.1-12.extras.tar.xz 16184 SHA256 dae92203157380e361f9b114a56d59e68cb63a52ec9dfb9f9418b8804549c531 SHA512 3de0640711c7877872872025d10d4a34a8476244d0fcee9ebbaaa02213849683cf27492181783535a167791c35f6ddc0a60f4c939a62daf093739f776151cd15 WHIRLPOOL 6b10caf17084410d8c1b38be868c7658e74210a12f460b56956d8f4b4f462d8018bd983f58a7257a51be27181b20a3cddab1627edb05290b934ad078b307baa3 DIST genpatches-4.2-1.base.tar.xz 3836 SHA256 c89ed0e0b4cf32d16023c4df67e047ee663fdd4bfe84375d373e594c787780c3 SHA512 8b028fdd8b93be92ed457c5722b584d4648220fd86440f3fead1a55ee254d4a4d808f09367929683a4bc58439aa274778aaa7f3ed0e14e3d8a5bb1b497a84644 WHIRLPOOL c1b6c8098339e72a248aabaff0e92d1e8fa5170a443b4beae62e3ec8c1235ba1bb7c1ae06a92b0041ef63c8c463a01f62313bed0f66d66e5d7d7721b4b3f0b49 DIST genpatches-4.2-1.experimental.tar.xz 161668 SHA256 ff7f476b7b75be0779195dd1d7d01ab326b572def562b2741353751d59d43724 SHA512 ec2483b0df034d1d28a0bfc26395fe10fa7a1358f2fbc68d8d0217d3a1e3176bc15ef41c268d3b18b362198a85b44dcb59dfb6aac544e262407516103e9e8a90 WHIRLPOOL fd66c1f678937efe852a68473eb9e8635ed2f24068cb8720466dc76abac32bb1d9e3eacc1f70b92d4b02402e6ec5af3a5639fff1e30f4c435a4dbf384110d25d DIST genpatches-4.2-1.extras.tar.xz 16180 SHA256 a26b453b708e1463b361fa7d49c4ef3e7c4ebcc5d6ae2dfafa1e966d5cf78608 SHA512 cf3dcd49dea36cdc30be17bdbcb929263310bff7907bebc5aa884511b50abcde5d68815013b038fa542f86c3ee2f9d86094b28bc2481261de26e2c8e4f08779c WHIRLPOOL 9e8b6e5977ff574d2b15df42dd05eb77e57306df8135a263226a6924426b08920b31bcc78235e3e974c0bc6f820652abab7eef03694f67cfebb80570d6158d95 diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.1.8.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.1.8.ebuild new file mode 100644 index 000..ed32522 --- /dev/null +++ b/sys-kernel/gentoo-sources/gentoo-sources-4.1.8.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="12" +K_DEBLOB_AVAILABLE="0" +K_KDBUS_AVAILABLE="1" + +inherit kernel-2 +detect_version +detect_arch + +KEYWORDS="~
[gentoo-commits] proj/grs:tinhat-xfce4 commit in: core/etc/skel/.config/xfce4/panel/, ...
commit: 5d8101106b70f1d46146ad92f4d464f1e2c2dbe9 Author: Anthony G. Basile gentoo org> AuthorDate: Mon Sep 21 22:45:59 2015 + Commit: Anthony G. Basile gentoo org> CommitDate: Mon Sep 21 22:45:59 2015 + URL:https://gitweb.gentoo.org/proj/grs.git/commit/?id=5d810110 Clean up desktop. core/etc/skel/.config/xfce4/panel/cpugraph-12.rc | 17 --- .../xfce4/panel/launcher-17/13954274922.desktop| 10 - .../xfce4/panel/launcher-17/14428600041.desktop| 14 + .../xfconf/xfce-perchannel-xml/xfce4-desktop.xml | 24 ++ .../xfconf/xfce-perchannel-xml/xfce4-panel.xml | 10 - 5 files changed, 42 insertions(+), 33 deletions(-) diff --git a/core/etc/skel/.config/xfce4/panel/cpugraph-12.rc b/core/etc/skel/.config/xfce4/panel/cpugraph-12.rc deleted file mode 100644 index d996934..000 --- a/core/etc/skel/.config/xfce4/panel/cpugraph-12.rc +++ /dev/null @@ -1,17 +0,0 @@ -UpdateInterval=0 -TimeScale=0 -Size=16 -Mode=0 -Frame=1 -Border=1 -Bars=1 -TrackedCore=0 -Command=xfce4-taskmanager -InTerminal=0 -StartupNotification=1 -ColorMode=0 -Foreground1=# -Foreground2=# -Foreground3=# -Background=# - diff --git a/core/etc/skel/.config/xfce4/panel/launcher-17/13954274922.desktop b/core/etc/skel/.config/xfce4/panel/launcher-17/13954274922.desktop deleted file mode 100644 index 06b63d9..000 --- a/core/etc/skel/.config/xfce4/panel/launcher-17/13954274922.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Sylpheed -Comment=E-Mail client -Exec=sylpheed -Icon=sylpheed -MimeType=message/rfc822;x-scheme-handler/mailto; -Terminal=false -Type=Application -Categories=GTK;Network;Email;News; -X-XFCE-Source=file:///usr/share/applications/sylpheed.desktop diff --git a/core/etc/skel/.config/xfce4/panel/launcher-17/14428600041.desktop b/core/etc/skel/.config/xfce4/panel/launcher-17/14428600041.desktop new file mode 100644 index 000..6230ece --- /dev/null +++ b/core/etc/skel/.config/xfce4/panel/launcher-17/14428600041.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Version=1.0 +Name=Claws Mail +GenericName=E-mail client +Exec=claws-mail %u +Icon=claws-mail +Categories=Network;Office;Email; +Comment=Lightweight and Fast GTK+ based Mail Client +Terminal=false +Type=Application +StartupNotify=true +MimeType=x-scheme-handler/mailto; +X-Info=Claws Mail +X-XFCE-Source=file:///usr/share/applications/claws-mail.desktop diff --git a/core/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/core/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index 1949349..fffb517 100644 --- a/core/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/core/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -7,6 +7,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -40,4 +60,8 @@ + + + + diff --git a/core/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/core/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml index 8e41b64..e7d4d8a 100644 --- a/core/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml +++ b/core/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml @@ -16,7 +16,6 @@ - @@ -56,12 +55,12 @@ - + @@ -122,7 +121,7 @@ - + @@ -152,13 +151,12 @@ - - + + -
[gentoo-commits] proj/linux-patches: New tag: 4.1-12
commit: Commit: Mike Pagano gentoo org> CommitDate: Mon Sep 21 22:22:13 2015 + New tag: 4.1-12
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-sources/
commit: e861a7c0fcd71f04676d68be6cbb02677951bc5d
Author: Mike Pagano gentoo org>
AuthorDate: Mon Sep 21 22:08:54 2015 +
Commit: Mike Pagano gentoo org>
CommitDate: Mon Sep 21 22:08:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e861a7c0
sys-kernel/vanilla-sources: Version bumps. Remove old.
Package-Manager: portage-2.2.20.1
sys-kernel/vanilla-sources/Manifest | 5 ++---
.../{vanilla-sources-4.1.7.ebuild => vanilla-sources-4.1.8.ebuild} | 2 +-
.../{vanilla-sources-4.2.0.ebuild => vanilla-sources-4.2.1.ebuild} | 0
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/sys-kernel/vanilla-sources/Manifest
b/sys-kernel/vanilla-sources/Manifest
index f35a2b0..f2119f8 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -2,12 +2,10 @@ DIST deblob-3.10 117299 SHA256
d48cad04fab6a802b3a3e34955c8e35b539c2441f9a62522e
DIST deblob-3.14 121249 SHA256
980400e0db952ccdb5a507f99444330af893ed0f8a7a052916fcf0c2b2631f7e SHA512
2cbdf4f3947c12ade0931f0b3fb8b9c0312626a3bfea9d1c7d8d1d875b4673624ed3a6369653521998bbea0cde6730b573d6be918d052f1b553e093cb42a838f
WHIRLPOOL
7ba1738ac829d8848104843da6237576f235c0151d53944ff3a7e0308cfb91600ffb9253402a34c2ed106c5b0bb3ce36785ead990396465341a957c58319221c
DIST deblob-3.2 107195 SHA256
2e8a59bf7f18425652050a1b9f2fe2e8d1f09b50b33ee633771ac03943345e81 SHA512
8de24b5dade9256caf20215692f2e53e403f99d3d1e81b301263ae5f8ce667780a1df7917094155fb47210f22e7839e3d08e4f3a84c86ae6bf582227b938229d
WHIRLPOOL
f7abda0702c9b038ee82b462d1de30bd21b28d591058f417aa399581e93ba35638f476544e6acfb12760d672dab067916e4c68275c91f4c01d3bef7f685ed67b
DIST deblob-3.4 108298 SHA256
b005dd372b8e55b19fc583fd99a3e95e44844b56305fdff7fdbd5f924a6c0308 SHA512
ce3df3c4850f0da821286acfa1b6c94e16350578f76a4df93284d2fe201dd78ce15dfb5c56727d8f90012062db180d5e9ee81ac3372f5b46e0deabdcfc03ca19
WHIRLPOOL
79386c1e04ca84709fce6ec4ea5eb308876d86f04a1b28f1eda4653d4917b3b9aa9b8a6b82605da3456d29e800dd5bbfcb27c124f1a01057d25b18871bc8770d
-DIST deblob-4.1 130695 SHA256
2888a5a3b5e8e9ec242e4d702582fa1d739a1274fcd94643a9fb3516a210a8a7 SHA512
b861b9b53f9295e5e993784031ce57cf8cddc418184ec00c28ed92c9e7660406e0ede581a93d0def36e7847b8e068c8ca6c4dfdd65c15cb174d6c5803c16214a
WHIRLPOOL
b90f55dd8702eb254968ed7689b50859833ed362e9aa1720ade96aa1f6f84e8f90f5d1eee034c8535e8bf767c0b5f8b0bc559219e8d81d4c6ed53bd5cfe5e65e
DIST deblob-check-3.10 612122 SHA256
5a9552abac85cab9715a958785a3f901937fa135d85452647a16398181909c12 SHA512
c52917e9de8211f66a1e6805282dd727f1ec86701f76cbf16d0909ec212a9429c0994e0993db95b57934b17d9d91b08b4fa29f80c501397a5acce84bf4e1aed9
WHIRLPOOL
d1c591fe7e229f9638945dd14f7dd16617ecff224b4cf2a6a3dd58913c23f7eb67496c26235d1d4637607bc9c9d260d990a0935b6b5bf2332f15e8ed58269856
DIST deblob-check-3.14 613905 SHA256
4c69ea1c225b1a84c41e75392dcaa94f77dd8e647aff3afe52f1ab16ac99c5e5 SHA512
4dd7e785727ce29d78f5f68431fcb6ea9dfda5221dc8e699f40d13e3c85411707b13c288d23f8baa6b3c47f5a67ac58da0a7f1a51c4d9fdda82a7428ead88cf4
WHIRLPOOL
de1b67955662f072193f58b7e7dbd98c6680958c2d65632bfb831dc0681945a4d1c27abe978e6ee687ae8f48773eb71c2f9026f461377b28235e7f7e39832a67
DIST deblob-check-3.2 557345 SHA256
60d05db20e7b50919ca44487d05e8faa9cca830318bd8d96625f0f75b252eeed SHA512
6b857380d495261c4d356639157f99f3ca3412388fd3b1c72b566c3bb6453c5a22ab7716e3b24e64a9b63dab912b07bafd0fca806ac0e0620efeef777b6a
WHIRLPOOL
877c2c9b813466f9aa5cfecdc9ab93247bd2cdead457c9e0bd97da49d042d0a52262f9b4f8e9c83e397b57c5bb5a8fe2b61bb5f44d5a178a579cc9fff990941a
DIST deblob-check-3.4 612122 SHA256
5a9552abac85cab9715a958785a3f901937fa135d85452647a16398181909c12 SHA512
c52917e9de8211f66a1e6805282dd727f1ec86701f76cbf16d0909ec212a9429c0994e0993db95b57934b17d9d91b08b4fa29f80c501397a5acce84bf4e1aed9
WHIRLPOOL
d1c591fe7e229f9638945dd14f7dd16617ecff224b4cf2a6a3dd58913c23f7eb67496c26235d1d4637607bc9c9d260d990a0935b6b5bf2332f15e8ed58269856
-DIST deblob-check-4.1 674781 SHA256
54aa33e23a31ead6f982b830be86003c306b88f0d0a9f96c7dc66fe7cd274acb SHA512
51fe9d70d723992aaf70f8bfcfcc12ecfedd7a039402ddae07858fb087693b00cd80d1e0e1a5053e049f2a2b8c58ed23e4598e2dae902c499c08bc2eeb33
WHIRLPOOL
d2c22280e12863793f8e866b126be53ee10d564373addfe9399b2afe22dd7584513c050f334ea08e6d63dd27a1574f2754456bad9d0a42e8c8d9995eec27aed0
DIST linux-3.10.tar.xz 73175088 SHA256
df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512
5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35
WHIRLPOOL
e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
DIST linux-3.12.tar.xz 76384600 SHA256
2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512
4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff
[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/
commit: 24f3a5811c0f81392c05d9b8e3d9f42e2aa2627e
Author: Rémi Cardona gentoo org>
AuthorDate: Mon Sep 21 21:54:25 2015 +
Commit: Remi Cardona gentoo org>
CommitDate: Mon Sep 21 21:54:25 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=24f3a581
dev-libs/glib: bump to 2.46.0
Package-Manager: portage-2.2.20.1
Manifest-Sign-Key: 901AB08A
dev-libs/glib/{glib-2.45.7.ebuild => glib-2.46.0.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/dev-libs/glib/glib-2.45.7.ebuild b/dev-libs/glib/glib-2.46.0.ebuild
similarity index 100%
rename from dev-libs/glib/glib-2.45.7.ebuild
rename to dev-libs/glib/glib-2.46.0.ebuild
[gentoo-commits] proj/gnome:master commit in: dev-util/gdbus-codegen/
commit: 8a81186e037a86c73b3dc02d6eb89f704f0bd659
Author: Rémi Cardona gentoo org>
AuthorDate: Mon Sep 21 21:53:45 2015 +
Commit: Remi Cardona gentoo org>
CommitDate: Mon Sep 21 21:53:45 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=8a81186e
dev-util/gdbus-codegen: bump to 2.46.0
Package-Manager: portage-2.2.20.1
Manifest-Sign-Key: 901AB08A
.../{gdbus-codegen-2.45.7.ebuild => gdbus-codegen-2.46.0.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.45.7.ebuild
b/dev-util/gdbus-codegen/gdbus-codegen-2.46.0.ebuild
similarity index 100%
rename from dev-util/gdbus-codegen/gdbus-codegen-2.45.7.ebuild
rename to dev-util/gdbus-codegen/gdbus-codegen-2.46.0.ebuild
[gentoo-commits] repo/gentoo:master commit in: eclass/
commit: 8af6f9fc1c787c3d31beb90ba113cf963d43020f
Author: Sergei Trofimovich gentoo org>
AuthorDate: Mon Sep 21 21:42:26 2015 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Mon Sep 21 21:42:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8af6f9fc
haskell-cabal.eclass: don't require haddock on ghc-7.10
While at it update default Cabal stub Setup code.
Signed-off-by: Sergei Trofimovich gentoo.org>
eclass/haskell-cabal.eclass | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass
index 47a9e16..132c3a1 100644
--- a/eclass/haskell-cabal.eclass
+++ b/eclass/haskell-cabal.eclass
@@ -103,7 +103,13 @@ if [[ -n "${CABAL_USE_HADDOCK}" ]]; then
IUSE="${IUSE} doc"
# don't require depend on itself to build docs.
# ebuild bootstraps docs from just built binary
- [[ ${CATEGORY}/${PN} = "dev-haskell/haddock" ]] || DEPEND="${DEPEND}
doc? ( dev-haskell/haddock )"
+ #
+ # starting from ghc-7.10.2 we install haddock bundled with
+ # ghc to keep links to base and ghc library, otherwise
+ # newer haddock versions change index format and can't
+ # read index files for packages coming with ghc.
+ [[ ${CATEGORY}/${PN} = "dev-haskell/haddock" ]] || \
+ DEPEND="${DEPEND} doc? ( || ( dev-haskell/haddock
>=dev-lang/ghc-7.10.2 ) )"
fi
if [[ -n "${CABAL_USE_HSCOLOUR}" ]]; then
@@ -240,7 +246,7 @@ cabal-mksetup() {
rm -vf "${setupdir}"/Setup.{lhs,hs}
elog "Creating 'Setup.hs' for 'Simple' build type."
- echo 'import Distribution.Simple; main = defaultMainWithHooks
defaultUserHooks' \
+ echo 'import Distribution.Simple; main = defaultMain' \
> "${setup_src}" || die "failed to create default Setup.hs"
}
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/
commit: 42b0f9c7e6dbd0b751f6728f226cd4c5ed946cc6
Author: Matthias Maier gentoo org>
AuthorDate: Mon Sep 21 21:29:51 2015 +
Commit: Matthias Maier gentoo org>
CommitDate: Mon Sep 21 21:35:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42b0f9c7
sci-visualization/paraview: Fix configuration issue with dev-db/mysql-6.1.6,
bug #560916
dev-db/mysql-5.5.29 and older have left the tree two years ago. Remove
buggy compatibility code that identified version 6.1.6 being less than
5.5.29...
Gentoo-Bug: 560916
Package-Manager: portage-2.2.20.1
sci-visualization/paraview/paraview-4.3.1.ebuild | 14 --
sci-visualization/paraview/paraview-4.4.0.ebuild | 14 --
2 files changed, 28 deletions(-)
diff --git a/sci-visualization/paraview/paraview-4.3.1.ebuild
b/sci-visualization/paraview/paraview-4.3.1.ebuild
index c978762..c9a1b26 100644
--- a/sci-visualization/paraview/paraview-4.3.1.ebuild
+++ b/sci-visualization/paraview/paraview-4.3.1.ebuild
@@ -125,18 +125,6 @@ src_prepare() {
}
src_configure() {
- local mysql_lib mysql_includedir
-
- if use mysql ; then
- if [[ $(mysql_config --version | sed 's/\.//g') -lt 5529 ]] ;
then
- mysql_lib="/usr/$(get_libdir)/mysql/libmysqlclient.so"
- mysql_includedir="/usr/include/mysql"
- else
- mysql_lib="$(mysql_config
--variable=pkglibdir)/libmysqlclient.so"
- mysql_includedir="$(mysql_config
--variable=pkgincludedir)"
- fi
- fi
-
# VTK_USE_SYSTEM_QTTESTING
# PARAVIEW_USE_SYSTEM_AUTOBAHN
local mycmakeargs=(
@@ -171,8 +159,6 @@ src_configure() {
-DVTK_USE_FFMPEG_ENCODER=OFF
-DPROTOC_LOCATION=$(type -P protoc)
-DVTK_Group_StandAlone=ON
- -DMYSQL_INCLUDE_DIRECTORIES="$(usex mysql "${mysql_includedir}"
"")"
- -DMYSQL_LIBRARY="$(usex mysql "${mysql_lib}" "")"
# force this module due to incorrect build system deps
# wrt bug 460528
-DModule_vtkUtilitiesProcessXML=ON
diff --git a/sci-visualization/paraview/paraview-4.4.0.ebuild
b/sci-visualization/paraview/paraview-4.4.0.ebuild
index 21ac4ab..89dd7f3 100644
--- a/sci-visualization/paraview/paraview-4.4.0.ebuild
+++ b/sci-visualization/paraview/paraview-4.4.0.ebuild
@@ -123,18 +123,6 @@ src_prepare() {
}
src_configure() {
- local mysql_lib mysql_includedir
-
- if use mysql ; then
- if [[ $(mysql_config --version | sed 's/\.//g') -lt 5529 ]] ;
then
- mysql_lib="/usr/$(get_libdir)/mysql/libmysqlclient.so"
- mysql_includedir="/usr/include/mysql"
- else
- mysql_lib="$(mysql_config
--variable=pkglibdir)/libmysqlclient.so"
- mysql_includedir="$(mysql_config
--variable=pkgincludedir)"
- fi
- fi
-
# VTK_USE_SYSTEM_QTTESTING
# PARAVIEW_USE_SYSTEM_AUTOBAHN
local mycmakeargs=(
@@ -169,8 +157,6 @@ src_configure() {
-DVTK_USE_FFMPEG_ENCODER=OFF
-DPROTOC_LOCATION=$(type -P protoc)
-DVTK_Group_StandAlone=ON
- -DMYSQL_INCLUDE_DIRECTORIES="$(usex mysql "${mysql_includedir}"
"")"
- -DMYSQL_LIBRARY="$(usex mysql "${mysql_lib}" "")"
# force this module due to incorrect build system deps
# wrt bug 460528
-DModule_vtkUtilitiesProcessXML=ON
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/paraview/files/, sci-visualization/paraview/
commit: 3dcb8854a1862b2b215bad47782f184b8f3f6a39
Author: Matthias Maier gentoo org>
AuthorDate: Mon Sep 21 21:35:02 2015 +
Commit: Matthias Maier gentoo org>
CommitDate: Mon Sep 21 21:35:55 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dcb8854
sci-visualization/paraview: drop version 4.2.0-r1
Package-Manager: portage-2.2.20.1
sci-visualization/paraview/Manifest| 1 -
.../paraview/files/paraview-4.0.1-vtknetcd.patch | 79 --
.../paraview/paraview-4.2.0-r1.ebuild | 300 -
3 files changed, 380 deletions(-)
diff --git a/sci-visualization/paraview/Manifest
b/sci-visualization/paraview/Manifest
index 4b660f9..f97d7ed 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,4 +1,3 @@
DIST ParaView-v4.1.0-source.tar.gz 50460304 SHA256
80ef898c158d7fd9ceb0bcd83be1f679eef06ce4f20514a2435330cc97a3fdf3 SHA512
da91f7332a91746d60968a9d6cc1fe4878a3710f8e4a3d675dc65c337d6844f39df4c3e307d424ee0d2a832fd3c0f3d0c4da6a8b0a2aa6902920988fb53b9f7f
WHIRLPOOL
c3572d12f05b8443eb21a342c140d55e3c41e2af383aa850491aaeec412e62a45a4ee44e6d772dc9b6f141028911cb96b22a7818c6f15bc80bb8553d37008d96
-DIST ParaView-v4.2.0-source.tar.gz 50285547 SHA256
ac26cc5fe5ce82d27531727a01242353d40984826eaa580edea0791887a07b6b SHA512
611f641ccaa62b285c595df0318da94a9e0e67a1c3040f60c33bdd32bf980db8371c84958c9d5f3191cfd5249969a60f51f8e5dfa9bd234c96ec51caecdb37c8
WHIRLPOOL
1c81a95e00f06b3c60e31c82aa6e87979c6d9b8000ca7298904d8c3f09df58153f6dde7b96df5f538a991f5764862d3059d1395db61f12464306d3c3fe919fe7
DIST ParaView-v4.3.1-source.tar.gz 50842525 SHA256
d534c475fc052215ecadf4ad19d9c7996c634b5d965951292b966710509a2542 SHA512
73c17f7ba757647869b26992c0ac3a6b9298bce9d2b8c2fca28286064f2b83a29753028a29c6f478654fffc96c9d9f5dd638c64df2b05ded425da122109d31e3
WHIRLPOOL
3db1d02db95acf16f29c4784714985e4f6f7a32fbdf7fa58ad85ecfaf6ab60d7959ea3d5a3ab5d36739e56f1ee5b025d9b6275749966b576324629f14e96bde0
DIST ParaView-v4.4.0-source.tar.gz 58397252 SHA256
c2dc334a89df24ce5233b81b74740fc9f10bc181cd604109fd13f6ad2381fc73 SHA512
092dee4ca75b9f4e3b4a53c85ebc89f406a91f6dd9ac9a3deb65de776189c2582d15c2b1f8f0393ff4d7a438333f8801de22d2cf916b314d8b85d93cc5f4671e
WHIRLPOOL
722be36c45563066a2e91e7ea3e382d6928056a38c01920089f6e16a721259e1e8f99b26c982f136f9cfac8f1cb1d9f54ee0267cea79360ace4c00e81a47e61b
diff --git a/sci-visualization/paraview/files/paraview-4.0.1-vtknetcd.patch
b/sci-visualization/paraview/files/paraview-4.0.1-vtknetcd.patch
deleted file mode 100644
index a478b7d..000
--- a/sci-visualization/paraview/files/paraview-4.0.1-vtknetcd.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-adapted from debian patch need to be applied after
paraview-3.14.1-removesqlite.patch
-
ParaView-3.98.0-src/VTK/ThirdParty/netcdf/CMakeLists.txt
-+++ ParaView-3.98.0-src/VTK/ThirdParty/netcdf/CMakeLists.txt
-@@ -1,8 +1,8 @@
--set(vtknetcdf_THIRD_PARTY 1)
--set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx)
--set(vtknetcdf_INCLUDE_DIRS
-- ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include
-- ${vtknetcdf_BINARY_DIR}/vtknetcdf
-- )
-+#set(vtknetcdf_THIRD_PARTY 1)
-+set(vtknetcdf_LIBRARIES netcdf netcdf_c++)
-+#set(vtknetcdf_INCLUDE_DIRS
-+# ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include
-+# ${vtknetcdf_BINARY_DIR}/vtknetcdf
-+# )
- vtk_module_export_info()
--add_subdirectory(vtknetcdf)
-+#add_subdirectory(vtknetcdf)
ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdf.h
-+++ ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdf.h
-@@ -16,6 +16,6 @@
- #define __vtk_netcdf_h
-
- /* Use the netcdf library configured for VTK. */
--#include
-+#include
-
- #endif
ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdfcpp.h
-+++ ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdfcpp.h
-@@ -16,6 +16,6 @@
- #define __vtk_netcdfcpp_h
-
- /* Use the netcdf library configured for VTK. */
--#include
-+#include
-
- #endif
ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/test/CMakeLists.txt
-+++ ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/test/CMakeLists.txt
-@@ -21,7 +21,7 @@
- )
-
- add_executable(ExoIICTests ${ExoIICTests})
--target_link_libraries(ExoIICTests vtkCommon vtkexoIIc vtkNetCDF)
-+target_link_libraries(ExoIICTests vtkCommon vtkexoIIc netcdf)
-
- set(TestsToRun ${ExoIICTests})
- remove(TestsToRun ExoIICTests.cxx)
ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
-+++ ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
-@@ -241,7 +241,7 @@
-
-
- VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS})
--TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF)
-+TARGET_LINK_LIBRARIES(vtkexoIIc netcdf)
-
- IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
- # INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR}/vtkexodus2 .h
ParaView-3.98.0-src/VTK/IO/NetCDF/CMakeLists.txt
-+++ ParaView-3.98.0-src/VTK/IO/NetCDF/CMakeLists.txt
-@@ -10,5 +10,5 @@
-
- vtk_module_library(vtkIONetCDF ${Module_SRCS})
-
--target_link_
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/testpack/files/, dev-haskell/testpack/
commit: 45b650a0f158ec844470ff81cb64999c93196cfd
Author: Sergei Trofimovich gentoo org>
AuthorDate: Mon Sep 21 21:25:33 2015 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Mon Sep 21 21:27:36 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45b650a0
dev-haskell/testpack: tweak for QuickCheck-2.8, bug #561010
Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/561010
Package-Manager: portage-2.2.20
dev-haskell/testpack/files/testpack-2.1.3.0-HUnit-1.3.patch | 13 +
dev-haskell/testpack/files/testpack-2.1.3.0-qc28.patch | 2 +-
dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild | 1 +
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/dev-haskell/testpack/files/testpack-2.1.3.0-HUnit-1.3.patch
b/dev-haskell/testpack/files/testpack-2.1.3.0-HUnit-1.3.patch
new file mode 100644
index 000..599615a
--- /dev/null
+++ b/dev-haskell/testpack/files/testpack-2.1.3.0-HUnit-1.3.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Test/HUnit/Tools.hs b/src/Test/HUnit/Tools.hs
+index a24a510..6b8a25e 100644
+--- a/src/Test/HUnit/Tools.hs
b/src/Test/HUnit/Tools.hs
+@@ -97,3 +97,7 @@ runVerbTestText (HU.PutText put us) t = do
+ reportFailure = reportProblem "Failure:" "Failure in: "
+- reportProblem p0 p1 msg ss us = put line True us
++ reportProblem p0 p1
++#if MIN_VERSION_HUnit(1,3,0)
++ _loc
++#endif
++ msg ss us = put line True us
+where line = "### " ++ kind ++ path' ++ '\n' : msg
diff --git a/dev-haskell/testpack/files/testpack-2.1.3.0-qc28.patch
b/dev-haskell/testpack/files/testpack-2.1.3.0-qc28.patch
index 1bc9537..4ca1848 100644
--- a/dev-haskell/testpack/files/testpack-2.1.3.0-qc28.patch
+++ b/dev-haskell/testpack/files/testpack-2.1.3.0-qc28.patch
@@ -116,7 +116,7 @@ index 712c9bf..506686f 100644
- reason = "Result: expected " ++ show expected ++ ", got "
++ show actual,
- stamp = [], callbacks = []}
-
-+P.result { P.ok = Just (expected == actual)
++P.failed { P.ok = Just (expected == actual)
+ , P.reason = "Result: expected " ++ show expected ++ ", got
" ++ show actual
+ }
{- | Like '@=?', but with args in a different order. -}
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 a3fa62e..97ca628 100644
--- a/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild
+++ b/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild
@@ -30,4 +30,5 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}"/${P}-qc28.patch
+ epatch "${FILESDIR}"/${P}-HUnit-1.3.patch
}
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/testpack/
commit: f1dea7b12417bfdb125985921e8ca75b17768f6e
Author: Sergei Trofimovich gentoo org>
AuthorDate: Mon Sep 21 21:27:18 2015 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Mon Sep 21 21:27:38 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1dea7b1
dev-haskell/testpack: amd64 x86 stable, bug #561010
Package-Manager: portage-2.2.20
dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 97ca628..7168eb3 100644
--- a/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild
+++ b/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild
@@ -15,7 +15,7 @@
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
IUSE=""
RDEPEND="dev-haskell/hunit:=[profile?]
[gentoo-commits] repo/gentoo:master commit in: dev-perl/SRU/
commit: d744fc0a69a5e65409d0771f3e8cc1082f58f0d8 Author: Andreas K. Huettel (dilfridge) gentoo org> AuthorDate: Mon Sep 21 20:56:25 2015 + Commit: Andreas Hüttel gentoo org> CommitDate: Mon Sep 21 20:56:25 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d744fc0a dev-perl/SRU: Fix header Package-Manager: portage-2.2.20.1 dev-perl/SRU/SRU-1.10.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-perl/SRU/SRU-1.10.0.ebuild b/dev-perl/SRU/SRU-1.10.0.ebuild index 40115c8..fbf8576 100644 --- a/dev-perl/SRU/SRU-1.10.0.ebuild +++ b/dev-perl/SRU/SRU-1.10.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$
[gentoo-commits] repo/gentoo:master commit in: dev-perl/Math-Base-Convert/
commit: 1be61e5c18425b6ac9b8254f6844c3aad361ff86 Author: Andreas K. Huettel (dilfridge) gentoo org> AuthorDate: Mon Sep 21 21:04:53 2015 + Commit: Andreas Hüttel gentoo org> CommitDate: Mon Sep 21 21:04:53 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1be61e5c dev-perl/Math-Base-Convert: New package, needed by dev-perl/SQL-Statement Package-Manager: portage-2.2.20.1 dev-perl/Math-Base-Convert/Manifest | 1 + .../Math-Base-Convert/Math-Base-Convert-0.80.0.ebuild | 19 +++ dev-perl/Math-Base-Convert/metadata.xml | 5 + 3 files changed, 25 insertions(+) diff --git a/dev-perl/Math-Base-Convert/Manifest b/dev-perl/Math-Base-Convert/Manifest new file mode 100644 index 000..91a4313 --- /dev/null +++ b/dev-perl/Math-Base-Convert/Manifest @@ -0,0 +1 @@ +DIST Math-Base-Convert-0.08.tar.gz 41469 SHA256 ed6f9324f8e9385e4a003a9b89d00189eaa8e537fcf940240b5f2a9c6f23844b SHA512 3c7582ba0b9844cce8ec3d1f26e385b1370930625f93eaf8752ab0700e2cdf50af591e277b05426044d847f791a75f0992d2ed4d1e22c483593e637a06827496 WHIRLPOOL 8e901b23cc990b45cef9c6dd18a0abfc973fe5f9ab6143b758dad00eae7bb850afee9c9b4fd793c854d4179c1818709c62ac0fa23a2e4bbc0e44169dbaadb16d diff --git a/dev-perl/Math-Base-Convert/Math-Base-Convert-0.80.0.ebuild b/dev-perl/Math-Base-Convert/Math-Base-Convert-0.80.0.ebuild new file mode 100644 index 000..fa67f10 --- /dev/null +++ b/dev-perl/Math-Base-Convert/Math-Base-Convert-0.80.0.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +MODULE_AUTHOR=MIKER +MODULE_VERSION=0.08 +inherit perl-module + +DESCRIPTION="Very fast base to base conversion" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="virtual/perl-ExtUtils-MakeMaker" + +SRC_TEST="do parallel" diff --git a/dev-perl/Math-Base-Convert/metadata.xml b/dev-perl/Math-Base-Convert/metadata.xml new file mode 100644 index 000..36ee0f0 --- /dev/null +++ b/dev-perl/Math-Base-Convert/metadata.xml @@ -0,0 +1,5 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + perl +
[gentoo-commits] repo/gentoo:master commit in: dev-perl/SRU/
commit: ffb88293d38309c1c10bab7f61d1dcfbeeb22f27
Author: Andreas K. Huettel (dilfridge) gentoo org>
AuthorDate: Mon Sep 21 20:55:54 2015 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Mon Sep 21 20:55:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffb88293
dev-perl/SRU: Version bump
Package-Manager: portage-2.2.20.1
dev-perl/SRU/Manifest | 1 +
dev-perl/SRU/SRU-1.10.0.ebuild | 33 +
2 files changed, 34 insertions(+)
diff --git a/dev-perl/SRU/Manifest b/dev-perl/SRU/Manifest
index 42d0250..cffc0aa 100644
--- a/dev-perl/SRU/Manifest
+++ b/dev-perl/SRU/Manifest
@@ -1 +1,2 @@
DIST SRU-1.00.tar.gz 37372 SHA256
ada7ff304b032be18b5401b908fec08fd78955672f11548db9b8d0adb877c8e3 SHA512
7677ca5edbb7406b3729af4a1b3c6975cf6ce6c8a2ee509f7410ac8db3c500c17194b5bc9212d652998703e7fdc631f46164209e49f78f60d1a11cd1c0648176
WHIRLPOOL
059441d0d39c307c18d6d2b47110871a26bfa7244ceac0d45fd295b5396bd28e76b128a22d54d83c9c47a9ae27a7fcaae596effd4285477ad1ffe55cef033860
+DIST SRU-1.01.tar.gz 26505 SHA256
e1fb9dc4f833213d11b3931bb8dcf58909a561f4c0d2489daa7351c41ccbc4c5 SHA512
07d5263901f732f9c60fa26f836f6f1c9dcd461947ea10697c73ff16499d1270592530bf95b4cd89811420472ab0b9cfd1c0214d26577830193dbe9017ae42cb
WHIRLPOOL
f9a3802812daa92b11b52c6331e090e915c62de4760cbfd7ee8b97c3a1ab071fecc004944d01e2aa097f74f4d65d3dcae3455d3018bae4150585117886b26cde
diff --git a/dev-perl/SRU/SRU-1.10.0.ebuild b/dev-perl/SRU/SRU-1.10.0.ebuild
new file mode 100644
index 000..40115c8
--- /dev/null
+++ b/dev-perl/SRU/SRU-1.10.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=BRICAS
+MODULE_VERSION=1.01
+inherit perl-module
+
+DESCRIPTION="Search and Retrieval by URL"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ >=dev-perl/CQL-Parser-1.120.0
+ virtual/perl-Carp
+ dev-perl/Class-Accessor
+ dev-perl/URI
+ dev-perl/XML-LibXML
+ dev-perl/XML-Simple
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-perl/Test-Exception
+ dev-perl/Test-Pod
+ dev-perl/Test-Pod-Coverage
+ )
+"
+
+SRC_TEST="do parallel"
[gentoo-commits] repo/gentoo:master commit in: dev-perl/SQL-Statement/
commit: fcc8db0bf40767ab6acb64fe6243b087074accc0
Author: Andreas K. Huettel (dilfridge) gentoo org>
AuthorDate: Mon Sep 21 21:07:39 2015 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Mon Sep 21 21:07:39 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcc8db0b
dev-perl/SQL-Statement: Version bump
Package-Manager: portage-2.2.20.1
dev-perl/SQL-Statement/Manifest| 1 +
.../SQL-Statement/SQL-Statement-1.407.0.ebuild | 38 ++
2 files changed, 39 insertions(+)
diff --git a/dev-perl/SQL-Statement/Manifest b/dev-perl/SQL-Statement/Manifest
index 4e5db3e..210d784 100644
--- a/dev-perl/SQL-Statement/Manifest
+++ b/dev-perl/SQL-Statement/Manifest
@@ -1 +1,2 @@
DIST SQL-Statement-1.405.tar.gz 138703 SHA256
239094b6f18c36d174a7a9aa73c13cbaf9fec83d68dce5a2226a6120bb673026 SHA512
e7aa4cd9c300d3638e07e078c09d0e551fe799311b871f1a669efd4bf3f4675068895f86d15b852aa0230decacc3f019ad55a2972d0d298813ca189e9b57281b
WHIRLPOOL
65602df50ef0f81a79a76bad4ea2cb37fb45d9235740e0c46a2f7ce2c044f23217d21fd6d59cd50a6422e9eda1b3ca5779823d3d76997957a658b44d566bec46
+DIST SQL-Statement-1.407.tar.gz 137336 SHA256
f6e0c82b924a9eb983ad1561cad8bdd10f50fef97e53696e948ae167bd33b4d0 SHA512
65957c9085cf61e8ec4b80b5e1a9fc89fe22c05213b5673d311de06e6bd2645ed94a7d97eac7ca5e56a69b6d36ba0b235ebfd904903295e9a1e6c48a100750f4
WHIRLPOOL
148dc98070adf2db7e721b0d5b4332e71e4f7232c90d039fe634a7f67b9294412c62428c72cc7912b204ed8a75fa21efb3a1ad0be52b18007d514d46976afd77
diff --git a/dev-perl/SQL-Statement/SQL-Statement-1.407.0.ebuild
b/dev-perl/SQL-Statement/SQL-Statement-1.407.0.ebuild
new file mode 100644
index 000..07ca8a7
--- /dev/null
+++ b/dev-perl/SQL-Statement/SQL-Statement-1.407.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=REHSACK
+MODULE_VERSION=1.407
+inherit perl-module
+
+DESCRIPTION="Small SQL parser and engine"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ virtual/perl-Carp
+ >=dev-perl/Clone-0.30
+ virtual/perl-Data-Dumper
+ dev-perl/Module-Runtime
+ >=dev-perl/Params-Util-1.0.0
+ >=virtual/perl-Scalar-List-Utils-1.0.0
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ dev-perl/Test-Pod
+ dev-perl/Test-Pod-Coverage
+ dev-perl/Math-Base-Convert
+ )
+"
+
+SRC_TEST="do parallel"
+
+#pkg_setup() {
+# export SQL_STATEMENT_WARN_UPDATE=sure
+#}
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/dbus-core/files/, dev-haskell/dbus-core/
commit: b30b60e19d49886b714bc4e614fe0cac147e1c31
Author: Sergei Trofimovich gentoo org>
AuthorDate: Mon Sep 21 20:23:09 2015 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Mon Sep 21 20:23:48 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b30b60e1
dev-haskell/dbus-core: port to ghc-7.10, bug #561014
Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/561014
Package-Manager: portage-2.2.20
dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild| 4 +-
.../dbus-core/files/dbus-core-0.9.3-ghc-7.10.patch | 96 ++
2 files changed, 99 insertions(+), 1 deletion(-)
diff --git a/dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild
b/dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild
index dae07a2..a3dd10e 100644
--- a/dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild
+++ b/dev-haskell/dbus-core/dbus-core-0.9.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -31,6 +31,8 @@ DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.6"
src_prepare() {
+ epatch "${FILESDIR}"/${P}-ghc-7.10.patch
+
if has_version "http://hackage.haskell.org/trac/hackage/ticket/626
# The haddock --hoogle option does not like unicode characters,
which causes
diff --git a/dev-haskell/dbus-core/files/dbus-core-0.9.3-ghc-7.10.patch
b/dev-haskell/dbus-core/files/dbus-core-0.9.3-ghc-7.10.patch
new file mode 100644
index 000..402df00
--- /dev/null
+++ b/dev-haskell/dbus-core/files/dbus-core-0.9.3-ghc-7.10.patch
@@ -0,0 +1,96 @@
+diff --git a/hs/DBus/Connection/Authentication.hs
b/hs/DBus/Connection/Authentication.hs
+index b909a38..c33d311 100644
+--- a/hs/DBus/Connection/Authentication.hs
b/hs/DBus/Connection/Authentication.hs
+@@ -25,3 +25,4 @@ module DBus.Connection.Authentication
+ import Prelude hiding (getLine, head)
+-import Control.Monad (liftM)
++import Control.Applicative
++import Control.Monad
+ import qualified Data.ByteString
+@@ -58,2 +59,9 @@ data Auth a = Auth
+
++instance Functor Auth where
++fmap = liftM
++
++instance Applicative Auth where
++pure = return
++(<*>) = ap -- defined in Control.Monad
++
+ instance Monad Auth where
+diff --git a/hs/DBus/Introspection.hs b/hs/DBus/Introspection.hs
+index 96ff4a3..da82812 100644
+--- a/hs/DBus/Introspection.hs
b/hs/DBus/Introspection.hs
+@@ -29,3 +29,4 @@ module DBus.Introspection
+ ) where
+-import Control.Monad ((>=>))
++import Control.Applicative
++import Control.Monad
+ import Control.Monad.ST (runST)
+@@ -176,2 +177,9 @@ newtype XmlWriter a = XmlWriter { runXmlWriter :: Maybe
(a, Text) }
+
++instance Functor XmlWriter where
++fmap = liftM
++
++instance Applicative XmlWriter where
++pure = return
++(<*>) = ap -- defined in Control.Monad
++
+ instance Monad XmlWriter where
+diff --git a/hs/DBus/Types/Internal.hs b/hs/DBus/Types/Internal.hs
+index 7f5d9c5..7c73afe 100644
+--- a/hs/DBus/Types/Internal.hs
b/hs/DBus/Types/Internal.hs
+@@ -5,2 +5,3 @@
+ {-# LANGUAGE IncoherentInstances #-}
++{-# LANGUAGE FlexibleContexts #-}
+
+diff --git a/hs/DBus/Util/MonadError.hs b/hs/DBus/Util/MonadError.hs
+index 33b51ed..ef01df2 100644
+--- a/hs/DBus/Util/MonadError.hs
b/hs/DBus/Util/MonadError.hs
+@@ -23,2 +23,6 @@ module DBus.Util.MonadError
+ ) where
++
++import Control.Applicative
++import Control.Monad
++
+ newtype ErrorM e a = ErrorM { runErrorM :: Either e a }
+@@ -30,2 +34,6 @@ instance Functor (ErrorM e) where
+
++instance Applicative (ErrorM e) where
++pure = return
++(<*>) = ap -- defined in Control.Monad
++
+ instance Monad (ErrorM e) where
+@@ -41,2 +49,9 @@ newtype ErrorT e m a = ErrorT { runErrorT :: m (Either e a) }
+
++instance Monad m => Functor (ErrorT e m) where
++fmap = liftM
++
++instance Monad m => Applicative (ErrorT e m) where
++pure = return
++(<*>) = ap -- defined in Control.Monad
++
+ instance Monad m => Monad (ErrorT e m) where
+diff --git a/hs/DBus/Wire/Internal.hs b/hs/DBus/Wire/Internal.hs
+index b386eec..512ff1a 100644
+--- a/hs/DBus/Wire/Internal.hs
b/hs/DBus/Wire/Internal.hs
+@@ -19,3 +19,4 @@
+ module DBus.Wire.Internal where
+-import Control.Monad (liftM, when, unless)
++import Control.Applicative
++import Control.Monad hiding (void)
+
+@@ -96,2 +97,9 @@ newtype Wire s a = Wire
+
++instance Functor (Wire s) where
++fmap = liftM
++
++instance Applicative (Wire s) where
++pure = return
++(<*>) = ap -- defined in Control.Monad
++
+ instance Monad (Wire s) where
[gentoo-commits] proj/portage:master commit in: pym/portage/dep/, pym/portage/tests/dep/
commit: d4966a381ee4577818bd972946647338046715b1
Author: Zac Medico gentoo org>
AuthorDate: Mon Sep 21 01:52:19 2015 +
Commit: Zac Medico gentoo org>
CommitDate: Mon Sep 21 20:13:36 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d4966a38
match_from_list: restrict =* to match only on version part boundaries (bug
560466)
Make the =* glob match only on boundaries between version parts, in order
to eliminate ambiguity (so that 1* does not match version 10). Only break
compatibility in cases where dependencies have been specified ambiguously.
X-Gentoo-Bug: 560466
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=560466
Acked-by: Brian Dolbec gentoo.org>
pym/portage/dep/__init__.py | 7 ++-
pym/portage/tests/dep/test_match_from_list.py | 21 +++--
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
index 0a13d9f..5dd1638 100644
--- a/pym/portage/dep/__init__.py
+++ b/pym/portage/dep/__init__.py
@@ -2250,7 +2250,12 @@ def match_from_list(mydep, candidate_list):
pkg.cp + "-" + xs[2],
pkg.cp + "-" + myver, 1)
if xcpv.startswith(mycpv_cmp):
- mylist.append(x)
+ # =* glob matches only on boundaries between
version parts,
+ # so 1* does not match 10 (bug 560466).
+ next_char =
xcpv[len(mycpv_cmp):len(mycpv_cmp)+1]
+ if (not next_char or next_char in '._-' or
+ mycpv_cmp[-1].isdigit() !=
next_char.isdigit()):
+ mylist.append(x)
elif operator == "~": # version, any revision, match
for x in candidate_list:
diff --git a/pym/portage/tests/dep/test_match_from_list.py
b/pym/portage/tests/dep/test_match_from_list.py
index 75ac8fd..3080479 100644
--- a/pym/portage/tests/dep/test_match_from_list.py
+++ b/pym/portage/tests/dep/test_match_from_list.py
@@ -73,12 +73,21 @@ class Test_match_from_list(TestCase):
("sys-apps/portage:0",
[Package("=sys-apps/portage-045:0")], ["sys-apps/portage-045"]),
("sys-apps/portage:0",
[Package("=sys-apps/portage-045:1")], []),
("=cat/pkg-1-r1*", ["cat/pkg-1_alpha1"], []),
- ("=cat/pkg-1-r1*", ["cat/pkg-1-r11"],
["cat/pkg-1-r11"]),
- ("=cat/pkg-1-r1*", ["cat/pkg-01-r11"],
["cat/pkg-01-r11"]),
- ("=cat/pkg-01-r1*", ["cat/pkg-1-r11"],
["cat/pkg-1-r11"]),
- ("=cat/pkg-01-r1*", ["cat/pkg-001-r11"],
["cat/pkg-001-r11"]),
- ("=sys-fs/udev-1*", ["sys-fs/udev-123"],
["sys-fs/udev-123"]),
- ("=sys-fs/udev-4*", ["sys-fs/udev-456"],
["sys-fs/udev-456"]),
+ # =* glob matches only on boundaries between version
parts,
+ # so 1* does not match 10 (bug 560466).
+ ("=cat/pkg-1.1*", ["cat/pkg-1.1-r1",
"cat/pkg-1.10-r1"], ["cat/pkg-1.1-r1"]),
+ ("=cat/pkg-1-r1*", ["cat/pkg-1-r11"], []),
+ ("=cat/pkg-1_pre*", ["cat/pkg-1_pre1"],
["cat/pkg-1_pre1"]),
+ ("=cat/pkg-1-r1*", ["cat/pkg-1-r1"], ["cat/pkg-1-r1"]),
+ ("=cat/pkg-1-r11*", ["cat/pkg-1-r11"],
["cat/pkg-1-r11"]),
+ ("=cat/pkg-1-r11*", ["cat/pkg-01-r11"],
["cat/pkg-01-r11"]),
+ ("=cat/pkg-01-r11*", ["cat/pkg-1-r11"],
["cat/pkg-1-r11"]),
+ ("=cat/pkg-01-r11*", ["cat/pkg-001-r11"],
["cat/pkg-001-r11"]),
+ ("=sys-fs/udev-1*", ["sys-fs/udev-123",
"sys-fs/udev-123-r1"], []),
+ ("=sys-fs/udev-123*", ["sys-fs/udev-123"],
["sys-fs/udev-123"]),
+ ("=sys-fs/udev-123*", ["sys-fs/udev-123-r1"],
["sys-fs/udev-123-r1"]),
+ ("=sys-fs/udev-4*", ["sys-fs/udev-456",
"sys-fs/udev-456-r1"], []),
+ ("=sys-fs/udev-456*", ["sys-fs/udev-456"],
["sys-fs/udev-456"]),
("*/*", ["sys-fs/udev-456"], ["sys-fs/udev-456"]),
("*/*:0", ["sys-fs/udev-456:0"], ["sys-fs/udev-456:0"]),
("*/*:1", ["sys-fs/udev-456:0"], []),
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-sqlite/
commit: ce461f92865acadfffa8913be72159f3b6b568a9
Author: Sergei Trofimovich gentoo org>
AuthorDate: Mon Sep 21 19:58:27 2015 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Mon Sep 21 19:58:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce461f92
dev-haskell/hdbc-sqlite: version bump, bug #561026
Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/show_bug.cgi?id=561026
Package-Manager: portage-2.2.20
dev-haskell/hdbc-sqlite/Manifest | 1 +
dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.3.1.ebuild | 45 ++
2 files changed, 46 insertions(+)
diff --git a/dev-haskell/hdbc-sqlite/Manifest b/dev-haskell/hdbc-sqlite/Manifest
index 772ab88..c9e98ba 100644
--- a/dev-haskell/hdbc-sqlite/Manifest
+++ b/dev-haskell/hdbc-sqlite/Manifest
@@ -1 +1,2 @@
DIST HDBC-sqlite3-2.3.3.0.tar.gz 14827 SHA256
22f972fc44e830d0db62313fb870cd9d020f3d8efff2928d4cdb3f66b52de684 SHA512
66dfef4fd6dbaaaea4eadd3c5201a29f8f306170ef76dbf2e8a1f4239bcdcdd5b16d6d331c8a480a9e23209b2c86cfe981d7f83d4d3a0ba617dfdfb6663ad244
WHIRLPOOL
b39aa543bfb12923dce1666e29d4f327691540d289b4faa0a83f5cf2aba2eaa3bd107947621fd46ca44b02ba9badece79cb8dbdadf597ae05efb52dc0ae6
+DIST HDBC-sqlite3-2.3.3.1.tar.gz 15544 SHA256
a783d9ab707ebfc68e3e46bd1bbb5d3d5493f50a7ccf31223d9848cff986ebea SHA512
17b2929aca806d0672ae83e1aa6122a38596504a4f23f868f1a3ff4e68f97c3aef6499f995659fa4ce82b1e8aab9a107172a7265309d4c3f4e9754e4cf756ec0
WHIRLPOOL
f7a6102c83939cb9325450f4b3dc542c2f314d478df13c4ada4725c793731d0601829a80588ff2cdfc251286b208c0f2f6f796367f8a86b46c2962cd481163e2
diff --git a/dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.3.1.ebuild
b/dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.3.1.ebuild
new file mode 100644
index 000..8404865
--- /dev/null
+++ b/dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.3.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 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="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="HDBC-sqlite3"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sqlite v3 driver for HDBC"
+HOMEPAGE="https://github.com/hdbc/hdbc-sqlite3";
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-db/sqlite-3.0
+ >=dev-haskell/hdbc-2.3.0.0:2=[profile?]
+ dev-haskell/mtl:=[profile?]
+ dev-haskell/utf8-string:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.2.3
+ test? ( dev-haskell/convertible:=[profile?]
+ dev-haskell/hunit:=[profile?]
+ dev-haskell/old-locale:=[profile?]
+ dev-haskell/old-time:=[profile?]
+ dev-haskell/testpack:=[profile?] )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# The test suite doesn't work right now. See
+#
+# https://github.com/hdbc/hdbc-sqlite3/pull/17
+#
+RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/
commit: 8a3f7a2f99c04c6d43988d17b18f19c00cf1db0f
Author: Matt Turner gentoo org>
AuthorDate: Mon Sep 21 19:51:19 2015 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Sep 21 19:51:42 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a3f7a2f
media-libs/mesa: Update to use upstream glx-read-only-text flag.
Package-Manager: portage-2.2.20.1
media-libs/mesa/mesa-.ebuild | 11 +++
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index d166219..e7cf9a9 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -191,10 +191,7 @@ pkg_setup() {
}
src_prepare() {
- # fix for hardened pax_kernel, bug 240956
- [[ ${PV} != * ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
-
- eautoreconf
+ [[ ${PV} == ]] && eautoreconf
}
multilib_src_configure() {
@@ -268,11 +265,9 @@ multilib_src_configure() {
fi
fi
- # x86 hardened pax_kernel needs glx-rts, bug 240956
+ # x86 hardened pax_kernel needs glx-read-only-text, bug 240956
if use pax_kernel; then
- myconf+="
- $(use_enable x86 glx-rts)
- "
+ myconf+="$(use_enable x86 glx-read-only-text)"
fi
# on abi_x86_32 hardened we need to have asm disable
[gentoo-commits] proj/gnome:master commit in: mail-client/evolution/
commit: 6f76c969e6f0a4b07cac14d8d81386d5c2425997
Author: Ole Reifschneider gentoo org>
AuthorDate: Mon Sep 21 19:54:07 2015 +
Commit: Ole Reifschneider gentoo org>
CommitDate: Mon Sep 21 19:54:07 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=6f76c969
mail-client/evolution: Sync with tree version
Package-Manager: portage-2.2.20.1
Manifest-Sign-Key: 7E8B4D42
mail-client/evolution/evolution-3.17.92.ebuild | 23 ---
1 file changed, 4 insertions(+), 19 deletions(-)
diff --git a/mail-client/evolution/evolution-3.17.92.ebuild
b/mail-client/evolution/evolution-3.17.92.ebuild
index b17f476..a92ad4e 100644
--- a/mail-client/evolution/evolution-3.17.92.ebuild
+++ b/mail-client/evolution/evolution-3.17.92.ebuild
@@ -7,9 +7,6 @@ GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
inherit eutils flag-o-matic readme.gentoo gnome2
-if [[ ${PV} = ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
HOMEPAGE="https://wiki.gnome.org/Apps/Evolution";
@@ -18,18 +15,11 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution";
LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
SLOT="2.0"
IUSE="+bogofilter crypt highlight ldap map spamassassin spell ssl +weather"
-if [[ ${PV} = ]]; then
- IUSE="${IUSE} doc"
- KEYWORDS=""
-else
- # Needs x11-libs/libcryptui keyworded
- #KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
- KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-fi
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
# We need a graphical pinentry frontend to be able to ask for the GPG
# password from inside evolution, bug 160302
-PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] )"
+PINENTRY_DEPEND="|| ( app-crypt/pinentry[gnome-keyring]
app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] )"
# glade-3 support is for maintainers only per configure.ac
# pst is not mature enough and changes API/ABI frequently
@@ -39,7 +29,7 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk]
app-crypt/pinentry[qt4] )"
COMMON_DEPEND="
>=app-crypt/gcr-3.4
>=app-text/enchant-1.1.7
- >=dev-libs/glib-2.40:2
+ >=dev-libs/glib-2.40:2[dbus]
>=dev-libs/libxml2-2.7.3:2
>=gnome-base/gnome-desktop-2.91.3:3=
>=gnome-base/gsettings-desktop-schemas-2.91.92
@@ -114,15 +104,11 @@ file from /usr/share/applications if you use a different
browser)."
src_prepare() {
# Fix relink issues in src_install
ELTCONF="--reverse-deps"
-
gnome2_src_prepare
-
}
src_configure() {
# Use NSS/NSPR only if 'ssl' is enabled.
- local myconf
- [[ ${PV} != ]] && myconf="${myconf} ITSTOOL=$(type -P true)"
gnome2_src_configure \
--without-glade-catalog \
--disable-autoar \
@@ -143,8 +129,7 @@ src_configure() {
--without-nspr-includes
--without-nss-libs
--without-nss-includes") \
- $(use_enable weather) \
- ${myconf}
+ $(use_enable weather)
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: dev-util/emilpro/, dev-util/emilpro/files/
commit: 23e5561a2757175019959ef9a8ed5417238d3d8d
Author: Zero_Chaos gentoo org>
AuthorDate: Mon Sep 21 19:52:10 2015 +
Commit: Richard Farina gentoo org>
CommitDate: Mon Sep 21 19:52:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23e5561a
dev-util/emilpro: fix for new binutils and fix bug #553254
.../{emilpro-3-r1.ebuild => emilpro-3-r2.ebuild} | 11 +++-
dev-util/emilpro/emilpro-.ebuild | 13 +++-
.../files/emilpro--use-gentoo-binutils.patch | 39
dev-util/emilpro/files/or1k-2.patch| 22 +++
dev-util/emilpro/files/or1k.patch | 70 ++
5 files changed, 150 insertions(+), 5 deletions(-)
diff --git a/dev-util/emilpro/emilpro-3-r1.ebuild
b/dev-util/emilpro/emilpro-3-r2.ebuild
similarity index 83%
rename from dev-util/emilpro/emilpro-3-r1.ebuild
rename to dev-util/emilpro/emilpro-3-r2.ebuild
index b5c741b..fb55946 100644
--- a/dev-util/emilpro/emilpro-3-r1.ebuild
+++ b/dev-util/emilpro/emilpro-3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -28,7 +28,12 @@ DEPEND="|| ( dev-libs/elfutils dev-libs/libelf )
dev-cpp/gtkmm:3.0
dev-cpp/gtksourceviewmm:3.0
dev-cpp/libxmlpp:2.6
- system-binutils? ( sys-devel/binutils[multitarget] )
+ dev-cpp/glibmm
+ dev-cpp/pangomm
+ dev-cpp/cairomm
+ dev-libs/libsigc++:2
+ dev-libs/glib:2
+ system-binutils? ( >=sys-devel/binutils-2.25.1-r1:*[multitarget] )
net-misc/curl"
RDEPEND="${DEPEND}"
@@ -39,6 +44,8 @@ src_prepare() {
else
sed -i "s#wget -O binutils.tar.bz2
https://ftp.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2#cp
\"${DISTDIR}/binutils-2.23.2.tar.bz2\" ./binutils.tar.bz2#"
cmake/BuildBinutils.cmake
fi
+ epatch "${FILESDIR}"/or1k.patch
+ epatch "${FILESDIR}"/or1k-2.patch
cmake-utils_src_prepare
}
diff --git a/dev-util/emilpro/emilpro-.ebuild
b/dev-util/emilpro/emilpro-.ebuild
index cba20f0..f91969c 100644
--- a/dev-util/emilpro/emilpro-.ebuild
+++ b/dev-util/emilpro/emilpro-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -28,13 +28,20 @@ DEPEND="|| ( dev-libs/elfutils dev-libs/libelf )
dev-cpp/gtkmm:3.0
dev-cpp/gtksourceviewmm:3.0
dev-cpp/libxmlpp:2.6
- system-binutils? ( sys-devel/binutils[multitarget] )
+ dev-cpp/glibmm
+ dev-cpp/pangomm
+ dev-cpp/cairomm
+ dev-libs/libsigc++:2
+ dev-libs/glib:2
+ system-binutils? ( >=sys-devel/binutils-2.25.1-r1:*[multitarget] )
net-misc/curl"
+# automagic dep
+# dev-util/capstone
RDEPEND="${DEPEND}"
src_prepare() {
if use system-binutils; then
- epatch "${FILESDIR}"/use-gentoo-binutils.patch
+ epatch "${FILESDIR}"/${P}-use-gentoo-binutils.patch
else
sed -i "s#wget -O binutils.tar.bz2
https://ftp.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2#cp
\"${DISTDIR}/binutils-2.23.2.tar.bz2\" ./binutils.tar.bz2#"
cmake/BuildBinutils.cmake
fi
diff --git a/dev-util/emilpro/files/emilpro--use-gentoo-binutils.patch
b/dev-util/emilpro/files/emilpro--use-gentoo-binutils.patch
new file mode 100644
index 000..8cfa9f5
--- /dev/null
+++ b/dev-util/emilpro/files/emilpro--use-gentoo-binutils.patch
@@ -0,0 +1,39 @@
+--- CMakeLists.txt.orig2015-06-25 22:02:55.041406946 +0200
CMakeLists.txt 2015-06-25 22:03:51.841696845 +0200
+@@ -11,7 +11,6 @@
+ set (BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+
+ # Dependencies
+-include (${CMAKE_CURRENT_SOURCE_DIR}/cmake/BuildBinutils.cmake)
+
+ find_package (LibElf REQUIRED)
+ find_package (PkgConfig REQUIRED)
+@@ -30,10 +29,6 @@
+ pkg_check_modules(LIBCURL REQUIRED libcurl)
+
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall
-D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1 -pthread")
+-LINK_DIRECTORIES(
+- ${CMAKE_BINARY_DIR}/install-binutils/lib
${CMAKE_BINARY_DIR}/install-binutils/lib64
+- ${CMAKE_BINARY_DIR}/binutils/libiberty
+- )
+
+ if (HAVE_BFD_MULTIARCH)
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_BFD_MULTIARCH")
+@@ -109,7 +104,6 @@
+ set_property(SOURCE src/emilpro.cc APPEND PROPERTY OBJECT_DEPENDS
${CMAKE_BINARY_DIR}/built_in_instruction_models.hh)
+
+ include_directories(
+- ${CMAKE_BINARY_DIR}/install-binutils/include/
+ src/gtk/include/
+ src/include/
+ ${CMAKE_BINARY_DIR}
+@@ -131,9 +125,6 @@
+ tools/squash-instruction-models.cc
+ )
+
+-set_property(TARGET emilpro APPEND PROPERTY OBJECT_DEPENDS binutils)
+-set_property(TARGET tools/squash-instruction-models APPEND PROP
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/shellish/files/, dev-haskell/shellish/
commit: a02ea22bcca692fa252bbf4d15d4ffb456321a47
Author: Sergei Trofimovich gentoo org>
AuthorDate: Mon Sep 21 19:51:23 2015 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Mon Sep 21 19:52:02 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a02ea22b
dev-haskell/shellish: tweak for ghc-7.10, bug #561028
Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/561028
Package-Manager: portage-2.2.20
dev-haskell/shellish/files/shellish-0.1.4-ghc-7.10.patch | 9 +
dev-haskell/shellish/shellish-0.1.4.ebuild | 6 +-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/dev-haskell/shellish/files/shellish-0.1.4-ghc-7.10.patch
b/dev-haskell/shellish/files/shellish-0.1.4-ghc-7.10.patch
new file mode 100644
index 000..c756635
--- /dev/null
+++ b/dev-haskell/shellish/files/shellish-0.1.4-ghc-7.10.patch
@@ -0,0 +1,9 @@
+diff --git a/Shellish.hs b/Shellish.hs
+index 1e3c192..0ac20c2 100644
+--- a/Shellish.hs
b/Shellish.hs
+@@ -1,3 +1,3 @@
+ {-# LANGUAGE ScopedTypeVariables, DeriveDataTypeable, OverloadedStrings,
+- MultiParamTypeClasses, FlexibleInstances #-}
++ MultiParamTypeClasses, FlexibleInstances, FlexibleContexts #-}
+
diff --git a/dev-haskell/shellish/shellish-0.1.4.ebuild
b/dev-haskell/shellish/shellish-0.1.4.ebuild
index 86f421a..f93d879 100644
--- a/dev-haskell/shellish/shellish-0.1.4.ebuild
+++ b/dev-haskell/shellish/shellish-0.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -24,3 +24,7 @@ RDEPEND="dev-haskell/mtl[profile?]
>=dev-lang/ghc-6.10.1"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.6"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-ghc-7.10.patch
+}
[gentoo-commits] repo/gentoo:master commit in: app-crypt/monkeysphere/
commit: 38e38ad1bfd0616980b0f9b3431753fb8f2e0e8b
Author: Kristian Fiskerstrand gentoo org>
AuthorDate: Mon Sep 21 19:47:19 2015 +
Commit: Kristian Fiskerstrand gentoo org>
CommitDate: Mon Sep 21 19:47:19 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38e38ad1
app-crypt/monkeysphere-0.37: Stable for amd64
Package-Manager: portage-2.2.20.1
app-crypt/monkeysphere/monkeysphere-0.37.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-crypt/monkeysphere/monkeysphere-0.37.ebuild
b/app-crypt/monkeysphere/monkeysphere-0.37.ebuild
index a06860b..376b862 100644
--- a/app-crypt/monkeysphere/monkeysphere-0.37.ebuild
+++ b/app-crypt/monkeysphere/monkeysphere-0.37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ LICENSE="GPL-3"
SLOT="0/0"
IUSE=""
SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz
http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz";
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
DOCS=( README Changelog )
[gentoo-commits] repo/gentoo:master commit in: net-misc/sks/
commit: 93a0cd0f6d9c59d670621918449f7c5aec0b3b93
Author: Kristian Fiskerstrand gentoo org>
AuthorDate: Mon Sep 21 19:45:06 2015 +
Commit: Kristian Fiskerstrand gentoo org>
CommitDate: Mon Sep 21 19:45:29 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93a0cd0f
net-misc/sks: Remove old 1.1.5
Package-Manager: portage-2.2.20.1
net-misc/sks/sks-1.1.5.ebuild | 114 --
1 file changed, 114 deletions(-)
diff --git a/net-misc/sks/sks-1.1.5.ebuild b/net-misc/sks/sks-1.1.5.ebuild
deleted file mode 100644
index de9ce5e..000
--- a/net-misc/sks/sks-1.1.5.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib user readme.gentoo systemd
-
-DESCRIPTION="An OpenPGP keyserver which is decentralized and provides highly
reliable synchronization"
-HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver";
-SRC_URI="https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz";
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="optimize test"
-DOC_CONTENTS="To get sks running, first build the database,
-start the databse, import atleast one key, then
-run a cleandb. See the sks man page for more information
-Typical DB_CONFIG file and sksconf has been installed
-in /var/lib/sks and can be used as templates by renaming
-to remove the .typical extension. The DB_CONFIG file has
-to be in place before doing the database build, or the BDB
-environment has to be manually cleared from both KDB and PTree.
-The same applies if you are upgrading to this version with an existing
KDB/Ptree,
-using another version of BDB than 4.8; you need to clear the environment
-using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree
-Additionally a sample web interface has been installed as
-web.typical in /var/lib/sks that can be used by renaming it to web
-Important: It is strongly recommended to set up SKS behind a
-reverse proxy. Instructions on properly configuring SKS can be
-found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering";
-
-DEPEND="dev-lang/ocaml
- dev-ml/cryptokit
- sys-libs/db:4.8"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- ebegin "Creating named group and user"
- enewgroup sks
- enewuser sks -1 -1 /var/lib/sks sks
-}
-
-src_prepare() {
- cp Makefile.local.unused Makefile.local || die
- sed -i \
- -e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
- -e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db4.8/:g" \
- -e "s:^LIBDB=.*$:LIBDB=-ldb-4.8:g" \
- -e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \
- -e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \
- Makefile.local || die
- sed -i \
- -e 's:^CAMLINCLUDE= -I lib -I bdb$:CAMLINCLUDE= -I lib -I bdb
-I +cryptokit:g' \
- -e 's:-Werror-implicit-function-declaration::g' \
- Makefile bdb/Makefile || die
- sed -i \
- -e 's:/usr/sbin/sks:/usr/bin/sks:g' \
- sks_build.sh || die
-}
-
-src_compile() {
- emake dep
- # sks build fails with paralell build in module Bdb
- emake -j1 all
- if use optimize; then
- emake all.bc
- fi
-}
-
-src_test() {
- ./sks unit_test || die
-}
-
-src_install() {
- if use optimize; then
- emake install.bc
- dosym /usr/bin/sks.bc usr/bin/sks
- dosym /usr/bin/sks_add_mail.bc usr/bin/sks_add_mail
- else
- emake install
- fi
-
- dodoc README.md
-
- newinitd "${FILESDIR}/sks-db.initd" sks-db
- newinitd "${FILESDIR}/sks-recon.initd" sks-recon
- newconfd "${FILESDIR}/sks.confd" sks
- systemd_dounit "${FILESDIR}"/sks-db.service
- systemd_dounit "${FILESDIR}"/sks-recon.service
-
- dodir "/var/lib/sks/web.typical"
- insinto /var/lib/sks
- newins sampleConfig/DB_CONFIG DB_CONFIG.typical
- newins sampleConfig/sksconf.typical sksconf.typical
- insinto /var/lib/sks/web.typical
- doins sampleWeb/HTML5/*
-
- keepdir /var/lib/sks
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- einfo "Note when upgrading from versions of SKS earlier than
1.1.4"
- einfo "The default values for pagesize settings have changed.
To continue"
- einfo "using an existing DB without rebuilding, explicit
settings have to be"
- einfo "added to the sksconf file."
- einfo "pagesize: 4"
- einfo "ptree_pagesize: 1"
- fi;
-}
[gentoo-commits] repo/gentoo:master commit in: net-misc/sks/
commit: d5f77dbc7cb61d54ff4b7230257537ba8fd2df29
Author: Kristian Fiskerstrand gentoo org>
AuthorDate: Mon Sep 21 19:44:16 2015 +
Commit: Kristian Fiskerstrand gentoo org>
CommitDate: Mon Sep 21 19:45:24 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5f77dbc
net-misc/sks-1.1.5-r1: Stable for amd64
Package-Manager: portage-2.2.20.1
net-misc/sks/sks-1.1.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/sks/sks-1.1.5-r1.ebuild b/net-misc/sks/sks-1.1.5-r1.ebuild
index 873956d..f304141 100644
--- a/net-misc/sks/sks-1.1.5-r1.ebuild
+++ b/net-misc/sks/sks-1.1.5-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver";
SRC_URI="https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz";
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="optimize test"
DOC_CONTENTS="To get sks running, first build the database,
start the databse, import atleast one key, then
[gentoo-commits] proj/java:master commit in: dev-java/gradle-bin/
commit: f4c901c748dd45ee052ac3d460f720f9f5e8051b
Author: Florian Schmaus geekplace eu>
AuthorDate: Mon Sep 21 19:47:19 2015 +
Commit: Florian Schmaus geekplace eu>
CommitDate: Mon Sep 21 19:47:19 2015 +
URL:https://gitweb.gentoo.org/proj/java.git/commit/?id=f4c901c7
Add dev-java/gradle-bin-2.7
dev-java/gradle-bin/Manifest | 1 +
dev-java/gradle-bin/gradle-bin-2.7.ebuild | 73 +++
2 files changed, 74 insertions(+)
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index b341eec..609caed 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -4,3 +4,4 @@ DIST gradle-2.2.1-all.zip 58602849 SHA256
1d7c28b3731906fd1b2955946c1d0523038815
DIST gradle-2.3-all.zip 60081333 SHA256
515962aeec8c3e67b97f0c13c4575beeed1b5da16181d8b9054416339edc8c2d SHA512
316a8bcfdab50bba0f0d19d42fff8100cca8bfbaca919255da5beb3ae7f082bf40d021e1c668075260d74116058acee8f52911b0dce036800701824ecbc26343
WHIRLPOOL
4a8fe3a6fffb26cb13f9ff4e70f99e9d13f0a9bec5a3267f310d5987ff93a1df8c446816a463654e84f5b179ad72bdab01404087ddcac212576268b7adfada5b
DIST gradle-2.4-all.zip 65433094 SHA256
371cb9fbebbe9880d147f59bab36d61eee122854ef8c9ee1ecf12b82368bcf10 SHA512
a09b94f3453043ee3d73fbf9e029df8f82f94f27071338a1557e9504a0cf69ddd0f58821a021e23d798d66872c54c52c9e850bdfb559c674b9d418de78de60d5
WHIRLPOOL
816e04e67c55c36f1224534a40f5398f7aa32abe8f40d336d5596b260d784de0fa86e8684e7cae3b1c00a0d3067d61294aca44e23bef50ddd7627e41
DIST gradle-2.6-all.zip 65594074 SHA256
5489234fc9c9733fc4115055618763ccb4d916d667980e6ab4fa57fc81197d16 SHA512
29ec0ba12d5ac0658e7925ad760b25462384d7bfcb249638b42a0ff608b88aa9d7ec04c5e590d4c368c7ed8529b6d6a07dde552c2ae6dda7e33578a16cd4d41b
WHIRLPOOL
d7f8cdfef17960426685aff149c26151c25d82973b91f3d26ace39f21d030e09460fad3f77fd41c4932c3c5cdce8f9e78e38a30e6b365255c28d4dfb913d9564
+DIST gradle-2.7-all.zip 65866593 SHA256
2ba0aaa11a3e96ec0af31d532d808e1f09cc6dcad0954e637902a1ab544b9e60 SHA512
89d2ec75d94b7e341dfd6b41813174ea08b12d097a4b58ecf31f56feea3335d52b897d3d03df7876b5b6182e09bbb215906d958531e60026bfd72541adc48ed7
WHIRLPOOL
4542918bcacface934b027620633b6821359b837996e530effd0a4bf435750320cd055fee8f6f26cd247fab0768cb8d4c03cc608b142c4bd4b9beafa3b663dfb
diff --git a/dev-java/gradle-bin/gradle-bin-2.7.ebuild
b/dev-java/gradle-bin/gradle-bin-2.7.ebuild
new file mode 100644
index 000..7b262af
--- /dev/null
+++ b/dev-java/gradle-bin/gradle-bin-2.7.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-pkg-2
+
+MY_PN=${PN%%-bin}
+MY_P="${MY_PN}-${PV/_rc/-rc-}"
+
+DESCRIPTION="A project automation and build tool similar to Apache Ant and
Apache Maven with a Groovy based DSL"
+SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip";
+HOMEPAGE="http://www.gradle.org/";
+LICENSE="Apache-2.0"
+SLOT="${PV}"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND="app-arch/zip
+ app-eselect/eselect-gradle"
+RDEPEND=">=virtual/jdk-1.5"
+
+IUSE="source doc examples"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ local gradle_dir="${EROOT}usr/share/${PN}-${SLOT}"
+
+ dodoc changelog.txt getting-started.html
+
+ insinto "${gradle_dir}"
+
+ # source
+ if use source ; then
+ java-pkg_dosrc src/*
+ fi
+
+ # docs
+ if use doc ; then
+ java-pkg_dojavadoc docs
+ fi
+
+ # examples
+ if use examples ; then
+ java-pkg_doexamples samples
+ fi
+
+ # jars in lib/
+ # Note that we can't strip the version from the gradle jars,
+ # because then gradle won't find them.
+ cd lib || die "lib/ not found"
+ for jar in *.jar; do
+ java-pkg_newjar ${jar} ${jar}
+ done
+
+ # plugins in lib/plugins
+ cd plugins
+ java-pkg_jarinto ${JAVA_PKG_JARDEST}/plugins
+ for jar in *.jar; do
+ java-pkg_newjar ${jar} ${jar}
+ done
+
+ java-pkg_dolauncher "${P}" --main org.gradle.launcher.GradleMain
--java_args "-Dgradle.home=${gradle_dir}/lib \${GRADLE_OPTS}"
+}
+
+pkg_postinst() {
+ eselect gradle update ifunset
+}
+
+pkg_postrm() {
+ eselect gradle update ifunset
+}
[gentoo-commits] proj/sci:master commit in: sci-biology/Gambit/
commit: 6ecad09b5d5c91e20812153615ee3716e6c25ed0
Author: Justin Lecher gentoo org>
AuthorDate: Mon Sep 21 19:38:25 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Mon Sep 21 19:38:25 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6ecad09b
sci-biology/Gambit: Handle qt correctly
Bump to EAPI 5
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher gentoo.org>
sci-biology/Gambit/Gambit-0.4.145.ebuild | 22 --
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/sci-biology/Gambit/Gambit-0.4.145.ebuild
b/sci-biology/Gambit/Gambit-0.4.145.ebuild
index d5a1119..8302a2b 100644
--- a/sci-biology/Gambit/Gambit-0.4.145.ebuild
+++ b/sci-biology/Gambit/Gambit-0.4.145.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=3
+EAPI=5
-inherit qt4-r2
+inherit qmake-utils
-DESCRIPTION="Display genomic alignments from BAM files with annotations from
BED, GFF, GFF3, VCF formats"
+DESCRIPTION="Genomic alignments from BAM files with annotations from BED, GFF,
GFF3, VCF formats"
HOMEPAGE="http://code.google.com/p/gambit-viewer/";
-SRC_URI="http://gambit-viewer.googlecode.com/files/Gambit_v0.4.145_src.tar.gz
+SRC_URI="
+ http://gambit-viewer.googlecode.com/files/Gambit_v0.4.145_src.tar.gz
http://gambit-viewer.googlecode.com/files/GambitDocumentation_v0.4.145.pdf";
LICENSE="GPL-2"
@@ -16,7 +17,8 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND="dev-qt/qtcore:4
+DEPEND="
+ dev-qt/qtcore:4
dev-qt/qtgui:4"
RDEPEND="${DEPEND}
sci-biology/samtools"
@@ -24,12 +26,12 @@ RDEPEND="${DEPEND}
S="${WORKDIR}"/Gambit
src_configure() {
- lupdate ${PN}.pro || die
- lrelease ${PN}.pro || die
- eqmake4 ${PN}.pro || die
+ $(qt4_get_bindir)/lupdate ${PN}.pro || die
+ $(qt4_get_bindir)/lrelease ${PN}.pro || die
+ eqmake4 ${PN}.pro
}
src_install() {
- dobin ${PN} || die
+ dobin ${PN}
dodoc "${DISTDIR}"/GambitDocumentation_v0.4.145.pdf
}
[gentoo-commits] proj/sci:master commit in: sci-misc/elmer-gui/
commit: 7c9c301ddf19a397c496bc8c777ca867f15647e8
Author: Justin Lecher gentoo org>
AuthorDate: Mon Sep 21 19:24:11 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Mon Sep 21 19:24:11 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7c9c301d
sci-misc/elmer-gui: Add subslot operators
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher gentoo.org>
sci-misc/elmer-gui/elmer-gui-.ebuild | 6 +++---
sci-misc/elmer-gui/metadata.xml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sci-misc/elmer-gui/elmer-gui-.ebuild
b/sci-misc/elmer-gui/elmer-gui-.ebuild
index 2481960..b33a150 100644
--- a/sci-misc/elmer-gui/elmer-gui-.ebuild
+++ b/sci-misc/elmer-gui/elmer-gui-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -34,8 +34,8 @@ DEPEND="
)
matc? ( ~sci-libs/matc-${PV} )
vtk? ( >=sci-libs/vtk-5.0.0[qt4,python?] )
- opencascade? ( >=sci-libs/opencascade-6.3 )
- python? ( dev-python/pythonqt )
+ opencascade? ( >=sci-libs/opencascade-6.3:* )
+ python? ( dev-python/pythonqt[${PYTHON_USEDEP}] )
qwt? ( x11-libs/qwt:5 )
>=dev-qt/qtcore-4.3:4
>=dev-qt/qtopengl-4.3:4
diff --git a/sci-misc/elmer-gui/metadata.xml b/sci-misc/elmer-gui/metadata.xml
index 1632567..d91d5d8 100644
--- a/sci-misc/elmer-gui/metadata.xml
+++ b/sci-misc/elmer-gui/metadata.xml
@@ -9,5 +9,5 @@
support
Enables x11-libs/qwt support
Enables sci-libs/vtk support
-
+
[gentoo-commits] proj/sci:master commit in: sci-biology/SolexaQA/
commit: a3939940bc669ab32ffe28c50fed768db5846d36
Author: Justin Lecher gentoo org>
AuthorDate: Mon Sep 21 19:41:36 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Mon Sep 21 19:41:36 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=a3939940
sci-biology/SolexaQA: Bump to EAPI 5
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher gentoo.org>
sci-biology/SolexaQA/SolexaQA-2.2.ebuild | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/sci-biology/SolexaQA/SolexaQA-2.2.ebuild
b/sci-biology/SolexaQA/SolexaQA-2.2.ebuild
index 174c373..c8ed142 100644
--- a/sci-biology/SolexaQA/SolexaQA-2.2.ebuild
+++ b/sci-biology/SolexaQA/SolexaQA-2.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=3
+EAPI=5
-DESCRIPTION="Analyze and trim single-end and paired-end reads, show quality
statistics in figures"
+DESCRIPTION="Analyze and trim single-end and paired-end reads, show quality
statistics"
HOMEPAGE="http://sourceforge.net/projects/clview";
SRC_URI="http://sourceforge.net/projects/solexaqa/files/src/SolexaQA_v.2.2.zip";
@@ -13,8 +13,9 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE=""
-DEPEND="dev-lang/perl
- dev-lang/R"
+DEPEND="
+ dev-lang/perl
+ dev-lang/R"
RDEPEND="${DEPEND}"
S=${WORKDIR}/"${PN}"_v."${PV}"
[gentoo-commits] proj/sci:master commit in: /
commit: 152fd6513c6dd099221d8e49fb2eb59c65bf7109 Author: Justin Lecher gentoo org> AuthorDate: Mon Sep 21 19:44:15 2015 + Commit: Justin Lecher gentoo org> CommitDate: Mon Sep 21 19:44:15 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=152fd651 Merge remote-tracking branch 'github/master' * github/master: Drop obsolete profiles/package.mask | 15 -- sci-misc/salome-component/ChangeLog| 64 - sci-misc/salome-component/Manifest | 2 - .../files/salome-component-5.1.3-mpi.patch | 11 - sci-misc/salome-component/metadata.xml | 5 - .../salome-component/salome-component-5.1.3.ebuild | 111 .../salome-component/salome-component-5.1.4.ebuild | 112 sci-misc/salome-geom/ChangeLog | 48 sci-misc/salome-geom/Manifest | 2 - .../files/salome-geom-5.1.3-qt4-path.patch | 11 - sci-misc/salome-geom/metadata.xml | 5 - sci-misc/salome-geom/salome-geom-5.1.3.ebuild | 110 sci-misc/salome-geom/salome-geom-5.1.4.ebuild | 112 sci-misc/salome-gui/ChangeLog | 68 - sci-misc/salome-gui/Manifest | 2 - .../files/salome-gui-5.1.3-qt4-path.patch | 11 - .../files/salome-gui-5.1.4-qt4-path.patch | 11 - sci-misc/salome-gui/metadata.xml | 5 - sci-misc/salome-gui/salome-gui-5.1.3.ebuild| 115 sci-misc/salome-gui/salome-gui-5.1.4.ebuild| 117 sci-misc/salome-kernel/ChangeLog | 92 --- sci-misc/salome-kernel/Manifest| 2 - .../files/salome-kernel-5.1.3-lib_location.patch | 13 - .../files/salome-kernel-5.1.3-openmpi.patch| 21 -- .../files/salome-kernel-5.1.3-python-2.6.patch | 13 - .../files/salome-kernel-5.1.4-lib_location.patch | 13 - .../files/salome-kernel-5.1.4-openmpi.patch| 21 -- .../files/salome-kernel-5.1.4-python-2.6.patch | 13 - sci-misc/salome-kernel/files/salome-kernel.png | Bin 1934 -> 0 bytes sci-misc/salome-kernel/metadata.xml| 8 - sci-misc/salome-kernel/salome-kernel-5.1.3.ebuild | 121 - sci-misc/salome-kernel/salome-kernel-5.1.4.ebuild | 121 - sci-misc/salome-med/ChangeLog | 77 -- sci-misc/salome-med/Manifest | 2 - .../files/salome-med-5.1.3-check_metis.patch | 48 .../files/salome-med-5.1.3-check_scotch.patch | 74 - .../salome-med/files/salome-med-5.1.3-gcc.patch| 43 --- .../files/salome-med-5.1.3-med_int.patch | 297 - .../salome-med/files/salome-med-5.1.3-mpi.patch| 13 - .../files/salome-med-5.1.3-qt4-path.patch | 11 - .../salome-med/files/salome-med-5.1.3-scotch.patch | 11 - .../files/salome-med-5.1.4-check_metis.patch | 48 .../files/salome-med-5.1.4-check_scotch.patch | 74 - .../salome-med/files/salome-med-5.1.4-gcc.patch| 11 - .../files/salome-med-5.1.4-med_int.patch | 297 - .../salome-med/files/salome-med-5.1.4-scotch.patch | 11 - sci-misc/salome-med/metadata.xml | 9 - sci-misc/salome-med/salome-med-5.1.3.ebuild| 129 - sci-misc/salome-med/salome-med-5.1.4.ebuild| 129 - sci-misc/salome-meta/ChangeLog | 23 -- sci-misc/salome-meta/metadata.xml | 5 - sci-misc/salome-meta/salome-meta-5.1.3.ebuild | 31 --- sci-misc/salome-meta/salome-meta-5.1.4.ebuild | 31 --- sci-misc/salome-pycalculator/ChangeLog | 41 --- sci-misc/salome-pycalculator/Manifest | 2 - sci-misc/salome-pycalculator/metadata.xml | 5 - .../salome-pycalculator-5.1.3.ebuild | 83 -- .../salome-pycalculator-5.1.4.ebuild | 83 -- sci-misc/salome-smesh/ChangeLog| 60 - sci-misc/salome-smesh/Manifest | 2 - sci-misc/salome-smesh/metadata.xml | 5 - sci-misc/salome-smesh/salome-smesh-5.1.3.ebuild| 108 sci-misc/salome-smesh/salome-smesh-5.1.4.ebuild| 110 sci-misc/salome-visu/ChangeLog | 49 sci-misc/salome-visu/Manifest | 2 - sci-misc/salome-visu/metadata.xml | 5 - sci-misc/salome-visu/salome-visu-5.1.3.ebuild | 103 --- sci-misc/salome-visu/salome-visu-5.1.4.ebuild | 105 sci-misc/salome-yacs/ChangeLog | 37 --- sci-misc/salome-yacs/Manifest | 2 - .../files/salome-yacs-5.1.3-ac_python_devel.patch | 13 - .../files/salome-yacs-5.1.3-lib_location.patch | 14 - .../files/salome-yacs-5.1.3-libdir.patch | 22 -- .../files/salome-yacs-5.
[gentoo-commits] proj/sci:master commit in: sci-biology/cdbfasta/
commit: 93d686395d6a556c97581052653842280e0b6165
Author: Justin Lecher gentoo org>
AuthorDate: Mon Sep 21 19:44:11 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Mon Sep 21 19:44:11 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=93d68639
sci-biology/cdbfasta: Bump EAPI to 5
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher gentoo.org>
sci-biology/cdbfasta/cdbfasta-0.1.ebuild | 24 +---
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/sci-biology/cdbfasta/cdbfasta-0.1.ebuild
b/sci-biology/cdbfasta/cdbfasta-0.1.ebuild
index 05313b2..06cc243 100644
--- a/sci-biology/cdbfasta/cdbfasta-0.1.ebuild
+++ b/sci-biology/cdbfasta/cdbfasta-0.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=3
+EAPI=5
-DESCRIPTION="A FASTA record indexing/retrievieng utility, a part of TIGR Gene
Indices project tools"
+DESCRIPTION="FASTA record indexing/retrievieng utility, a part of TIGR Gene
Indices project tools"
HOMEPAGE="http://compbio.dfci.harvard.edu/tgi/software";
SRC_URI="ftp://occams.dfci.harvard.edu/pub/bio/tgi/software/cdbfasta/cdbfasta.tar.gz";
@@ -13,23 +13,17 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND=""
-RDEPEND="${DEPEND}"
-
S=${WORKDIR}/${PN}
-src_unpack() {
- unpack cdbfasta.tar.gz
-}
-
-src_compile() {
- sed -i 's/CFLAGS[ ]*=/CFLAGS :=/; s/-D_REENTRANT/-D_REENTRANT
\${CFLAGS}/; s/CFLAGS[ ]*:=[ ]*-O2$//' "${S}"/Makefile || die "Failed to patch
Makefile"
+src_prepare() {
+ sed \
+ -e 's/CFLAGS[ ]*=/CFLAGS :=/; s/-D_REENTRANT/-D_REENTRANT
\${CFLAGS}/; s/CFLAGS[ ]*:=[ ]*-O2$//' \
+ -i "${S}"/Makefile || die "Failed to patch Makefile"
sed -i 's/-march=i686//' "${S}"/Makefile || die
sed -i 's/-O2 //' "${S}"/Makefile || die
- emake || die "emake failed"
}
src_install() {
- dobin {cdbfasta,cdbyank} || die "Failed to install binaries"
- newdoc README README.${PN} || die
+ dobin {cdbfasta,cdbyank}
+ newdoc README README.${PN}
}
[gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/
commit: 0501f1ab64f9d422f6cf807abd500986d39edbd3 Author: Justin Lecher gentoo org> AuthorDate: Mon Sep 21 19:31:32 2015 + Commit: Justin Lecher gentoo org> CommitDate: Mon Sep 21 19:31:32 2015 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=0501f1ab sci-libs/trilinos: Drop local USE Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher gentoo.org> sci-libs/trilinos/metadata.xml | 61 +- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/sci-libs/trilinos/metadata.xml b/sci-libs/trilinos/metadata.xml index e1bfe00..76fe49d 100644 --- a/sci-libs/trilinos/metadata.xml +++ b/sci-libs/trilinos/metadata.xml @@ -5,39 +5,38 @@ andyspi...@gmail.com - + The Trilinos Project is an effort to develop algorithms and enabling technologies within an object-oriented software framework for the solution of large-scale, complex multi-physics engineering and scientific problems. - - Add support for adolc (sci-libs/adolc) - Add support for arprec (sci-libs/arprec) - Add support for boost (dev-libs/boost) - Add support for clp (sci-libs/coinor-clp) - Add support for () - Add support for cuda (dev-util/nvidia-cuda-toolkit) - Add support for eigen (dev-cpp/eigen) - Add support for () - Add support for gtest (dev-cpp/gtest) - Add support for hwloc (sys-apps/hwloc) - Add support for hdf5 (sci-libs/hdf5) - Add support for hypre (sci-libs/hypre) - Add support for matio (sci-libs/matio) - Add support for metis (sci-libs/(par)metis) - Add support for mkl (sci/libs/mkl) - Add support for mumps (sci-libs/mumps) - Add support for netcdf (sci-libs/netcdf) - Add support for petsc (sci-mathematics/petsc) - Add support for qd (sci-libs/qd) - Add support for scalapack (virtual/scalapack) - Add support for scotch (sci-libs/scotch) - Add support for sparse matrix solvers (sci-libs/umfpack) - Add support for superlu (sci-libs/superlu) - Add support for taucs (sci-libs/taucs) - Add support for threading building blocks library (dev-cpp/tbb) - Add support for tvmet (dev-libs/tvmet) - Add support for umfpack (sci-libs/umfpack) - Add support for yaml (dev-cpp-yaml) - + + Add support for adolc (sci-libs/adolc) + Add support for arprec (sci-libs/arprec) + Add support for boost (dev-libs/boost) + Add support for clp (sci-libs/coinor-clp) + Add support for () + Add support for cuda (dev-util/nvidia-cuda-toolkit) + Add support for eigen (dev-cpp/eigen) + Add support for () + Add support for gtest (dev-cpp/gtest) + Add support for hwloc (sys-apps/hwloc) + Add support for hdf5 (sci-libs/hdf5) + Add support for hypre (sci-libs/hypre) + Add support for matio (sci-libs/matio) + Add support for metis (sci-libs/(par)metis) + Add support for mkl (sci/libs/mkl) + Add support for mumps (sci-libs/mumps) + Add support for netcdf (sci-libs/netcdf) + Add support for petsc (sci-mathematics/petsc) + Add support for qd (sci-libs/qd) + Add support for scalapack (virtual/scalapack) + Add support for scotch (sci-libs/scotch) + Add support for sparse matrix solvers (sci-libs/umfpack) + Add support for superlu (sci-libs/superlu) + Add support for taucs (sci-libs/taucs) + Add support for threading building blocks library (dev-cpp/tbb) + Add support for tvmet (dev-libs/tvmet) + Add support for yaml (dev-cpp-yaml) +
[gentoo-commits] proj/sci:master commit in: dev-java/jrosetta/
commit: e8ad3b6615df9ba2c4f46709af0fc0dec4c7b8c2
Author: Justin Lecher gentoo org>
AuthorDate: Mon Sep 21 19:34:17 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Mon Sep 21 19:34:17 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e8ad3b66
dev-java/jrosetta: Drop old
bump EAPI to 5
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher gentoo.org>
dev-java/jrosetta/jrosetta-1.0.2.ebuild | 38 -
dev-java/jrosetta/jrosetta-1.0.4.ebuild | 12 +--
2 files changed, 6 insertions(+), 44 deletions(-)
diff --git a/dev-java/jrosetta/jrosetta-1.0.2.ebuild
b/dev-java/jrosetta/jrosetta-1.0.2.ebuild
deleted file mode 100644
index 0ca74d6..000
--- a/dev-java/jrosetta/jrosetta-1.0.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PV=$(replace_all_version_separators -)
-MY_P="${P}-gpl"
-
-DESCRIPTION="Provides a common base for graphical component to build a
graphical console."
-HOMEPAGE="http://dev.artenum.com/projects/JRosetta";
-SRC_URI="http://dev.artenum.com/projects/JRosetta/download/JRosetta-${MY_PV}/data/src-gpl?action=download&nodecorator
-> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- ${COMMON_DEPEND}"
-
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-EANT_BUILD_TARGET="make"
-
-src_install() {
- java-pkg_dojar dist/${PN}-API.jar
- java-pkg_dojar dist/${PN}-engine.jar
- dodoc CHANGE.txt || die
- use source && java-pkg_dosrc src/com
-}
diff --git a/dev-java/jrosetta/jrosetta-1.0.4.ebuild
b/dev-java/jrosetta/jrosetta-1.0.4.ebuild
index 553ef71..f56e22a 100644
--- a/dev-java/jrosetta/jrosetta-1.0.4.ebuild
+++ b/dev-java/jrosetta/jrosetta-1.0.4.ebuild
@@ -2,11 +2,11 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
+EAPI=5
inherit java-pkg-2 java-ant-2
-DESCRIPTION="Provides a common base for graphical component to build a
graphical console."
+DESCRIPTION="Common base for graphical component to build a graphical console"
HOMEPAGE="http://dev.artenum.com/projects/jrosetta";
#currently down
#SRC_URI="http://maven.artenum.com/content/groups/public/com/artenum/${PN}/${PV}/${P}-sources.jar";
@@ -17,10 +17,10 @@ SLOT="0"
KEYWORDS="~x86 ~amd64"
IUSE=""
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip"
-
-RDEPEND=">=virtual/jre-1.5"
+DEPEND="
+ >=virtual/jdk-1.5:*
+ app-arch/unzip"
+RDEPEND=">=virtual/jre-1.5:*"
EANT_BUILD_TARGET="compile package"
JAVA_ANT_BSFIX_EXTRA_ARGS="--maven-cleaning"
[gentoo-commits] proj/sci:master commit in: sci-biology/autoeditor/
commit: 34064629ffa589001b3c102ba9c4d6d366f85c2b
Author: Justin Lecher gentoo org>
AuthorDate: Mon Sep 21 19:43:41 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Mon Sep 21 19:43:41 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=34064629
sci-biology/autoeditor: Bump to EAPI 5
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher gentoo.org>
sci-biology/autoeditor/autoeditor-1.20.ebuild | 10 +-
sci-biology/autoeditor/metadata.xml | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sci-biology/autoeditor/autoeditor-1.20.ebuild
b/sci-biology/autoeditor/autoeditor-1.20.ebuild
index 59868e6..1eda9ca 100644
--- a/sci-biology/autoeditor/autoeditor-1.20.ebuild
+++ b/sci-biology/autoeditor/autoeditor-1.20.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=3
+EAPI=5
inherit eutils
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="Artistic"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test"
DEPEND="
>=sci-libs/io_lib-1.8.11
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}"/autoEditor-1.20
src_prepare(){
- epatch "${FILESDIR}"/Makefile.patch || die
+ epatch "${FILESDIR}"/Makefile.patch
rm -rf TigrFoundation-2.0 || die "Failed to drop TigrFoundation-2.0/"
}
@@ -36,6 +36,6 @@ src_prepare(){
# * getConsQV.c:1051: warning: implicit declaration of function 'memset'
src_test(){
- make sample > sample.out || die
+ emake sample > sample.out
diff -u -w "${FILESDIR}"/sample_expected.out sample.out || die
}
diff --git a/sci-biology/autoeditor/metadata.xml
b/sci-biology/autoeditor/metadata.xml
index 5990f62..b0b877b 100644
--- a/sci-biology/autoeditor/metadata.xml
+++ b/sci-biology/autoeditor/metadata.xml
@@ -6,7 +6,7 @@
mmokr...@fold.natur.cuni.cz
Martin Mokrejs
-AutoEditor is a program that can automatically correct
discrepancies in a
+ AutoEditor is a program that can automatically correct
discrepancies in a
multiple alignment by reanalyzing the chromatograms of the discrepant
bases.
The input to AutoEditor is the multiple alignment in contig form, the
sequence
and quality values in FASTA format, and the base call positions in
[gentoo-commits] proj/sci:master commit in: sci-biology/wgs-assembler/
commit: 215a7570a21fb795331b069f13560156fbad4e76
Author: Justin Lecher gentoo org>
AuthorDate: Mon Sep 21 19:31:30 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Mon Sep 21 19:31:30 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=215a7570
sci-biology/wgs-assembler: Use new python eclass
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher gentoo.org>
sci-biology/wgs-assembler/wgs-assembler-8.2.ebuild | 78 --
.../wgs-assembler/wgs-assembler-8.3_rc2.ebuild | 17 ++---
2 files changed, 6 insertions(+), 89 deletions(-)
diff --git a/sci-biology/wgs-assembler/wgs-assembler-8.2.ebuild
b/sci-biology/wgs-assembler/wgs-assembler-8.2.ebuild
deleted file mode 100644
index 5f4b775..000
--- a/sci-biology/wgs-assembler/wgs-assembler-8.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_DEPEND=2
-
-inherit eutils python toolchain-funcs
-
-DESCRIPTION="De novo whole-genome shotgun DNA sequence assembler also known as
Celera Assembler and CABOG"
-HOMEPAGE="http://sourceforge.net/projects/wgs-assembler/";
-SRC_URI="mirror://sourceforge/${PN}/wgs-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND="
- x11-libs/libXt
- !x11-terms/terminator"
-RDEPEND="${DEPEND}
- app-shells/tcsh
- dev-perl/Log-Log4perl"
-
-S="${WORKDIR}/wgs-${PV}"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- # epatch \
- # "${FILESDIR}"/${P}-build.patch
- tc-export CC CXX
-}
-
-src_configure() {
- cd "${S}/kmer"
- ./configure.sh || die
-}
-
-src_compile() {
- # not really an install target
- emake -C kmer -j1 install
- emake -C src -j1 SITE_NAME=LOCAL
-}
-
-src_install() {
- OSTYPE=$(uname)
- MACHTYPE=$(uname -m)
- MACHTYPE=${MACHTYPE/x86_64/amd64}
- MY_S="${OSTYPE}-${MACHTYPE}"
- sed -i 's|#!/usr/local/bin/|#!/usr/bin/env |' $(find $MY_S -type f) ||
die
-
- sed -i '/sub getBinDirectory ()/ a return "/usr/bin";'
${MY_S}/bin/runCA* || die
- sed -i '/sub getBinDirectoryShellCode ()/ a return "bin=/usr/bin\n";'
${MY_S}/bin/runCA* || die
- sed -i '1 a use lib "/usr/share/'${PN}'/lib";' $(find $MY_S -name
'*.p*') || die
-
- dobin kmer/"${MY_S}"/bin/*
- insinto /usr/"$(get_libdir)/${PN}"
- use static-libs && doins kmer/"${MY_S}"/lib/*
-
- insinto /usr/include/"${PN}"
- doins kmer/"${MY_S}"/include/*
-
- insinto /usr/share/"${PN}"/lib
- doins -r "${MY_S}"/bin/TIGR
- rm -rf "${MY_S}"/bin/TIGR || die
- dobin "${MY_S}"/bin/*
- use static-libs && dolib.a "${MY_S}"/lib/*
- dodoc README
-
- # avoid file collision
- rm -f "${D}"/usr/bin/jellyfish
-}
diff --git a/sci-biology/wgs-assembler/wgs-assembler-8.3_rc2.ebuild
b/sci-biology/wgs-assembler/wgs-assembler-8.3_rc2.ebuild
index 9b481a2..e1b5585 100644
--- a/sci-biology/wgs-assembler/wgs-assembler-8.3_rc2.ebuild
+++ b/sci-biology/wgs-assembler/wgs-assembler-8.3_rc2.ebuild
@@ -4,15 +4,15 @@
EAPI=5
-PYTHON_DEPEND=2
+PYTHON_COMPAT=( python2_7 )
-inherit eutils python toolchain-funcs
+inherit eutils python-single-r1 toolchain-funcs
MY_PV="${PV/_}" # convert from _rc2 to rc2
-DESCRIPTION="De novo whole-genome shotgun DNA sequence assembler also known as
Celera Assembler and CABOG"
+DESCRIPTION="De novo whole-genome shotgun DNA sequence assembler (Celera
Assembler and CABOG)"
HOMEPAGE="http://sourceforge.net/projects/wgs-assembler/";
-SRC_URI="http://sourceforge.net/projects/wgs-assembler/files/wgs-assembler/wgs-8.3/wgs-${MY_PV}.tar.bz2";
+SRC_URI="http://sourceforge.net/projects/${PN}/files/${PN}/wgs-8.3/wgs-${MY_PV}.tar.bz2";
LICENSE="GPL-2"
SLOT="0"
@@ -28,11 +28,6 @@ RDEPEND="${DEPEND}
S="${WORKDIR}/wgs-${MY_PV}"
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
src_prepare() {
# epatch \
# "${FILESDIR}"/${P}-build.patch
@@ -40,7 +35,7 @@ src_prepare() {
}
src_configure() {
- cd "${S}/kmer"
+ cd "${S}/kmer" || die
./configure.sh || die
}
@@ -76,5 +71,5 @@ src_install() {
dodoc README
# avoid file collision
- rm -f "${D}"/usr/bin/jellyfish
+ rm -f "${D}"/usr/bin/jellyfish || die
}
[gentoo-commits] proj/sci:master commit in: sci-biology/align_to_scf/
commit: 1fef098316105722536e11c330c942d843d5bc35
Author: Justin Lecher gentoo org>
AuthorDate: Mon Sep 21 19:42:04 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Mon Sep 21 19:42:04 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=1fef0983
sci-biology/align_to_scf: Bump EAPI to 5
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher gentoo.org>
sci-biology/align_to_scf/align_to_scf-1.06.ebuild | 13 +
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/sci-biology/align_to_scf/align_to_scf-1.06.ebuild
b/sci-biology/align_to_scf/align_to_scf-1.06.ebuild
index 68dad98..e9fb134 100644
--- a/sci-biology/align_to_scf/align_to_scf-1.06.ebuild
+++ b/sci-biology/align_to_scf/align_to_scf-1.06.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=3
+EAPI=5
inherit eutils
-DESCRIPTION="Provide data to staden to view trace information at a given
position missing from Roche .ace files"
+DESCRIPTION="View trace information at a given position missing from Roche
.ace files"
HOMEPAGE="http://genome.imb-jena.de/software/roche454ace2caf";
SRC_URI="http://genome.imb-jena.de/software/roche454ace2caf/download/src/align_to_scf-1.06.tgz";
@@ -15,9 +15,6 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND=""
-RDEPEND="${DEPEND}"
-
src_prepare(){
sed -i "s:^CC :CC=$(tc-getCC) #:" Makefile || die "sed failed"
sed -i "s:^LD :LD=$(tc-getCC) #:" Makefile || die "sed failed"
@@ -26,6 +23,6 @@ src_prepare(){
}
src_install(){
- dobin align_to_scf || die
- dodoc "${FILESDIR}"/README || die
+ dobin align_to_scf
+ dodoc "${FILESDIR}"/README
}
[gentoo-commits] repo/gentoo:master commit in: media-sound/spotify/
commit: 703a5a3857497d85c0c40d7ca177c2d2a097d2ca
Author: Matthew Thode mthode org>
AuthorDate: Mon Sep 21 19:19:27 2015 +
Commit: Matt Thode gentoo org>
CommitDate: Mon Sep 21 19:19:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=703a5a38
media-sound/spotify: readding paxmarks
Package-Manager: portage-2.2.20.1
media-sound/spotify/spotify-1.0.14.ebuild | 11 +++
1 file changed, 11 insertions(+)
diff --git a/media-sound/spotify/spotify-1.0.14.ebuild
b/media-sound/spotify/spotify-1.0.14.ebuild
index 71eb980..1105ded 100644
--- a/media-sound/spotify/spotify-1.0.14.ebuild
+++ b/media-sound/spotify/spotify-1.0.14.ebuild
@@ -80,6 +80,17 @@ src_install() {
"spotify-client.png"
done
domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
+ if use pax_kernel; then
+ #create the headers, reset them to default, then paxmark -m them
+ pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
+ pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
+ pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
+ eqawarn "You have set USE=pax_kernel meaning that you intend to
run"
+ eqawarn "${PN} under a PaX enabled kernel. To do so, we must
modify"
+ eqawarn "the ${PN} binary itself and this *may* lead to
breakage! If"
+ eqawarn "you suspect that ${PN} is being broken by this
modification,"
+ eqawarn "please open a bug."
+ fi
}
pkg_preinst() {
[gentoo-commits] repo/gentoo:master commit in: dev-lang/python/files/
commit: 311b0dd5075b5f6644129d4de393d2fa08102d47 Author: Mike Gilbert gentoo org> AuthorDate: Mon Sep 21 19:18:21 2015 + Commit: Mike Gilbert gentoo org> CommitDate: Mon Sep 21 19:18:21 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=311b0dd5 dev-lang/python: Don't patch pyconfig.h.in either Package-Manager: portage-2.2.20_p164 dev-lang/python/files/python-3.3-libressl.patch | 17 - 1 file changed, 17 deletions(-) diff --git a/dev-lang/python/files/python-3.3-libressl.patch b/dev-lang/python/files/python-3.3-libressl.patch index 72bd63b..816704e 100644 --- a/dev-lang/python/files/python-3.3-libressl.patch +++ b/dev-lang/python/files/python-3.3-libressl.patch @@ -125,20 +125,3 @@ index 6a64bff..90f315a 100644 # only check for sem_init if thread support is requested if test "$with_threads" = "yes" -o -z "$with_threads"; then -diff --git a/pyconfig.h.in b/pyconfig.h.in -index 0020300..0d37f67 100644 a/pyconfig.h.in -+++ b/pyconfig.h.in -@@ -660,6 +660,9 @@ - /* Define to 1 if you have the `pwrite' function. */ - #undef HAVE_PWRITE - -+/* Define if the libcrypto has RAND_egd */ -+#undef HAVE_RAND_EGD -+ - /* Define to 1 if you have the `readlink' function. */ - #undef HAVE_READLINK - --- -2.5.2 -
[gentoo-commits] repo/gentoo:master commit in: dev-lang/python/files/
commit: 0170c84efe6352034e68061c73985a0be1736cc2
Author: Mike Gilbert gentoo org>
AuthorDate: Mon Sep 21 19:13:51 2015 +
Commit: Mike Gilbert gentoo org>
CommitDate: Mon Sep 21 19:14:02 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0170c84e
dev-lang/python: Don't patch configure directly
Thanks to Arfrever for the suggestion.
Bug: https://bugs.gentoo.org/560948
Package-Manager: portage-2.2.20_p164
dev-lang/python/files/python-3.3-libressl.patch | 53 -
1 file changed, 53 deletions(-)
diff --git a/dev-lang/python/files/python-3.3-libressl.patch
b/dev-lang/python/files/python-3.3-libressl.patch
index 38119c5..72bd63b 100644
--- a/dev-lang/python/files/python-3.3-libressl.patch
+++ b/dev-lang/python/files/python-3.3-libressl.patch
@@ -111,59 +111,6 @@ index 499e8ba..cb151ba 100644
{"RAND_status", (PyCFunction)PySSL_RAND_status, METH_NOARGS,
PySSL_RAND_status_doc},
#endif
-diff --git a/configure b/configure
-index 6be41f5..5b5a2a0 100755
a/configure
-+++ b/configure
-@@ -8823,6 +8823,48 @@ _ACEOF
-
- fi
- # Dynamic linking for HP-UX
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RAND_egd in -lcrypto"
>&5
-+$as_echo_n "checking for RAND_egd in -lcrypto... " >&6; }
-+if ${ac_cv_lib_crypto_RAND_egd+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lcrypto $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char RAND_egd ();
-+int
-+main ()
-+{
-+return RAND_egd ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_crypto_RAND_egd=yes
-+else
-+ ac_cv_lib_crypto_RAND_egd=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RAND_egd"
>&5
-+$as_echo "$ac_cv_lib_crypto_RAND_egd" >&6; }
-+if test "x$ac_cv_lib_crypto_RAND_egd" = xyes; then :
-+
-+$as_echo "#define HAVE_RAND_EGD 1" >>confdefs.h
-+
-+fi
-+
-
- # only check for sem_init if thread support is requested
- if test "$with_threads" = "yes" -o -z "$with_threads"; then
diff --git a/configure.ac b/configure.ac
index 6a64bff..90f315a 100644
--- a/configure.ac
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-sources/
commit: 15a3690a81f9256c33eba6db4a87224b1297c72e Author: Mike Pagano gentoo org> AuthorDate: Mon Sep 21 18:56:19 2015 + Commit: Mike Pagano gentoo org> CommitDate: Mon Sep 21 18:58:10 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15a3690a sys-kernel/gentoo-sources: Linux patch 3.14.53 Package-Manager: portage-2.2.20.1 sys-kernel/gentoo-sources/Manifest | 3 +++ .../gentoo-sources/gentoo-sources-3.14.53.ebuild | 29 ++ 2 files changed, 32 insertions(+) diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest index 95af937..89d83e8 100644 --- a/sys-kernel/gentoo-sources/Manifest +++ b/sys-kernel/gentoo-sources/Manifest @@ -32,6 +32,9 @@ DIST genpatches-3.14-57.extras.tar.xz 18252 SHA256 c7fab5340d2c59c203ee6b8474939 DIST genpatches-3.14-58.base.tar.xz 1049500 SHA256 e39936f18642b1ff5ae8aea779176c85aa744594f92ba1c02a371364c769ca11 SHA512 1061a233ba42ec880de32099c0a94b772f57cbe5b26ff162ca89be62271ba56b340d20f35143df9a546f93deaf2b5cc6491bd3fa078ec4f1ddff90d49e71cab4 WHIRLPOOL 9b65cac5d4341419a8ee4058a14199e5f2cd58018be13e42f5f885cea7d12342c77281458287fd61176bb258617d1cd5222d9ac9d6cb906a125a723bf7de185c DIST genpatches-3.14-58.experimental.tar.xz 60308 SHA256 8ba27a67947f2c67a1552b036bffba7edd6c5fd7f9aa8807ef28268426696fd3 SHA512 cf1c273dd41c3a7351cbb6c7b3f7026b9bd890b48e92f6ebfa4b455a2321ba8de8221bb091e70107bc3de82e039240ef21c7a49ddfb1c3aa1ee3395ad057b92d WHIRLPOOL 220a59400138e8c56f7a25d6ea3f39ee9123de3adfdae74fb0847e53cfaca3e3c9137025c31faaf3c39bf6d4ea37c5b939d81ec6e98376083460a39c530b0157 DIST genpatches-3.14-58.extras.tar.xz 18252 SHA256 de10705e4f7f9035bdee22b320dc2c988f8700e222d63a78b34336eed5e533b2 SHA512 df1bda02acc817f5bd2c5e812b25180117dda66180fc0c57b217158850d24fd959d1578042417caf11eeffe3a1ed4108061c53a1113867d3bd6c5dc310fe0f90 WHIRLPOOL bfdf157b050d511abf0b478f0478658e0d20137cfead706a0c8c71ee9ea0332b1f034532cf6445910ce43cec520c96d6f6ea76ed003b4d6a8df50850e56a7397 +DIST genpatches-3.14-59.base.tar.xz 1055796 SHA256 2671651a80698e9b29a4fd9a86ecc4579ba91f38b45def5a67b87452ea74a3e5 SHA512 75e4116bb4f3669293875daf3016019934d44ceed74388fdb0062eecd285bea77853aca90e109dd4fcd61aca39707831a3c682ff9af753fa077eeb575b934799 WHIRLPOOL a4249a09d8c4f4e36ac1af377539fc8f6aa16590ee330e1bf2c8e0b07d5aee1582b7327f0b8d23d49d61d9c837da9dffa09d8f6d7c9e365f5891dfb35f98bfd6 +DIST genpatches-3.14-59.experimental.tar.xz 60288 SHA256 374ab6d18959cfbbd914e264e7cdbdf29460db3d1796715ada59715a5890b884 SHA512 214539be58c8c2961ab8a6406aaa8b93b162da83ad1ddeb0f8de04e1f37528941b760f10bba15c6f9a297d32501a094bc49d0b207723ef200a63ceeb3499641d WHIRLPOOL 48618bc6f448f4dd31785630e1491bf1700e640fea4cd9ad440b8a3747d0ad3ab7a56cbb4bd13d8daa16898f91779486cf5c49a129ab6b4f65901d8c178f8e04 +DIST genpatches-3.14-59.extras.tar.xz 18260 SHA256 90809798b05d89806c5b723b1ecdd7361bfeb6bafd9eb934f7d3c7fe5c75f9c6 SHA512 c430c40e95ad3accd31b46f03ba6945c3a5058f82b3386e06f76080270437d41c5a8705e67c8505506dc388ac04397df192e71b1ce5a39780a6d898200b2aa3a WHIRLPOOL 98048e7de376c0e24bce29d30b6b5561b5189190159a3575c35010498de67d1de25e3ea11d2cf292ce71fb1cb8264cd7d379543b43eb48718de20386216c66d4 DIST genpatches-3.18-17.base.tar.xz 489076 SHA256 46ec429229380585e73dfde06e11868d5f3b2212720c0ab57f6023eff0a2e4ba SHA512 af269677d88a2e3a1feb66c26c5a12d967f41606e486903858f982d1cbfbb57a54c26585b6765592337fdb424aa13b714b1bbeec1520e263d64518be3d766476 WHIRLPOOL 74ed70843cb81b493fa86fe334430a7d43d88df3c5c58075a33cea762f8126dece50338ceca9114843c6703836cfd85a7ff2e000e75d2e4fe227010041563bfd DIST genpatches-3.18-17.experimental.tar.xz 61604 SHA256 efd6d02daf759fb77ebd7f6654ba933bce007abc414ed67f3667115dd6c15bd9 SHA512 95abf4e05ec31944a2ff520cfce68753656c966e575b5e23823753bb25da5f1c7f169d908f58df81db7dd75f9dbf1b1060dfb9c6349eabb2d1273086fbb09912 WHIRLPOOL b89d32886fccd7c5be7f65df647f75918e8f0aa3eddd4baccb6b06da5fedb00c04516a600bf48530ee4821dee416580b695bea677607b7ce905156ac0300134f DIST genpatches-3.18-17.extras.tar.xz 16184 SHA256 cadde114f6229bbb92092ae76a0dbba11b4c4841bd0daa8f8520e6e64308254f SHA512 8637aaad4c901937cea64317a85416e328fae1802ddb51b638d68f9a1746b5ad136d6b398105056c047c5d9d5437f5f3ab763a8be3581625e5bc4be16a84a0b5 WHIRLPOOL 2b340ace5325ddbf4149337c8cb1d387c846de061c18269fc1ed207c138e2c4ceaf6cac85a4d969ac0f5433993f7617386494ae4a7bd2281d92ec5852a91f04d diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.14.53.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.14.53.ebuild new file mode 100644 index 000..39fc514 --- /dev/null +++ b/sys-kernel/gentoo-sources/gentoo-sources-3.14.53.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="59" +K_DEBLOB_AVAILABLE="1" +inherit kernel-2 +detect_version +detect_arch + +KEYWORDS="~alph
