[gentoo-commits] repo/gentoo:master commit in: dev-libs/isl/
commit: e441b56a3cf45dbe5be62eb90356e03a9a3fe1fb
Author: Anthony G. Basile gentoo org>
AuthorDate: Tue Jan 19 07:19:28 2016 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Tue Jan 19 07:19:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e441b56a
dev-libs/isl: version bump to 0.16.1
Package-Manager: portage-2.2.26
dev-libs/isl/Manifest | 1 +
dev-libs/isl/isl-0.16.1.ebuild | 40
2 files changed, 41 insertions(+)
diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index 75f37ca..cb6a59d 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -4,3 +4,4 @@ DIST isl-0.13.tar.bz2 1351299 SHA256
7265fd897b7f9147fde76560f28ed18f2c20e5f5da7
DIST isl-0.14.1.tar.xz 1248204 SHA256
8882c9e36549fc757efa267706a9af733bb8d7fe3905cbfde43e17a89eea4675 SHA512
ccae0464771db50c498fd1f9f1006c9bc183fd77a0716507daeb5da6d435fdca0942efc4589464f205615f9e46242a066f61790c40206be02f6cf8506635
WHIRLPOOL
e9c59808a84bd0b769698f129c0fdaf427d004afd6ee979c89f7d6bc7ce6d77f14f5389f2d0718fea6202a29d6da77a60357456117c4696735b14e6369f35985
DIST isl-0.14.tar.xz 1247052 SHA256
b1044f02819da0708fc7071fa2a558ce5d3c29d6676c8cb113caaedd5903ff03 SHA512
cf43868d466d6ff08c5e15345d222ad153e8c4e86831f9854df716eb914c6c15f4c44b73aa6e0b16eb556d1a4d3c26af6f71e85421bf464cbbd053d5f3c515ee
WHIRLPOOL
4fdaa2c05b647f0830afbc3385e5359285b3fa86afa4a117b76e6ced03772d3abe57466e9cbdfe0cf96f05ab8bcbfb4737a6921aeb72fb1bd213374bdb6a2ac3
DIST isl-0.15.tar.xz 1406988 SHA256
104a608839771d809558f5fd7533ca1a3b8ee5a667c5dcd9dc3499bf0a1522d5 SHA512
5e72816da133714fb752ddd10fbe9e8f18deef496445672c0a77429679e50f1def22e05e5ebe9acb5534fc8939a6e6a452ffa3607d479671864a76b6789bdab4
WHIRLPOOL
79d763a423a95544f9b8bd6caef9e23341d8c1bab5ae3711a59ce9cc28f7f3923adb20894601ccd91c0093dbe3c656951b8246b8e947ad5ed32d1beefcde1519
+DIST isl-0.16.1.tar.xz 1449164 SHA256
45292f30b3cb8b9c03009804024df72a79e9b5ab89e41c94752d6ea58a1e4b02 SHA512
6faff2fe07267ba05c156158c36c25aa9beec6058f949b7bb9b8f042c5d01b7a3a17a6117c2c2a13ad6180308c8d03cfd469b237abf85290411599dde614788f
WHIRLPOOL
1f3edf59bc6be956863eae436e62fb6adcc8cbe51e683b72cc986e9d5d30c6fb1c9cdea510652b78b6c448abf522edb1773dfd9cda6792012fcad9ac20fc5609
diff --git a/dev-libs/isl/isl-0.16.1.ebuild b/dev-libs/isl/isl-0.16.1.ebuild
new file mode 100644
index 000..2a72ff6
--- /dev/null
+++ b/dev-libs/isl/isl-0.16.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils multilib-minimal
+
+DESCRIPTION="A library for manipulating integer points bounded by linear
constraints"
+HOMEPAGE="http://isl.gforge.inria.fr/";
+SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz";
+
+LICENSE="LGPL-2.1"
+SLOT="0/15"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ virtual/pkgconfig"
+
+DOCS=( ChangeLog AUTHORS doc/manual.pdf )
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.07-gdb-autoload-dir.patch
+
+ # m4/ax_create_pkgconfig_info.m4 is broken but avoid eautoreconf
+ # https://groups.google.com/group/isl-development/t/37ad876557e50f2c
+ sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die #382737
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files
+}
[gentoo-commits] proj/dotnet:master commit in: dev-lang/mono/, dev-dotnet/libgdiplus/
commit: 5f84efe14055c13fa7826603882522550265107d
Author: Heather live ru>
AuthorDate: Tue Jan 19 06:55:13 2016 +
Commit: Heather Cynede gentoo org>
CommitDate: Tue Jan 19 06:55:13 2016 +
URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=5f84efe1
bump libgdiplus to 4.2 and mono to 4.2.2.29
dev-dotnet/libgdiplus/libgdiplus-4.2.ebuild | 60 ++
dev-lang/mono/mono-4.2.2.29.ebuild | 116
2 files changed, 176 insertions(+)
diff --git a/dev-dotnet/libgdiplus/libgdiplus-4.2.ebuild
b/dev-dotnet/libgdiplus/libgdiplus-4.2.ebuild
new file mode 100644
index 000..669ffae
--- /dev/null
+++ b/dev-dotnet/libgdiplus/libgdiplus-4.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils dotnet flag-o-matic
+
+DESCRIPTION="Library for using System.Drawing with mono"
+HOMEPAGE="http://www.mono-project.com";
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux
~x86-solaris"
+SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.gz";
+
+IUSE="cairo"
+
+RDEPEND=">=dev-libs/glib-2.2.3:2
+ >=media-libs/freetype-2.3.7
+ >=media-libs/fontconfig-2.6
+ >=media-libs/libpng-1.4:0
+ x11-libs/libXrender
+ x11-libs/libX11
+ x11-libs/libXt
+ >=x11-libs/cairo-1.8.4[X]
+ media-libs/libexif
+ >=media-libs/giflib-4.2.3
+ virtual/jpeg:0
+ media-libs/tiff:0
+ !cairo? ( >=x11-libs/pango-1.20 )"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+src_prepare() {
+ sed -i -e 's:ungif:gif:g' configure.ac || die
+ append-flags -fno-strict-aliasing
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ --disable-static \
+ $(usex cairo "" "--with-pango")
+}
+
+src_install () {
+ MAKEOPTS+=" -j1"
+ default
+
+ dotnet_multilib_comply
+ local commondoc=( AUTHORS ChangeLog README TODO )
+ for docfile in "${commondoc[@]}"; do
+ [[ -e "${docfile}" ]] && dodoc "${docfile}"
+ done
+ [[ "${DOCS[@]}" ]] && dodoc "${DOCS[@]}"
+ prune_libtool_files
+}
diff --git a/dev-lang/mono/mono-4.2.2.29.ebuild
b/dev-lang/mono/mono-4.2.2.29.ebuild
new file mode 100644
index 000..677210a
--- /dev/null
+++ b/dev-lang/mono/mono-4.2.2.29.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
+AUTOTOOLS_AUTORECONF=1
+
+inherit eutils linux-info mono-env flag-o-matic pax-utils autotools-utils
versionator
+
+DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
+HOMEPAGE="http://www.mono-project.com/Main_Page";
+SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2";
+
+LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception
IDPL"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+
+IUSE="nls minimal pax_kernel xen doc"
+
+COMMONDEPEND="
+ !minimal? ( >=dev-dotnet/libgdiplus-2.10 )
+ ia64? ( sys-libs/libunwind )
+ nls? ( sys-devel/gettext )
+"
+RDEPEND="${COMMONDEPEND}
+ || ( www-client/links www-client/lynx )
+"
+DEPEND="${COMMONDEPEND}
+ sys-devel/bc
+ virtual/yacc
+ pax_kernel? ( sys-apps/elfix )
+ !dev-lang/mono-basic
+"
+
+MAKEOPTS="${MAKEOPTS} -j1" #nowarn
+S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
+
+pkg_pretend() {
+ # If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang
while compiling.
+ # See http://bugs.gentoo.org/261869 for more info."
+ CONFIG_CHECK="SYSVIPC"
+ use kernel_linux && check_extra_config
+}
+
+pkg_setup() {
+ linux-info_pkg_setup
+ mono-env_pkg_setup
+}
+
+src_prepare() {
+ # we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so
it don't
+ # get killed in the build proces when MPROTECT is enable. #286280
+ # RANDMMAP kill the build proces to #347365
+ # use paxmark.sh to get PT/XT logic #532244
+ if use pax_kernel ; then
+ ewarn "We are disabling MPROTECT on the mono binary."
+
+ # issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
+ sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i
"${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
+ fi
+
+ # mono build system can fail otherwise
+ strip-flags
+
+ # Fix VB targets
+ # http://osdir.com/ml/general/2015-05/msg20808.html
+ epatch "${FILESDIR}/add_missing_vb_portable_targets.patch"
+
+ # Fix build when sgen disabled
+ # https://bugzilla.xamarin.com/show_bug.cgi?id=32015
+ epatch
"${FILESDIR}/${PN}-4.0.2.5-fix-mono-dis-makefile-am-whe
[gentoo-commits] repo/gentoo:master commit in: games-puzzle/scramble/
commit: 27c66358f39141764a3e8bafb03c1d27cd79e5c2
Author: Michael Sterrett gentoo org>
AuthorDate: Tue Jan 19 06:23:00 2016 +
Commit: Michael Sterrett gentoo org>
CommitDate: Tue Jan 19 06:23:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c66358
games-puzzle/scramble: fix building with gcc-5 (bug #571460)
Package-Manager: portage-2.2.26
games-puzzle/scramble/scramble-0.9.5.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/games-puzzle/scramble/scramble-0.9.5.ebuild
b/games-puzzle/scramble/scramble-0.9.5.ebuild
index 3b88d00..6ed5978 100644
--- a/games-puzzle/scramble/scramble-0.9.5.ebuild
+++ b/games-puzzle/scramble/scramble-0.9.5.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Create as many words as you can before the time
runs out"
HOMEPAGE="http://www.shiftygames.com/scramble/scramble.html";
SRC_URI="http://www.shiftygames.com/scramble/${P}.tar.gz";
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ~ppc x86"
IUSE=""
@@ -23,6 +23,8 @@ RDEPEND="${DEPEND}
src_prepare() {
append-cflags $(sdl-config --cflags)
+ sed -i -e 's/inline //' src/scramble.c || die
+ mv configure.{in,ac} || die
eautoreconf
}
[gentoo-commits] proj/openrc:master commit in: src/librc/
commit: 36dde4e7f21afba36a96837aa86f2b5d2dae3807
Author: Doug Freed mtu edu>
AuthorDate: Mon Jan 18 06:05:22 2016 +
Commit: William Hubbs gentoo org>
CommitDate: Tue Jan 19 06:09:20 2016 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=36dde4e7
librc: fix handling the nothing special case for rc_sys
src/librc/librc.c | 15 +--
src/librc/rc.h.in | 1 +
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/librc/librc.c b/src/librc/librc.c
index 5cf4898..8b4e8d4 100644
--- a/src/librc/librc.c
+++ b/src/librc/librc.c
@@ -228,8 +228,13 @@ static const char *
detect_container(const char *systype)
{
#ifdef __FreeBSD__
- if (systype && strcmp(systype, RC_SYS_JAIL) == 0)
- return RC_SYS_JAIL;
+ if (systype) {
+ if (strcmp(systype, RC_SYS_NONE) == 0)
+ return NULL;
+ if (strcmp(systype, RC_SYS_JAIL) == 0)
+ return RC_SYS_JAIL;
+ }
+
int jailed = 0;
size_t len = sizeof(jailed);
@@ -240,6 +245,8 @@ detect_container(const char *systype)
#ifdef __linux__
if (systype) {
+ if (strcmp(systype, RC_SYS_NONE) == 0)
+ return NULL;
if (strcmp(systype, RC_SYS_UML) == 0)
return RC_SYS_UML;
if (strcmp(systype, RC_SYS_VSERVER) == 0)
@@ -283,6 +290,8 @@ detect_vm(const char *systype)
{
#ifdef __NetBSD__
if (systype) {
+ if (strcmp(systype, RC_SYS_NONE) == 0)
+ return NULL;
if (strcmp(systype, RC_SYS_XEN0) == 0)
return RC_SYS_XEN0;
if (strcmp(systype, RC_SYS_XENU) == 0)
@@ -296,6 +305,8 @@ detect_vm(const char *systype)
#ifdef __linux__
if (systype) {
+ if (strcmp(systype, RC_SYS_NONE) == 0)
+ return NULL;
if (strcmp(systype, RC_SYS_XEN0) == 0)
return RC_SYS_XEN0;
if (strcmp(systype, RC_SYS_XENU) == 0)
diff --git a/src/librc/rc.h.in b/src/librc/rc.h.in
index 55fbc44..92ecbb4 100644
--- a/src/librc/rc.h.in
+++ b/src/librc/rc.h.in
@@ -318,6 +318,7 @@ bool rc_service_daemons_crashed(const char *);
* Some services cannot work in these systems, or we do something else. */
#define RC_SYS_DOCKER "DOCKER"
#define RC_SYS_JAIL"JAIL"
+#define RC_SYS_NONE""
#define RC_SYS_OPENVZ "OPENVZ"
#define RC_SYS_LXC "LXC"
#define RC_SYS_PREFIX "PREFIX"
[gentoo-commits] proj/openrc:master commit in: src/librc/
commit: 73482cf13a338051606788957cbd0031ac850c70
Author: William Hubbs gmail com>
AuthorDate: Mon Jan 18 21:09:31 2016 +
Commit: William Hubbs gentoo org>
CommitDate: Mon Jan 18 21:09:31 2016 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=73482cf1
librc: fix librc-depend functions to call rc_sys
src/librc/librc-depend.c | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/librc/librc-depend.c b/src/librc/librc-depend.c
index 991a871..d64b2b2 100644
--- a/src/librc/librc-depend.c
+++ b/src/librc/librc-depend.c
@@ -740,7 +740,7 @@ rc_deptree_update(void)
char *depend, *depends, *service, *type, *nosys, *onosys;
size_t i, k, l;
bool retval = true;
- const char *sys = NULL;
+ const char *sys = rc_sys();
struct utsname uts;
/* Some init scripts need RC_LIBEXECDIR to source stuff
@@ -847,9 +847,6 @@ rc_deptree_update(void)
/* Phase 2 - if we're a special system, remove services that don't
* work for them. This doesn't stop them from being run directly. */
- sys = detect_container();
- if (!sys)
- sys = detect_vm();
if (sys) {
len = strlen(sys);
nosys = xmalloc(len + 2);
[gentoo-commits] proj/openrc:master commit in: src/includes/, src/rc/
commit: 55a28f5d2524615560698453a5a6afd50460030c
Author: William Hubbs gmail com>
AuthorDate: Tue Jan 19 05:40:20 2016 +
Commit: William Hubbs gentoo org>
CommitDate: Tue Jan 19 05:40:20 2016 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=55a28f5d
Revert "rc: make get_systype similar to the old rc_sys function"
This reverts commit f79a7a7be18d68bf264efc60d82838d03048da6b.
src/includes/rc-misc.h | 5 +-
src/rc/_usage.c| 5 +-
src/rc/rc-misc.c | 333 -
src/rc/rc.c| 19 ++-
4 files changed, 186 insertions(+), 176 deletions(-)
diff --git a/src/includes/rc-misc.h b/src/includes/rc-misc.h
index de73c5c..f2449cd 100644
--- a/src/includes/rc-misc.h
+++ b/src/includes/rc-misc.h
@@ -43,7 +43,6 @@
char *rc_conf_value(const char *var);
bool rc_conf_yesno(const char *var);
-char *get_systype(void);
void env_filter(void);
void env_config(void);
int signal_setup(int sig, void (*handler)(int));
@@ -61,6 +60,10 @@ int is_writable(const char *);
#define service_stop(service) exec_service(service, "stop");
int parse_mode(mode_t *, char *);
+const char *detect_prefix(void);
+const char *get_systype(void);
+const char *detect_container(void);
+const char *detect_vm(void);
/* Handy function so we can wrap einfo around our deptree */
RC_DEPTREE *_rc_deptree_load (int, int *);
diff --git a/src/rc/_usage.c b/src/rc/_usage.c
index 40d8142..9fc3e5d 100644
--- a/src/rc/_usage.c
+++ b/src/rc/_usage.c
@@ -44,9 +44,12 @@ void set_quiet_options(void)
_noreturn void show_version(void)
{
- char *systype = get_systype();
+ const char *systype = NULL;
printf("%s (OpenRC", applet);
+ systype = detect_container();
+ if (!systype)
+ systype = detect_vm();
if (systype)
printf(" [%s]", systype);
printf(") %s", VERSION);
diff --git a/src/rc/rc-misc.c b/src/rc/rc-misc.c
index e0e6e2c..2c6c388 100644
--- a/src/rc/rc-misc.c
+++ b/src/rc/rc-misc.c
@@ -50,172 +50,6 @@ rc_conf_yesno(const char *setting)
return rc_yesno(rc_conf_value (setting));
}
-/*
- * static bool is_container(const char *systype)
- * {
-* FreeBSD: RC_SYS_JAIL
-* Linux: RC_SYS_UML RC_SYS_VSERVER RC_SYS_OPENVZ RC_SYS_LXC
-* RC_SYS_RKT RC_SYS_SYSTEMD_NSPAWN RC_SYS_DOCKER
- * }
- *
- * static bool is_vm(const char *systype)
- * {
-* NetBSD: RC_SYS_XEN0 RC_SYS_XENU
-* Linux: RC_SYS_XEN0 RC_SYS_XENU
- * }
- */
-
-static bool file_regex(const char *file, const char *regex)
-{
- FILE *fp;
- char *line = NULL;
- size_t len = 0;
- regex_t re;
- bool retval = true;
- int result;
-
- if (!(fp = fopen(file, "r")))
- return false;
-
- if ((result = regcomp(&re, regex, REG_EXTENDED | REG_NOSUB)) != 0) {
- fclose(fp);
- line = xmalloc(sizeof(char) * BUFSIZ);
- regerror(result, &re, line, BUFSIZ);
- fprintf(stderr, "file_regex: %s", line);
- free(line);
- return false;
- }
-
- while ((rc_getline(&line, &len, fp))) {
- char *str = line;
- /* some /proc files have \0 separated content so we have to
- loop through the 'line' */
- do {
- if (regexec(&re, str, 0, NULL, 0) == 0)
- goto found;
- str += strlen(str) + 1;
- /* len is the size of allocated buffer and we don't
- want call regexec BUFSIZE times. find next str */
- while (str < line + len && *str == '\0')
- str++;
- } while (str < line + len);
- }
- retval = false;
-found:
- fclose(fp);
- free(line);
- regfree(&re);
-
- return retval;
-}
-
-char *get_systype(void)
-{
- char *systype = rc_conf_value("rc_sys");
- char *s;
-
- if (systype) {
- if (*systype == '\0') {
- free(systype);
- return NULL;
- }
- s = systype;
- /* Convert to uppercase */
- while (s && *s) {
- if (islower((unsigned char) *s))
- *s = toupper((unsigned char) *s);
- s++;
- }
- if (strcmp(systype,RC_SYS_PREFIX) == 0)
- return systype;
-
-#ifdef __FreeBSD__
- if (strcmp(systype, RC_SYS_JAIL) == 0)
- return systype;
-#endif
-
-#ifdef __linux__
- if (strcmp(systype, RC_SYS_UML) == 0)
- return systype;
- else if (strcmp(systype, RC_SYS_VSERVER) == 0)
- return systype;
- else if (strcmp(systype, RC_SYS_OPENV
[gentoo-commits] proj/openrc:master commit in: src/rc/, src/includes/
commit: f79a7a7be18d68bf264efc60d82838d03048da6b
Author: William Hubbs gmail com>
AuthorDate: Mon Jan 18 21:50:50 2016 +
Commit: William Hubbs gentoo org>
CommitDate: Mon Jan 18 21:50:59 2016 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=f79a7a7b
rc: make get_systype similar to the old rc_sys function
src/includes/rc-misc.h | 5 +-
src/rc/_usage.c| 5 +-
src/rc/rc-misc.c | 333 +
src/rc/rc.c| 19 +--
4 files changed, 176 insertions(+), 186 deletions(-)
diff --git a/src/includes/rc-misc.h b/src/includes/rc-misc.h
index f2449cd..de73c5c 100644
--- a/src/includes/rc-misc.h
+++ b/src/includes/rc-misc.h
@@ -43,6 +43,7 @@
char *rc_conf_value(const char *var);
bool rc_conf_yesno(const char *var);
+char *get_systype(void);
void env_filter(void);
void env_config(void);
int signal_setup(int sig, void (*handler)(int));
@@ -60,10 +61,6 @@ int is_writable(const char *);
#define service_stop(service) exec_service(service, "stop");
int parse_mode(mode_t *, char *);
-const char *detect_prefix(void);
-const char *get_systype(void);
-const char *detect_container(void);
-const char *detect_vm(void);
/* Handy function so we can wrap einfo around our deptree */
RC_DEPTREE *_rc_deptree_load (int, int *);
diff --git a/src/rc/_usage.c b/src/rc/_usage.c
index 9fc3e5d..40d8142 100644
--- a/src/rc/_usage.c
+++ b/src/rc/_usage.c
@@ -44,12 +44,9 @@ void set_quiet_options(void)
_noreturn void show_version(void)
{
- const char *systype = NULL;
+ char *systype = get_systype();
printf("%s (OpenRC", applet);
- systype = detect_container();
- if (!systype)
- systype = detect_vm();
if (systype)
printf(" [%s]", systype);
printf(") %s", VERSION);
diff --git a/src/rc/rc-misc.c b/src/rc/rc-misc.c
index 2c6c388..e0e6e2c 100644
--- a/src/rc/rc-misc.c
+++ b/src/rc/rc-misc.c
@@ -50,6 +50,172 @@ rc_conf_yesno(const char *setting)
return rc_yesno(rc_conf_value (setting));
}
+/*
+ * static bool is_container(const char *systype)
+ * {
+* FreeBSD: RC_SYS_JAIL
+* Linux: RC_SYS_UML RC_SYS_VSERVER RC_SYS_OPENVZ RC_SYS_LXC
+* RC_SYS_RKT RC_SYS_SYSTEMD_NSPAWN RC_SYS_DOCKER
+ * }
+ *
+ * static bool is_vm(const char *systype)
+ * {
+* NetBSD: RC_SYS_XEN0 RC_SYS_XENU
+* Linux: RC_SYS_XEN0 RC_SYS_XENU
+ * }
+ */
+
+static bool file_regex(const char *file, const char *regex)
+{
+ FILE *fp;
+ char *line = NULL;
+ size_t len = 0;
+ regex_t re;
+ bool retval = true;
+ int result;
+
+ if (!(fp = fopen(file, "r")))
+ return false;
+
+ if ((result = regcomp(&re, regex, REG_EXTENDED | REG_NOSUB)) != 0) {
+ fclose(fp);
+ line = xmalloc(sizeof(char) * BUFSIZ);
+ regerror(result, &re, line, BUFSIZ);
+ fprintf(stderr, "file_regex: %s", line);
+ free(line);
+ return false;
+ }
+
+ while ((rc_getline(&line, &len, fp))) {
+ char *str = line;
+ /* some /proc files have \0 separated content so we have to
+ loop through the 'line' */
+ do {
+ if (regexec(&re, str, 0, NULL, 0) == 0)
+ goto found;
+ str += strlen(str) + 1;
+ /* len is the size of allocated buffer and we don't
+ want call regexec BUFSIZE times. find next str */
+ while (str < line + len && *str == '\0')
+ str++;
+ } while (str < line + len);
+ }
+ retval = false;
+found:
+ fclose(fp);
+ free(line);
+ regfree(&re);
+
+ return retval;
+}
+
+char *get_systype(void)
+{
+ char *systype = rc_conf_value("rc_sys");
+ char *s;
+
+ if (systype) {
+ if (*systype == '\0') {
+ free(systype);
+ return NULL;
+ }
+ s = systype;
+ /* Convert to uppercase */
+ while (s && *s) {
+ if (islower((unsigned char) *s))
+ *s = toupper((unsigned char) *s);
+ s++;
+ }
+ if (strcmp(systype,RC_SYS_PREFIX) == 0)
+ return systype;
+
+#ifdef __FreeBSD__
+ if (strcmp(systype, RC_SYS_JAIL) == 0)
+ return systype;
+#endif
+
+#ifdef __linux__
+ if (strcmp(systype, RC_SYS_UML) == 0)
+ return systype;
+ else if (strcmp(systype, RC_SYS_VSERVER) == 0)
+ return systype;
+ else if (strcmp(systype, RC_SYS_OPENVZ) == 0)
+ return systype;
+ else if
[gentoo-commits] proj/openrc:master commit in: src/librc/
commit: 6c0942137572608d02eb4b34bad55c9bf418a6ba
Author: William Hubbs gmail com>
AuthorDate: Tue Jan 19 05:40:03 2016 +
Commit: William Hubbs gentoo org>
CommitDate: Tue Jan 19 05:40:03 2016 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=6c094213
Revert "librc: fix librc-depend functions to call rc_sys"
This reverts commit 73482cf13a338051606788957cbd0031ac850c70.
src/librc/librc-depend.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/librc/librc-depend.c b/src/librc/librc-depend.c
index d64b2b2..991a871 100644
--- a/src/librc/librc-depend.c
+++ b/src/librc/librc-depend.c
@@ -740,7 +740,7 @@ rc_deptree_update(void)
char *depend, *depends, *service, *type, *nosys, *onosys;
size_t i, k, l;
bool retval = true;
- const char *sys = rc_sys();
+ const char *sys = NULL;
struct utsname uts;
/* Some init scripts need RC_LIBEXECDIR to source stuff
@@ -847,6 +847,9 @@ rc_deptree_update(void)
/* Phase 2 - if we're a special system, remove services that don't
* work for them. This doesn't stop them from being run directly. */
+ sys = detect_container();
+ if (!sys)
+ sys = detect_vm();
if (sys) {
len = strlen(sys);
nosys = xmalloc(len + 2);
[gentoo-commits] proj/openrc:master commit in: src/librc/
commit: 4c814a0a285565bc09d662f602f93dbb938503c6
Author: Doug Freed mtu edu>
AuthorDate: Mon Jan 18 06:39:11 2016 +
Commit: William Hubbs gentoo org>
CommitDate: Tue Jan 19 06:09:20 2016 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=4c814a0a
librc: handle rc_sys="prefix" even if we weren't built with a prefix
This probably isn't needed, but it mimics old behavior.
src/librc/librc.c | 7 +++
1 file changed, 7 insertions(+)
diff --git a/src/librc/librc.c b/src/librc/librc.c
index 8b4e8d4..3e1f0d8 100644
--- a/src/librc/librc.c
+++ b/src/librc/librc.c
@@ -220,6 +220,13 @@ detect_prefix(const char *systype)
#ifdef PREFIX
return RC_SYS_PREFIX;
#else
+ if (systype) {
+ if (strcmp(systype, RC_SYS_NONE) == 0)
+ return NULL;
+ if (strcmp(systype, RC_SYS_PREFIX) == 0)
+ return RC_SYS_PREFIX;
+ }
+
return NULL;
#endif
}
[gentoo-commits] proj/openrc:master commit in: src/rc/
commit: 62b49b2a3ad1c13012305b4d7281d7f6543c70d7
Author: Doug Freed mtu edu>
AuthorDate: Mon Jan 18 06:57:26 2016 +
Commit: William Hubbs gentoo org>
CommitDate: Tue Jan 19 06:09:20 2016 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=62b49b2a
rc: remove use of magic constant and allow OpenVZ to drop to shell
OpenVZ has had console support for a long time now; allow them to use it
to drop to a shell during interactive boot.
src/rc/rc.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/rc/rc.c b/src/rc/rc.c
index 1aae45f..7836341 100644
--- a/src/rc/rc.c
+++ b/src/rc/rc.c
@@ -283,9 +283,8 @@ open_shell(void)
#ifdef __linux__
const char *sys = rc_sys();
- /* VSERVER and OPENVZ systems cannot really drop to shells */
- if (sys &&
- (strcmp(sys, "VSERVER") == 0 || strcmp(sys, "OPENVZ") == 0))
+ /* VSERVER systems cannot really drop to shells */
+ if (sys && strcmp(sys, RC_SYS_VSERVER) == 0)
{
execl("/sbin/halt", "/sbin/halt", "-f", (char *) NULL);
eerrorx("%s: unable to exec `/sbin/halt': %s",
[gentoo-commits] proj/openrc:master commit in: /, src/includes/, src/rc/, src/librc/
commit: 649f63d882d53533ae8b1c3b28967e772e738c45
Author: Doug Freed mtu edu>
AuthorDate: Mon Jan 18 05:43:46 2016 +
Commit: William Hubbs gentoo org>
CommitDate: Tue Jan 19 06:09:20 2016 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=649f63d8
librc: move system detection code into rc_sys and use it
This fixes an issue where librc code was calling code that only existed
in the rc binary.
This reverts commits 8addd79 and 9f6e056
This fixes #75.
FEATURE-REMOVAL-SCHEDULE.md | 10 ---
src/includes/rc-misc.h | 4 --
src/librc/librc-depend.c| 5 +-
src/librc/librc.c | 97 ++
src/rc/_usage.c | 5 +-
src/rc/rc-misc.c| 164 +---
src/rc/rc.c | 20 ++
7 files changed, 76 insertions(+), 229 deletions(-)
diff --git a/FEATURE-REMOVAL-SCHEDULE.md b/FEATURE-REMOVAL-SCHEDULE.md
index 8d07cd4..d66f94f 100644
--- a/FEATURE-REMOVAL-SCHEDULE.md
+++ b/FEATURE-REMOVAL-SCHEDULE.md
@@ -76,13 +76,3 @@ Why: The getline() function was standardized in
POSIX.1-2008, so it
Who:
-### rc_sys()
-
-When: 1.0
-
-Why: The OpenRC code now uses two internal functions, detect_container()
-and detect_vm() to handle this. rc_sys() is broken because it
-doesn't differentiate between containers and vm's.
-
-Who:
-
diff --git a/src/includes/rc-misc.h b/src/includes/rc-misc.h
index f2449cd..684ace5 100644
--- a/src/includes/rc-misc.h
+++ b/src/includes/rc-misc.h
@@ -60,10 +60,6 @@ int is_writable(const char *);
#define service_stop(service) exec_service(service, "stop");
int parse_mode(mode_t *, char *);
-const char *detect_prefix(void);
-const char *get_systype(void);
-const char *detect_container(void);
-const char *detect_vm(void);
/* Handy function so we can wrap einfo around our deptree */
RC_DEPTREE *_rc_deptree_load (int, int *);
diff --git a/src/librc/librc-depend.c b/src/librc/librc-depend.c
index 991a871..d64b2b2 100644
--- a/src/librc/librc-depend.c
+++ b/src/librc/librc-depend.c
@@ -740,7 +740,7 @@ rc_deptree_update(void)
char *depend, *depends, *service, *type, *nosys, *onosys;
size_t i, k, l;
bool retval = true;
- const char *sys = NULL;
+ const char *sys = rc_sys();
struct utsname uts;
/* Some init scripts need RC_LIBEXECDIR to source stuff
@@ -847,9 +847,6 @@ rc_deptree_update(void)
/* Phase 2 - if we're a special system, remove services that don't
* work for them. This doesn't stop them from being run directly. */
- sys = detect_container();
- if (!sys)
- sys = detect_vm();
if (sys) {
len = strlen(sys);
nosys = xmalloc(len + 2);
diff --git a/src/librc/librc.c b/src/librc/librc.c
index 6449898..5cf4898 100644
--- a/src/librc/librc.c
+++ b/src/librc/librc.c
@@ -198,13 +198,9 @@ found:
#endif
-const char *
-rc_sys(void)
+static const char *
+get_systype(void)
{
-#ifdef PREFIX
- return RC_SYS_PREFIX;
-#endif
-
char *systype = rc_conf_value("rc_sys");
if (systype) {
char *s = systype;
@@ -215,7 +211,22 @@ rc_sys(void)
s++;
}
}
+ return systype;
+}
+
+static const char *
+detect_prefix(const char *systype)
+{
+#ifdef PREFIX
+ return RC_SYS_PREFIX;
+#else
+ return NULL;
+#endif
+}
+static const char *
+detect_container(const char *systype)
+{
#ifdef __FreeBSD__
if (systype && strcmp(systype, RC_SYS_JAIL) == 0)
return RC_SYS_JAIL;
@@ -227,25 +238,8 @@ rc_sys(void)
return RC_SYS_JAIL;
#endif
-#ifdef __NetBSD__
- if (systype) {
- if(strcmp(systype, RC_SYS_XEN0) == 0)
- return RC_SYS_XEN0;
- if (strcmp(systype, RC_SYS_XENU) == 0)
- return RC_SYS_XENU;
- }
- if (exists("/kern/xen/privcmd"))
- return RC_SYS_XEN0;
- if (exists("/kern/xen"))
- return RC_SYS_XENU;
-#endif
-
#ifdef __linux__
if (systype) {
- if (strcmp(systype, RC_SYS_XEN0) == 0)
- return RC_SYS_XEN0;
- if (strcmp(systype, RC_SYS_XENU) == 0)
- return RC_SYS_XENU;
if (strcmp(systype, RC_SYS_UML) == 0)
return RC_SYS_UML;
if (strcmp(systype, RC_SYS_VSERVER) == 0)
@@ -261,11 +255,7 @@ rc_sys(void)
if (strcmp(systype, RC_SYS_DOCKER) == 0)
return RC_SYS_DOCKER;
}
- if (exists("/proc/xen")) {
- if (file_regex("/proc/xen/capabilities", "control_d"))
- return RC_SYS_XEN0;
- return RC_SYS_XENU;
- } else if (file_regex("/proc/cpuinfo", "UML"))
+ if (file_regex("/proc/cpuinfo", "UML
[gentoo-commits] proj/openrc:master commit in: src/rc/
commit: 0910c455d3723ac4d4b793afb61cd82f660547f4
Author: William Hubbs gmail com>
AuthorDate: Thu Jan 14 19:33:05 2016 +
Commit: William Hubbs gentoo org>
CommitDate: Thu Jan 14 19:33:05 2016 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=0910c455
src/rc/Makefile: fix make depend target
src/rc/Makefile | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/rc/Makefile b/src/rc/Makefile
index ed0733e..a940102 100644
--- a/src/rc/Makefile
+++ b/src/rc/Makefile
@@ -1,4 +1,9 @@
-SRCS= rc.crc-logger.c rc-misc.c rc-plugin.c
+SRCS= checkpath.c do_e.c do_mark_service.c do_service.c \
+ do_value.c fstabinfo.c is_newer_than.c is_older_than.c \
+ mountinfo.c openrc-run.c rc-abort.c rc.c \
+ rc-depend.c rc-logger.c rc-misc.c rc-plugin.c \
+ rc-selinux.c rc-service.c rc-status.c rc-update.c \
+ shell_var.c start-stop-daemon.c swclock.c _usage.c
ifeq (${MKSELINUX},yes)
SRCS+= rc-selinux.c
[gentoo-commits] proj/openrc:master commit in: src/rc/
commit: 79359f77cc786e18695368bccb6b6186ecfe38c0
Author: William Hubbs gmail com>
AuthorDate: Sat Jan 16 21:34:17 2016 +
Commit: William Hubbs gentoo org>
CommitDate: Mon Jan 18 22:06:39 2016 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=79359f77
fix bsd build
X-Gentoo-Bug: 572068
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=572068
src/rc/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/rc/Makefile b/src/rc/Makefile
index a940102..71ae503 100644
--- a/src/rc/Makefile
+++ b/src/rc/Makefile
@@ -2,7 +2,7 @@ SRCS= checkpath.c do_e.c do_mark_service.c do_service.c \
do_value.c fstabinfo.c is_newer_than.c is_older_than.c \
mountinfo.c openrc-run.c rc-abort.c rc.c \
rc-depend.c rc-logger.c rc-misc.c rc-plugin.c \
- rc-selinux.c rc-service.c rc-status.c rc-update.c \
+ rc-service.c rc-status.c rc-update.c \
shell_var.c start-stop-daemon.c swclock.c _usage.c
ifeq (${MKSELINUX},yes)
[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtk+/
commit: a45e40dce662aa5684a425b5f3ba7c4a0a5fcddc Author: NP-Hardass gentoo org> AuthorDate: Tue Jan 19 06:09:50 2016 + Commit: NP Hardass gentoo org> CommitDate: Tue Jan 19 06:10:30 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a45e40dc Revert "x11-libs/gtk+: subslot gtk+:3" This reverts commit 1eae3055918c29f8ad8e1a900d2280f5d12b0c37. x11-libs/gtk+/gtk+-3.16.7.ebuild | 2 +- x11-libs/gtk+/gtk+-3.18.5.ebuild | 2 +- x11-libs/gtk+/gtk+-3.18.6.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/x11-libs/gtk+/gtk+-3.16.7.ebuild b/x11-libs/gtk+/gtk+-3.16.7.ebuild index 946f93f..3b97f90 100644 --- a/x11-libs/gtk+/gtk+-3.16.7.ebuild +++ b/x11-libs/gtk+/gtk+-3.16.7.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Gimp ToolKit +" HOMEPAGE="http://www.gtk.org/"; LICENSE="LGPL-2+" -SLOT="3/3.16" +SLOT="3" IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama" REQUIRED_USE=" || ( aqua wayland X ) diff --git a/x11-libs/gtk+/gtk+-3.18.5.ebuild b/x11-libs/gtk+/gtk+-3.18.5.ebuild index a4d5f9a..f81b5fd 100644 --- a/x11-libs/gtk+/gtk+-3.18.5.ebuild +++ b/x11-libs/gtk+/gtk+-3.18.5.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Gimp ToolKit +" HOMEPAGE="http://www.gtk.org/"; LICENSE="LGPL-2+" -SLOT="3/3.18" +SLOT="3" IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama" REQUIRED_USE=" || ( aqua wayland X ) diff --git a/x11-libs/gtk+/gtk+-3.18.6.ebuild b/x11-libs/gtk+/gtk+-3.18.6.ebuild index 8a40c38..1033f28 100644 --- a/x11-libs/gtk+/gtk+-3.18.6.ebuild +++ b/x11-libs/gtk+/gtk+-3.18.6.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Gimp ToolKit +" HOMEPAGE="http://www.gtk.org/"; LICENSE="LGPL-2+" -SLOT="3/3.18" +SLOT="3" IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama" REQUIRED_USE=" || ( aqua wayland X )
[gentoo-commits] repo/gentoo:master commit in: net-proxy/sshuttle/
commit: 48e721b6ca5e1d45de623c4f154a95791b021048 Author: Tim Harder gentoo org> AuthorDate: Tue Jan 19 04:44:25 2016 + Commit: Tim Harder gentoo org> CommitDate: Tue Jan 19 04:44:25 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48e721b6 net-proxy/sshuttle: add pypi to metadata net-proxy/sshuttle/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/net-proxy/sshuttle/metadata.xml b/net-proxy/sshuttle/metadata.xml index f932a94..1d3aaf4 100644 --- a/net-proxy/sshuttle/metadata.xml +++ b/net-proxy/sshuttle/metadata.xml @@ -6,6 +6,7 @@ Tim Harder +sshuttle sshuttle/sshuttle
[gentoo-commits] repo/gentoo:master commit in: net-proxy/sshuttle/
commit: fe4909d8f2d5d5f88eccc8360fe5e2ed9e059ea7
Author: Tim Harder gentoo org>
AuthorDate: Tue Jan 19 04:28:12 2016 +
Commit: Tim Harder gentoo org>
CommitDate: Tue Jan 19 04:28:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe4909d8
net-proxy/sshuttle: version bump to 0.76
net-proxy/sshuttle/Manifest | 1 +
net-proxy/sshuttle/sshuttle-0.76.ebuild | 35 +
2 files changed, 36 insertions(+)
diff --git a/net-proxy/sshuttle/Manifest b/net-proxy/sshuttle/Manifest
index ba1dd05..9e47de6 100644
--- a/net-proxy/sshuttle/Manifest
+++ b/net-proxy/sshuttle/Manifest
@@ -1,3 +1,4 @@
DIST sshuttle-0.61.tar.xz 181528 SHA256
78cea312c4bab6f6baa459131cb7739d9fae7d0df9e54efd48fc4ddd852042f5 SHA512
39687ecf0a9b78cc0f7dc576c3c036f5afb52050f17d793602e50c8a9ab8bb0f9eb3277cb2fffb1e9c0f5f652d96c6915aecf8a8da93697172d8cbef1161a986
WHIRLPOOL
9c8597d98306730fcab750094588310c03bafea473b54a2758e055a7bb4bb851b3edad4d2cf2995893a30ed4148b7fd8437820099042ff6c7c52a0dc279d6ebc
DIST sshuttle-0.73.tar.gz 53321 SHA256
d78a6aa76f93ab69fd9685ce11b428a9b549c049a6c0104740c06c9b354a5ae3 SHA512
75bef9f0472cf648454fbde6d6fb14e0656e5d84896cf3295e8535a4cf6859bdafd0053d65ebb673da46e0bcb422dd1a615deef026c2eefd67a4702e70dd3660
WHIRLPOOL
c07745df347e68326e211939db0fb8f0eac862cd7f1035b4e3424f3ad6bc9509a558508e8af77e2aaef290e694d871227d3f5a569ae444bc67457419a988b9f1
DIST sshuttle-0.75.tar.gz 52736 SHA256
63714287d8f9128eefafe4e1b9fc9c8367490f9d074a2b2ff2f555c46ff794b2 SHA512
caa1d2de2c1622086c00b1686dca14a975944cc91d6c9f0a9610060304b638609290e34bb9e719c2aadfc1f4f6eca151c769bb0cae7fe2ff74e67979e5949a24
WHIRLPOOL
cc10efdbf5ce91ad308a72660595e84e78869168d2d8203065aa77d2c63a17f9075bacfade2ea74e73a358e42f989e48a3963232b8c68f88088f0858835c5023
+DIST sshuttle-0.76.tar.gz 61706 SHA256
0b915dee37b203109930868465f4ae0389605cd5cde256381b62ef0637c810e0 SHA512
9a5cb401cef8f0bec3a9c9704ec87557196adadf6b8778c37473bffbf3b52100701e838a840a601b3fc6732ee3907fe25e2fb3ad5fe4e8f1776e35074cfb30cb
WHIRLPOOL
4bf79bfa083e4bcb1e6cb68923267216971b915bb562d0c74c6d082d227e6ccc3b2966ec1770c9abc41ece8c50f8cc784d2d22fb90e5b0272b9356d7a16d3905
diff --git a/net-proxy/sshuttle/sshuttle-0.76.ebuild
b/net-proxy/sshuttle/sshuttle-0.76.ebuild
new file mode 100644
index 000..98744d0
--- /dev/null
+++ b/net-proxy/sshuttle/sshuttle-0.76.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_5} )
+
+inherit eutils linux-info distutils-r1
+
+DESCRIPTION="Transparent proxy server that works as a poor man's VPN using ssh"
+HOMEPAGE="https://github.com/sshuttle/sshuttle
https://pypi.python.org/pypi/sshuttle";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ net-firewall/iptables
+"
+DEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ test? (
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+
+CONFIG_CHECK="~NETFILTER_XT_TARGET_HL ~IP_NF_TARGET_REDIRECT ~NF_NAT"
+
+python_test() {
+ py.test || die "Tests fail under ${EPYTHON}"
+}
[gentoo-commits] repo/gentoo:master commit in: media-libs/glfw/
commit: 00d483b9e0a95a670bed0ec3b97e2adf16afb0c4
Author: Michael Sterrett gentoo org>
AuthorDate: Tue Jan 19 03:47:06 2016 +
Commit: Michael Sterrett gentoo org>
CommitDate: Tue Jan 19 03:47:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00d483b9
media-libs/glfw: version bump
Package-Manager: portage-2.2.26
media-libs/glfw/Manifest | 1 +
media-libs/glfw/glfw-3.1.2.ebuild | 33 +
2 files changed, 34 insertions(+)
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index a5d494d..e9c282a 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -1,2 +1,3 @@
DIST glfw-2.7.7.tar.bz2 927805 SHA256
422e755979524a1da28e4addcae723b7132998ca15e89be41bf34964d9360aa2 SHA512
1b51b9d88c8eed9da8084421949b561a4779410a6369ffdf482c2d8a166bab8c58bbb087ef6f32180d3fe9430988549be5c183b338dd0e1191b2c4b4a7b55379
WHIRLPOOL
646d38fd3ea88e8aa19dcbfa8f8b933adc530ea946cd51c3e03971ed6cdb294dadf5020a876ba298c378896179a4a7ba0129b858fc7f1273a574fe1c2c388a77
DIST glfw-3.1.1.tar.bz2 584344 SHA256
4a8516223c1df079efb398754f4533af7e943188ea9b5222e7f27c25e4822d61 SHA512
c54da5a1714aa1f9a79283922374672dac01c6a6093ed4cddd257d565258e6adffab83bcb34723cd34b415d9a8029f5f13fb225e6cf0a29bc74126a9bd5147e7
WHIRLPOOL
d2ee39e01b3d6ff24af8fe5c262d4c099412eb42324726d8a0aa306d93fe6c6fe8477b6afd72e79122fc35258e573e87232128b193a461d7c7f8544338e292a5
+DIST glfw-3.1.2.tar.bz2 588640 SHA256
31a1e6b6d7c64bbf44dce623785c87c0f29d965b19c452828e48acd64fa643e7 SHA512
00dc822403848f3e60535b9f70ea43147717252373c704c52b5480020cea7f416a00c036ab5ffbc0bc76863c4ddb7d271310e64face639e68f7a62e9db882e94
WHIRLPOOL
1e54efff306fc7f17620f6a874c66e5315d9dd2b2c45f6f4c95562b1c2ac50c5e4410173c23351c31aeaee187b5fe3d1788fd9a42053d420b5a252331a2c
diff --git a/media-libs/glfw/glfw-3.1.2.ebuild
b/media-libs/glfw/glfw-3.1.2.ebuild
new file mode 100644
index 000..1aa6935
--- /dev/null
+++ b/media-libs/glfw/glfw-3.1.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="The Portable OpenGL FrameWork"
+HOMEPAGE="http://www.glfw.org/";
+SRC_URI="mirror://sourceforge/glfw/${P}.tar.bz2"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="egl examples"
+
+RDEPEND="x11-libs/libXrandr
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libXxf86vm
+ x11-libs/libXinerama
+ x11-libs/libXcursor
+ virtual/opengl"
+DEPEND=${RDEPEND}
+
+src_configure() {
+ local mycmakeargs="
+ $(cmake-utils_use egl GLFW_USE_EGL)
+ $(cmake-utils_use examples GLFW_BUILD_EXAMPLES)
+ -DBUILD_SHARED_LIBS=1
+ "
+ cmake-utils_src_configure
+}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/
commit: 4513d5026dc7f32b01a49b5b30c41035c3f11c40
Author: NP-Hardass gentoo org>
AuthorDate: Tue Jan 19 00:52:58 2016 +
Commit: NP Hardass gentoo org>
CommitDate: Tue Jan 19 02:02:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4513d502
app-emulation/wine: update
Package-Manager: portage-2.2.26
app-emulation/wine/wine-.ebuild | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/app-emulation/wine/wine-.ebuild
b/app-emulation/wine/wine-.ebuild
index 5150817..e8b401a 100644
--- a/app-emulation/wine/wine-.ebuild
+++ b/app-emulation/wine/wine-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -27,16 +27,16 @@ MV="4.5.6"
STAGING_P="wine-staging-${PV}"
STAGING_DIR="${WORKDIR}/${STAGING_P}"
WINE_GENTOO="wine-gentoo-2015.03.07"
-GST_P="wine-1.7.34-gstreamer-v5"
+GST_P="wine-1.7.55-gstreamer-v5"
DESCRIPTION="Free implementation of Windows(tm) on Unix"
HOMEPAGE="http://www.winehq.org/";
SRC_URI="${SRC_URI}
gecko? (
- abi_x86_32? (
mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
- abi_x86_64? (
mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+ abi_x86_32? (
https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
+ abi_x86_64? (
https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
)
- mono? (
mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
- gstreamer? (
https://dev.gentoo.org/~tetromino/distfiles/${PN}/${GST_P}.patch.bz2 )
+ mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
+ gstreamer? (
https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${GST_P}.patch.bz2 )
https://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2";
if [[ ${PV} == "" ]] ; then
@@ -56,8 +56,8 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
pipelight? ( staging )
s3tc? ( staging )
vaapi? ( staging )
- ?? ( gstreamer staging )
osmesa? ( opengl )" #286560
+ #?? ( gstreamer staging ) #Should be fixed by pre/post patchset
# FIXME: the test suite is unsuitable for us; many tests require net access
# or fail due to Xvfb's opengl limitations.
@@ -240,9 +240,9 @@ src_prepare() {
# patch on top.
if use staging; then
PATCHES+=(
-
"${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-pre.patch"
+
"${FILESDIR}/${PN}-1.7.55-gstreamer-v5-staging-pre.patch"
"${WORKDIR}/${GST_P}.patch"
-
"${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-post.patch" )
+
"${FILESDIR}/${PN}-1.7.55-gstreamer-v5-staging-post.patch" )
else
PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
fi
@@ -318,7 +318,7 @@ multilib_src_configure() {
$(use_with oss)
$(use_with pcap)
$(use_with png)
- $(use_with pulseaudio)
+ $(use_with pulseaudio pulse)
$(use_with threads pthread)
$(use_with scanner sane)
$(use_enable test tests)
[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/
commit: 342270aef8b6369f3aad904012cbb82021d585bf Author: NP-Hardass gentoo org> AuthorDate: Tue Jan 19 01:19:59 2016 + Commit: NP Hardass gentoo org> CommitDate: Tue Jan 19 02:03:09 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=342270ae app-emulation/wine: update metadata.xml Package-Manager: portage-2.2.26 app-emulation/wine/metadata.xml | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml index fbf2c5b..6c44031 100644 --- a/app-emulation/wine/metadata.xml +++ b/app-emulation/wine/metadata.xml @@ -18,15 +18,17 @@ Think of Wine as a compatibility layer for running Windows programs. Wine does n Add support for OpenGL in bitmaps using libOSMesa Support packet capture software (e.g. wireshark) Install helpers written in perl (winedump/winemaker) - Apply unofficial Wine-Staging patches for Pipelight/Silverlight support - Run prelink on DLLs during build -- do not disable if you do not know what this means as it can break things at runtime + Apply Wine-Staging patches for Pipelight/Silverlight support + Run prelink on DLLs during build; + For versions less than wine-1.7.55 or hardened, do not disable if you do not know what this means as it can break things at runtime Pull in sys-auth/rtkit for low-latency pulseaudio support Use Wine to open and run .EXE and .MSI files Pull in media-libs/libtxc_dxtn for DXTn texture compression, needed for many games Add support for NTLM auth. see http://wiki.winehq.org/NtlmAuthSetupGuide and http://wiki.winehq.org/NtlmSigningAndSealing - Apply unofficial Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet + Apply Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet + For versions less than wine-1.8, this patchset is unofficial. wine-compholio/wine-staging
[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/
commit: a601a27a9126383ec620daeb0d1600c6595257d7
Author: NP-Hardass gentoo org>
AuthorDate: Tue Jan 19 01:33:31 2016 +
Commit: NP Hardass gentoo org>
CommitDate: Tue Jan 19 02:03:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a601a27a
app-emulation/wine: Update warning for Staging in >=1.8
Package-Manager: portage-2.2.26
app-emulation/wine/wine-1.8.ebuild | 5 ++---
app-emulation/wine/wine-.ebuild | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/app-emulation/wine/wine-1.8.ebuild
b/app-emulation/wine/wine-1.8.ebuild
index e8b401a..4c1b6f4 100644
--- a/app-emulation/wine/wine-1.8.ebuild
+++ b/app-emulation/wine/wine-1.8.ebuild
@@ -248,9 +248,8 @@ src_prepare() {
fi
fi
if use staging; then
- ewarn "Applying the unofficial Wine-Staging patchset which is
unsupported"
- ewarn "by Wine developers. Please don't report bugs to Wine
bugzilla"
- ewarn "unless you can reproduce them with USE=-staging"
+ ewarn "Applying the Wine-Staging patchset. Any bug reports to
the"
+ ewarn "Wine bugzilla should explicitly state that staging was
used."
local STAGING_EXCLUDE=""
use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W
Pipelight"
diff --git a/app-emulation/wine/wine-.ebuild
b/app-emulation/wine/wine-.ebuild
index e8b401a..4c1b6f4 100644
--- a/app-emulation/wine/wine-.ebuild
+++ b/app-emulation/wine/wine-.ebuild
@@ -248,9 +248,8 @@ src_prepare() {
fi
fi
if use staging; then
- ewarn "Applying the unofficial Wine-Staging patchset which is
unsupported"
- ewarn "by Wine developers. Please don't report bugs to Wine
bugzilla"
- ewarn "unless you can reproduce them with USE=-staging"
+ ewarn "Applying the Wine-Staging patchset. Any bug reports to
the"
+ ewarn "Wine bugzilla should explicitly state that staging was
used."
local STAGING_EXCLUDE=""
use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W
Pipelight"
[gentoo-commits] repo/gentoo:master commit in: profiles/default/linux/
commit: 6acdf676a9ab253907be688d363eab3af0bebcd1 Author: NP-Hardass gentoo org> AuthorDate: Tue Jan 19 02:01:50 2016 + Commit: NP Hardass gentoo org> CommitDate: Tue Jan 19 02:03:29 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6acdf676 profiles: reduce app-emulation/wine gstreamer mask to 1.7.54 only profiles/default/linux/package.use.mask | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask index d0c9bf2..d1d9b75 100644 --- a/profiles/default/linux/package.use.mask +++ b/profiles/default/linux/package.use.mask @@ -4,7 +4,7 @@ # NP-Hardass (19 Nov 2015) # Temporarily masking due to user requests in #565884 ->=app-emulation/wine-1.7.54 gstreamer +=app-emulation/wine-1.7.54 gstreamer # Jason Zaman (06 Sep 2015) # This is masked in base/package.use.mask as Linux only.
[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/files/, app-emulation/wine/
commit: 90c74adfd29572e9082a08649bb4f600fcbd38de Author: NP-Hardass gentoo org> AuthorDate: Tue Jan 12 06:08:36 2016 + Commit: NP Hardass gentoo org> CommitDate: Tue Jan 19 02:02:47 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90c74adf app-emulation/wine: Version bump to 1.8, renable gst w/ staging Package-Manager: portage-2.2.25 app-emulation/wine/Manifest| 3 + .../wine-1.7.55-gstreamer-v5-staging-post.patch| 51 +++ .../wine-1.7.55-gstreamer-v5-staging-pre.patch | 53 +++ app-emulation/wine/wine-1.8.ebuild | 439 + 4 files changed, 546 insertions(+) diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest index b3ed6a9..3592040 100644 --- a/app-emulation/wine/Manifest +++ b/app-emulation/wine/Manifest @@ -38,9 +38,11 @@ DIST wine-1.7.51.tar.bz2 22639053 SHA256 397fc95b463d6ae1b65ab0477d9fe5d0871e8e2 DIST wine-1.7.52.tar.bz2 22707539 SHA256 0773b32a0c358323db4c383ceb1e9e28d5d4ed4ea37570af2bcb41fecf0d554b SHA512 834a77553d1352840c747ab5dc3e582b15da4ea65f16f9d58d0cc8afb460b4a0fded859929331dd32d9f4f66ab14bb890cf239d0a283bf9ffd92b48f9d1687de WHIRLPOOL 7e6cc679d994449e7f822c2593d1e8cc87d439df6084ad7d48897f3829b866219a0674e81e1fecdc5629225cd3c6ca2735212e1a0cb9d41a236af4674b62d077 DIST wine-1.7.53.tar.bz2 22763993 SHA256 efba70b106cde683a50a4b1f42df3d900f8ffc291a3689cb897afcc12cc2c6a3 SHA512 82c53c5a7913f5c3ab38239f6cd4dc5ec16db878b8ff9ff46162f11f72c13a3da9c1dc80e7eddef5eb2b909e7b8cd771294cfdc79d734d643aecfeefb0059401 WHIRLPOOL 054640d64794e0eac3b41c359353a8d322f9ae9a9a01969616fe6f9207d4276909d4fa17c7a2b167d705166490df523b3dcaf738efab0a71bfab26ea59eeafe1 DIST wine-1.7.54.tar.bz2 22800326 SHA256 e0f311f392815468df774b33312cde80bf1ff3a894c9c2b462825fd49619bb27 SHA512 15c9c80518d41486da416d531f7be101353d379bcd8fd309395d2932eceabb3fa5cd8180066f73d13c6a211495146bb544a8878657cf9ca8e5e14987a038a6c7 WHIRLPOOL b1f6f3e4149307f8c0b3feb443dd7b36e8a5c81b8b7b41f6c39167590fb13057174c95723f262082465fe1696c17d9216ea93ad2f8ce1e8f5c8d7aadc12d5425 +DIST wine-1.7.55-gstreamer-v5.patch.bz2 5800 SHA256 9ce03b6bc404dec4ed82208dcaa5cbe282c6df7da51392369fcb933de9273c2c SHA512 2f73c44ca66462cc64570645771fd4b3289525393098ef499ba7199745f836c313572145e3f3d259f9f1c6b7c876e15b2f909a914dd1e21eaa79d9671b40f105 WHIRLPOOL 444e456fb82de3b59342eb6d3a28805a3f068e70e6417a16489c784932c486e812807698f29dee5d9715d22bd1e31c733ed649d7396746008a552bc78ee27e55 DIST wine-1.7.55.tar.bz2 22814631 SHA256 a148f6c9cb45a75ef1a15e60a7db9c22fce985e0e58fe1350e7931dfe5d36119 SHA512 f47025017836ce1bbf2ed69c7d7421bd8a2f33ff94ced4a5caf92f4fabdf336119c80a28aeb8ba1ebe0239871a6ac62d8af8435d220c317624c17aabc2100dd7 WHIRLPOOL c5575d2ef687caccbdb5cc09a0c6a4ba9f65ec9674cbe3f23ecfced62710dcb0019a11ff66f2ec4c2eafdb30d9891abad158ac4f865cc580a2878067de7304d7 DIST wine-1.7.8.tar.bz2 21463503 SHA256 30e17f5f863a09416f3d229666566b318dbb40f683d4ca6630012c60bb511804 SHA512 1fdaddb7909f818050854bf351d20f445cf6a5906b1bcc789c96ee8d5058c90815a91bbbc6444f3e4527748764f03ab5297585c174b433093a3354a827402fea WHIRLPOOL 3b5b18384ff04b80b936160c2c6e03676d69663c023f484981305c9272d0601b74cda5c5f7d56008b3900d702b1a4fe1929f16b1fba304a6480b076ffede663a DIST wine-1.7.9.tar.bz2 21323337 SHA256 79f99ecc24696915439c474c4953bb77652ab53f16b41daa4da270fe43279c5a SHA512 29f8aa715ebe47c8a06bd5f6a80cac3fb75b2ca7aa81648cc8aed5461cfd825e4da68b6209ca672dce42b968521cfd9baadd2d85b904b55d99687a1c83d0 WHIRLPOOL 333fee72b2a0e9d6ab8a003712c38166bd27aaff384a2b940c089ecc846f7669c59efbeb5cdc2fc87a46d63b0d29d0335873bb7c22f05913bad430b81990241a +DIST wine-1.8.tar.bz2 22843418 SHA256 f33b45c18112b2071fbf9edee0e8c575407f9e2a9855ca4ee918ed33efa7c6f4 SHA512 34308e82e04dee714fdbd10f29cd6cf6326e5e6e9134f7076e58b09988211065b8c6584881b7e5dcbc9b3906a819ab8a72b612b060cb9aa50b5b67f03bdab089 WHIRLPOOL 335a48f1b34cd1038d62290e52c3189b842d4077b7cf0bcb9d003595992360dc36eac1c592d31db44598de68010f3934daa1f4bcd0a2ca74aa130a39a74f7ce3 DIST wine-gentoo-2013.06.24.tar.bz2 85442 SHA256 bfbf6b25e98f717320de2ede467e3628fbc749d936b8449f8477c9dc6f41e04b SHA512 b6819889314f6a6ea16c1332f4b177c43623116763969c31b23b61754cd304dd085f5d3eafbe847159331eb979b4c10699430129ea4a71da418c1fe175f0 WHIRLPOOL 227e0ac6569736d4ad5813cef49f775dae956f4fc9255de95753d5d3cba1bf6cf3db31d23d3702bb54d2e60c5a6f779b602f0efb2096e4c827c924565b273d00 DIST wine-gentoo-2015.03.07.tar.bz2 85419 SHA256 f13f93dc49bbc33a294c4d511b6e01aec2d38bff77a1e44d07668291add1ab04 SHA512 bae1d2d5575d340d01f44008104f0e5ec0c4a4982995dec37d501594cd21d07a2b4ad4465c4273646d5bf6521996b4b82471097864be75342abe3e7d478a56bd WHIRLPOOL 0f254dd692e87a1f71dd19f6c1c8c59b8a91b994e75912a2e6e3ba5e875b85119fe497a331a95c2ce33bbf5f064143d23ee00275da92c494227de0807c9abb06 DIST wine-mono-0.0.8.msi 46967296 SHA256 3dfc23bbc29015e4e538dab8b83cb825d3248a0e5cf3b3318503ee7331115402 SHA512 d3009f2301b0a006136e880025a736f24612faa7a954
[gentoo-commits] repo/gentoo:master commit in: x11-libs/gtk+/
commit: 1eae3055918c29f8ad8e1a900d2280f5d12b0c37 Author: NP-Hardass gentoo org> AuthorDate: Sat Jan 2 01:11:48 2016 + Commit: NP Hardass gentoo org> CommitDate: Tue Jan 19 02:02:29 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eae3055 x11-libs/gtk+: subslot gtk+:3 The goal of this subslot is to allow other packages to determine what minor version of gtk+:3 is installed so that they can operate accordingly. This functionality is extremely desirable as there are often incompatible changes between gtk+:3 branches. This functionality enables an ebuild to make decisions based on the branch via has_version or best_version queries during phases. The best way to take advantage of this functionality is DEPEND="x11-libs/gtk+:3=" or similar. This has the obvious issue that there is no guarantee that the subslot will be consistent throughout the phases of the ebuild, however, because of the subslot rebuild operator, the package manager should force rebuilding ebuild in question. Package-Manager: portage-2.2.25 x11-libs/gtk+/gtk+-3.16.7.ebuild | 2 +- x11-libs/gtk+/gtk+-3.18.5.ebuild | 2 +- x11-libs/gtk+/gtk+-3.18.6.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/x11-libs/gtk+/gtk+-3.16.7.ebuild b/x11-libs/gtk+/gtk+-3.16.7.ebuild index 3b97f90..946f93f 100644 --- a/x11-libs/gtk+/gtk+-3.16.7.ebuild +++ b/x11-libs/gtk+/gtk+-3.16.7.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Gimp ToolKit +" HOMEPAGE="http://www.gtk.org/"; LICENSE="LGPL-2+" -SLOT="3" +SLOT="3/3.16" IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama" REQUIRED_USE=" || ( aqua wayland X ) diff --git a/x11-libs/gtk+/gtk+-3.18.5.ebuild b/x11-libs/gtk+/gtk+-3.18.5.ebuild index f81b5fd..a4d5f9a 100644 --- a/x11-libs/gtk+/gtk+-3.18.5.ebuild +++ b/x11-libs/gtk+/gtk+-3.18.5.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Gimp ToolKit +" HOMEPAGE="http://www.gtk.org/"; LICENSE="LGPL-2+" -SLOT="3" +SLOT="3/3.18" IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama" REQUIRED_USE=" || ( aqua wayland X ) diff --git a/x11-libs/gtk+/gtk+-3.18.6.ebuild b/x11-libs/gtk+/gtk+-3.18.6.ebuild index 1033f28..8a40c38 100644 --- a/x11-libs/gtk+/gtk+-3.18.6.ebuild +++ b/x11-libs/gtk+/gtk+-3.18.6.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Gimp ToolKit +" HOMEPAGE="http://www.gtk.org/"; LICENSE="LGPL-2+" -SLOT="3" +SLOT="3/3.18" IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama" REQUIRED_USE=" || ( aqua wayland X )
[gentoo-commits] repo/gentoo:master commit in: app-emulation/winetricks/
commit: 33cb81786cdab8ee3795196f806893181cd39160
Author: NP-Hardass gentoo org>
AuthorDate: Tue Jan 12 02:52:36 2016 +
Commit: NP Hardass gentoo org>
CommitDate: Tue Jan 19 02:02:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33cb8178
app-emulation/winetricks: Version bump to 20160109.
Package-Manager: portage-2.2.25
app-emulation/winetricks/Manifest | 2 +-
.../{winetricks-20151116.ebuild => winetricks-20160109.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-emulation/winetricks/Manifest
b/app-emulation/winetricks/Manifest
index efbc594..b78a50d 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -1,2 +1,2 @@
-DIST winetricks-20151116.tar.gz 174763 SHA256
a8947974f47ec575e62717abe591a737d7214557e7ece4c39de079599ba4bf70 SHA512
a769eefcc80725b871791dbec9b869bdfdbbbccf816b943a242ee17f3a35e91efeb440ade590b98ff7f6884d5f9900d195bb386f52907e91b543ce416230
WHIRLPOOL
c15643186c30258d1e590b5a233aea893f071750e4369d1d95b0ff818e077fe0f51415b2e15ff3524429882cd13880aa3a198b3c01ccc5450fe9e68feba39836
+DIST winetricks-20160109.tar.gz 176741 SHA256
6a55db3c1441021bfcb8653b3f0c6eb4260e1ab22fbe98083d28f21470f0ca71 SHA512
41fd0f7bfa2155131d26eb185a584d6e276931f6cc22341847690fa82d3f35e0c9fdeec877a5dc6d4d6092d6a15299e98015be9aaa84677cd5442fbff4fa3891
WHIRLPOOL
f6bfa5596c855a942a1ffebcc6252274c379187a9763c036795b3e431ccdcadb7116e48e23ac3109547d96e5cfa9302c3d99a911190ac0d70b073d355974f95e
DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 SHA256
dded8c294cc5c2e71e4a5d1531ab165178cf3d2d1d890d0656368c2e499bfeb9 SHA512
59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a
WHIRLPOOL
268da9e06712a678fbbcfff8eac1fca364b5e46f0a9c48a591eb88f03260b1a55f203eb2908bfe1f0a534b77c866127ff6f7049b0e43fe8abeaaa26fe55de75b
diff --git a/app-emulation/winetricks/winetricks-20151116.ebuild
b/app-emulation/winetricks/winetricks-20160109.ebuild
similarity index 100%
rename from app-emulation/winetricks/winetricks-20151116.ebuild
rename to app-emulation/winetricks/winetricks-20160109.ebuild
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/hardened-sources/
commit: e8ed10449db72195f6c51980cd862286b6532920
Author: Anthony G. Basile gentoo org>
AuthorDate: Tue Jan 19 00:45:28 2016 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Tue Jan 19 00:45:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8ed1044
sys-kernel/hardened-sources: remove older unstable version
Package-Manager: portage-2.2.26
sys-kernel/hardened-sources/Manifest | 1 -
.../hardened-sources-4.3.3-r5.ebuild | 45 --
2 files changed, 46 deletions(-)
diff --git a/sys-kernel/hardened-sources/Manifest
b/sys-kernel/hardened-sources/Manifest
index 575dee2..bb768a6 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -6,7 +6,6 @@ DIST genpatches-4.1-11.base.tar.xz 233284 SHA256
4189cfd2c7d1a1d7f28c8a596ad3674
DIST genpatches-4.3-4.base.tar.xz 75572 SHA256
c0c073f12a4f1c0adf9d3865fe5d16dc43ea0e5c95c0867868e16e57f2fd6235 SHA512
a16b75f8fcd868d6f9bc2b91318eb8b8ec4db2b622d244e750d4176c4e8225808751c543c54d768fbd88785da656e9f60d8ef8bc22672b5cb1038573c0c366e1
WHIRLPOOL
04c723b71f440035f57684088a47e83430f1c5b057951e037f128f3681f16669eca16f2f1b8d4b7be4a617420131277d1fe415503a679b83a081e06635df46e3
DIST hardened-patches-4.1.7-2.extras.tar.bz2 1419438 SHA256
c8c0fc29c39eafbcea107b8237087fd0e185297e2df9ffeaafc6b3a4736b7a45 SHA512
dac324e265174777d8b9c2369f57e52833b4228b3291e41952a9791ce41b9abf378e1d9a0521566c3a0e42de15a16afa5fe379985b7fee78b1b2b3b815d7cdd4
WHIRLPOOL
7638001f1b95e4af1d051b13648f486aa0eca524157e1a46dd2023fbd86313e0a5e8043653d7388b7286d42cc6e7c0f07cde2de3d5aee6cc058d12538a0980c1
DIST hardened-patches-4.3.3-5.extras.tar.bz2 1649484 SHA256
2a62a5eb4b98f4fbeb43511a0573d58226277d3112401abec37355d85e01ae23 SHA512
09b7272af44fb1e29cba857f7c3305d97f8997881f228a2f2eb56dda909ae5402a69336c6fccdf3920f8788a7922f10b0977517f5918d44702e1a9b668c708c7
WHIRLPOOL
efc152c7680b84b682f9f6857b8c6b2b66b6d505f76b311a8e3289a606f46d4944d90478ff93e3656f41c367fdbcd65dcf3043842354b26b669b462ce49f3471
-DIST hardened-patches-4.3.3-6.extras.tar.bz2 1663066 SHA256
48b3fdbb5ea5df2f309f3496e7d45f1fd108101009dfc4121e898fd58a9c1eda SHA512
48784e1e198687e16234df4745e59e2d3aff557cf5b9686f5c8f3462b7a9c7b11999da9929150cc4a43f605ccd69921719fe2b1c9596915eccbe40489f1ff3a6
WHIRLPOOL
742c9ff8f7b847c2b97a422f253285d27b84568f3b75a1e23db1ecce4806824a42f7865634c306d3044eedd5b1b64957774c31446031501f5f4209fbd41a56c9
DIST hardened-patches-4.3.3-7.extras.tar.bz2 1664242 SHA256
81c0ec97c76de1bbfbb57ff4236782c6830c1b0e0c4f3ee06859c71c2efb1fe7 SHA512
654f6580b973b8f4a44d49c71ed1aa72ac7e5e79ebf93ab06597caa9533bfc81d979fdae4c0958f0aa404855e36fffefcb7792600b8ba0dbb252f146e2bbe227
WHIRLPOOL
d4ec2c44544552a3fcf2c224c3ae336841afd9f7afd233f252c17feb675ac7e80a35b70939ed2bf2b5b37acb0fdb685cb028b521d093e41a552f8dca22cd05e0
DIST linux-4.1.tar.xz 83017828 SHA256
caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512
168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0
WHIRLPOOL
85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
DIST linux-4.3.tar.xz 86920812 SHA256
4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae SHA512
d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc
WHIRLPOOL
e3f131443acc14d4f67bbd3f4e1c57af3d822c41c85a112564d54667a591c8619dce42327fd8166d30a2d7adfaf433c2e2134d4995c91c08f65ac0cc2190f935
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.3.3-r5.ebuild
b/sys-kernel/hardened-sources/hardened-sources-4.3.3-r5.ebuild
deleted file mode 100644
index 5b3ca75..000
--- a/sys-kernel/hardened-sources/hardened-sources-4.3.3-r5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="4"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-6"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2";
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="
- 1500_XATTR_USER_PREFIX.patch
- 2900_dev-root-proc-mount-fix.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/";
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
- kernel-2_pkg_postinst
-
- local GRADM_COMPAT="sys-apps/gradm-3.1*"
-
- ewarn
- ewarn "Users of grsecurity
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/hardened-sources/
commit: cee49a6dee8dd532fb3389c57a149a0864d6c694
Author: Anthony G. Basile gentoo org>
AuthorDate: Tue Jan 19 00:43:37 2016 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Tue Jan 19 00:44:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cee49a6d
sys-kernel/hardened-sources: version bump to 4.3.3-r5
vanilla-4.3.3 + genpatches-4.3-4 + grsecurity-3.1-4.3.3-201601171913
Package-Manager: portage-2.2.26
sys-kernel/hardened-sources/Manifest | 1 +
.../hardened-sources-4.3.3-r6.ebuild | 45 ++
2 files changed, 46 insertions(+)
diff --git a/sys-kernel/hardened-sources/Manifest
b/sys-kernel/hardened-sources/Manifest
index ada8ea8..575dee2 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -7,5 +7,6 @@ DIST genpatches-4.3-4.base.tar.xz 75572 SHA256
c0c073f12a4f1c0adf9d3865fe5d16dc4
DIST hardened-patches-4.1.7-2.extras.tar.bz2 1419438 SHA256
c8c0fc29c39eafbcea107b8237087fd0e185297e2df9ffeaafc6b3a4736b7a45 SHA512
dac324e265174777d8b9c2369f57e52833b4228b3291e41952a9791ce41b9abf378e1d9a0521566c3a0e42de15a16afa5fe379985b7fee78b1b2b3b815d7cdd4
WHIRLPOOL
7638001f1b95e4af1d051b13648f486aa0eca524157e1a46dd2023fbd86313e0a5e8043653d7388b7286d42cc6e7c0f07cde2de3d5aee6cc058d12538a0980c1
DIST hardened-patches-4.3.3-5.extras.tar.bz2 1649484 SHA256
2a62a5eb4b98f4fbeb43511a0573d58226277d3112401abec37355d85e01ae23 SHA512
09b7272af44fb1e29cba857f7c3305d97f8997881f228a2f2eb56dda909ae5402a69336c6fccdf3920f8788a7922f10b0977517f5918d44702e1a9b668c708c7
WHIRLPOOL
efc152c7680b84b682f9f6857b8c6b2b66b6d505f76b311a8e3289a606f46d4944d90478ff93e3656f41c367fdbcd65dcf3043842354b26b669b462ce49f3471
DIST hardened-patches-4.3.3-6.extras.tar.bz2 1663066 SHA256
48b3fdbb5ea5df2f309f3496e7d45f1fd108101009dfc4121e898fd58a9c1eda SHA512
48784e1e198687e16234df4745e59e2d3aff557cf5b9686f5c8f3462b7a9c7b11999da9929150cc4a43f605ccd69921719fe2b1c9596915eccbe40489f1ff3a6
WHIRLPOOL
742c9ff8f7b847c2b97a422f253285d27b84568f3b75a1e23db1ecce4806824a42f7865634c306d3044eedd5b1b64957774c31446031501f5f4209fbd41a56c9
+DIST hardened-patches-4.3.3-7.extras.tar.bz2 1664242 SHA256
81c0ec97c76de1bbfbb57ff4236782c6830c1b0e0c4f3ee06859c71c2efb1fe7 SHA512
654f6580b973b8f4a44d49c71ed1aa72ac7e5e79ebf93ab06597caa9533bfc81d979fdae4c0958f0aa404855e36fffefcb7792600b8ba0dbb252f146e2bbe227
WHIRLPOOL
d4ec2c44544552a3fcf2c224c3ae336841afd9f7afd233f252c17feb675ac7e80a35b70939ed2bf2b5b37acb0fdb685cb028b521d093e41a552f8dca22cd05e0
DIST linux-4.1.tar.xz 83017828 SHA256
caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512
168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0
WHIRLPOOL
85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
DIST linux-4.3.tar.xz 86920812 SHA256
4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae SHA512
d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc
WHIRLPOOL
e3f131443acc14d4f67bbd3f4e1c57af3d822c41c85a112564d54667a591c8619dce42327fd8166d30a2d7adfaf433c2e2134d4995c91c08f65ac0cc2190f935
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.3.3-r6.ebuild
b/sys-kernel/hardened-sources/hardened-sources-4.3.3-r6.ebuild
new file mode 100644
index 000..7e3daf3
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-4.3.3-r6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="4"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-7"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2";
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="
+ 1500_XATTR_USER_PREFIX.patch
+ 2900_dev-root-proc-mount-fix.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/";
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=sys-devel/gcc-4.5"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+
+ local GRADM_COMPAT="sys-apps/gradm-3.1*"
+
+ ewarn
+ ewarn "Users of grsecurity's RBAC system must ensure they are using"
+ ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+ ewarn "It is strongly recommended that the following command is issued"
+ ewarn "prior to booting a ${PF} kernel for the first time:"
+ ewarn
+ ewarn "emerge -na =${GRADM_COMPAT}"
+ ewarn
+}
[gentoo-commits] proj/hardened-patchset: New tag: 20160117
commit: Commit: Anthony G. Basile gentoo org> CommitDate: Tue Jan 19 00:13:52 2016 + New tag: 20160117
[gentoo-commits] proj/hardened-patchset:master commit in: 4.3.3/
commit: 5aca1e28bedeb8f51a52cfc922e0749f75809504
Author: Anthony G. Basile gentoo org>
AuthorDate: Tue Jan 19 00:20:58 2016 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Tue Jan 19 00:20:58 2016 +
URL:
https://gitweb.gentoo.org/proj/hardened-patchset.git/commit/?id=5aca1e28
grsecurity-3.1-4.3.3-201601171913
4.3.3/_README | 2 +-
...> 4420_grsecurity-3.1-4.3.3-201601171913.patch} | 211 +
2 files changed, 135 insertions(+), 78 deletions(-)
diff --git a/4.3.3/_README b/4.3.3/_README
index 8ff755f..737c59b 100644
--- a/4.3.3/_README
+++ b/4.3.3/_README
@@ -2,7 +2,7 @@ README
-
Individual Patch Descriptions:
-
-Patch: 4420_grsecurity-3.1-4.3.3-201601161757.patch
+Patch: 4420_grsecurity-3.1-4.3.3-201601171913.patch
From: http://www.grsecurity.net
Desc: hardened-sources base patch from upstream grsecurity
diff --git a/4.3.3/4420_grsecurity-3.1-4.3.3-201601161757.patch
b/4.3.3/4420_grsecurity-3.1-4.3.3-201601171913.patch
similarity index 99%
rename from 4.3.3/4420_grsecurity-3.1-4.3.3-201601161757.patch
rename to 4.3.3/4420_grsecurity-3.1-4.3.3-201601171913.patch
index 15482a1..c47605c 100644
--- a/4.3.3/4420_grsecurity-3.1-4.3.3-201601161757.patch
+++ b/4.3.3/4420_grsecurity-3.1-4.3.3-201601171913.patch
@@ -42417,24 +42417,58 @@ index 6068d82..7ecd87c 100644
static const struct vga_switcheroo_client_ops amdgpu_switcheroo_ops = {
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
-index b190c2a..d1b18c2 100644
+index b190c2a..67a7707 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
-@@ -544,8 +544,12 @@ static int __init amdgpu_init(void)
+@@ -471,7 +471,7 @@ static struct drm_driver kms_driver = {
+ .driver_features =
+ DRIVER_USE_AGP |
+ DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM |
+- DRIVER_PRIME | DRIVER_RENDER,
++ DRIVER_PRIME | DRIVER_RENDER | DRIVER_MODESET,
+ .dev_priv_size = 0,
+ .load = amdgpu_driver_load_kms,
+ .open = amdgpu_driver_open_kms,
+@@ -522,9 +522,6 @@ static struct drm_driver kms_driver = {
+ .patchlevel = KMS_DRIVER_PATCHLEVEL,
+ };
+
+-static struct drm_driver *driver;
+-static struct pci_driver *pdriver;
+-
+ static struct pci_driver amdgpu_kms_pci_driver = {
+ .name = DRIVER_NAME,
+ .id_table = pciidlist,
+@@ -542,22 +539,23 @@ static int __init amdgpu_init(void)
+ }
+ #endif
DRM_INFO("amdgpu kernel modesetting enabled.\n");
- driver = &kms_driver;
- pdriver = &amdgpu_kms_pci_driver;
+- driver = &kms_driver;
+- pdriver = &amdgpu_kms_pci_driver;
- driver->driver_features |= DRIVER_MODESET;
- driver->num_ioctls = amdgpu_max_kms_ioctl;
+
+ pax_open_kernel();
-+ *(u32 *)&driver->driver_features |= DRIVER_MODESET;
-+ *(int *)&driver->num_ioctls = amdgpu_max_kms_ioctl;
++ *(int *)&kms_driver.num_ioctls = amdgpu_max_kms_ioctl;
+ pax_close_kernel();
+
amdgpu_register_atpx_handler();
amdgpu_amdkfd_init();
+
+ /* let modprobe override vga console setting */
+- return drm_pci_init(driver, pdriver);
++ return drm_pci_init(&kms_driver, &amdgpu_kms_pci_driver);
+ }
+
+ static void __exit amdgpu_exit(void)
+ {
+ amdgpu_amdkfd_fini();
+- drm_pci_exit(driver, pdriver);
++ drm_pci_exit(&kms_driver, &amdgpu_kms_pci_driver);
+ amdgpu_unregister_atpx_handler();
+ }
+
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 5d11e79..04cc53e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -43160,7 +43194,7 @@ index d93e737..edb8a4a 100644
int retcode = -EINVAL;
char stack_kdata[128];
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
-index 1b1bd42..0e49027 100644
+index 1b1bd42..2d28e80 100644
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -305,7 +305,7 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct
pci_device_id *ent,
@@ -43172,16 +43206,19 @@ index 1b1bd42..0e49027 100644
return 0;
-@@ -340,7 +340,7 @@ int drm_pci_init(struct drm_driver *driver, struct
pci_driver *pdriver)
+@@ -340,7 +340,10 @@ int drm_pci_init(struct drm_driver *driver, struct
pci_driver *pdriver)
return pci_register_driver(pdriver);
/* If not using KMS, fall back to stealth mode manual scanning. */
- INIT_LIST_HEAD(&driver->legacy_dev_list);
++ pax_open_kernel();
+ INIT_LIST_HEAD((struct list_head *)&driver->legacy_dev_list);
++ pax_close_kernel();
++
for (i = 0; pdriver->id_table[i].vendor != 0; i++) {
pid = &pdriver->id_table[i];
[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/, app-backup/backuppc/files/
commit: b3ff61af65df489d597ae5e3d9d765500e5e5eaf
Author: Michael Orlitzky gentoo org>
AuthorDate: Mon Jan 18 23:58:30 2016 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Tue Jan 19 00:02:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3ff61af
app-backup/backuppc: add version 3.3.1 (masked) with apache-2.4 support.
This new version adds apache-2.4 support to backuppc, but at the cost
of requiring www-apache/mpm_itk and a new mod_perl supporting
apache-2.4. The former is available and less onerous than the current
requirement of a separate web server. However, the only mod_perl
supporting apache-2.4 at the moment is masked, so the new version of
backuppc is masked as well.
The configuration for the new version should be more familiar to
users: it is enabled by passing -D BACKUPPC to apache2.
Gentoo-Bug: 532718
Gentoo-Bug: 541312
Package-Manager: portage-2.2.26
app-backup/backuppc/Manifest | 1 +
app-backup/backuppc/backuppc-3.3.1.ebuild | 194 +
app-backup/backuppc/files/99_backuppc.conf | 32 +
3 files changed, 227 insertions(+)
diff --git a/app-backup/backuppc/Manifest b/app-backup/backuppc/Manifest
index cee7799..07d6999 100644
--- a/app-backup/backuppc/Manifest
+++ b/app-backup/backuppc/Manifest
@@ -1 +1,2 @@
DIST BackupPC-3.3.0.tar.gz 554155 SHA256
8a9c1b6faa4502b4c40617be97e806813815d9e22544854d99983c3da7c1f69b SHA512
67ec1ca4d22ab1e81f9c0f409c758347a6c772e3d1aa39c93207f9d328176ac7b4e679d0b03972fc5870c37dde0480d28c61ae19975d54e144235ea0e84e9901
WHIRLPOOL
23a9ce5dd600843cea72354e1afe595e3779f883839f8d3feca7f1355ed20048026090097ddfbcf394632672b42bef4884bc6661203542d6fe2c6bc2e8ad7b96
+DIST BackupPC-3.3.1.tar.gz 556461 SHA256
c9cc4aec28a7474a68d40f4bc460ff15140e05c96900c7f98ff3ef06c4f6ae4c SHA512
b6bb9de3103c5062098d80755055b7461ae9133a4a46a66b3d0af89d081086571694db1898e7d85880defa15b030bad522812116ae5361c0fbde90b877d139c6
WHIRLPOOL
1d895f530932fc1287cde9db584befc6ca0850b5841cc4e60927442d0db662ec092bda4efa4953650d3bfa13deb6e9fafa25c10f82e19b39c67969bb4e143bac
diff --git a/app-backup/backuppc/backuppc-3.3.1.ebuild
b/app-backup/backuppc/backuppc-3.3.1.ebuild
new file mode 100644
index 000..f7c0711
--- /dev/null
+++ b/app-backup/backuppc/backuppc-3.3.1.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit depend.apache eutils user
+
+MY_P="BackupPC-${PV}"
+
+DESCRIPTION="High-performance backups to a server's disk"
+HOMEPAGE="http://backuppc.sourceforge.net/";
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="rss samba"
+
+# The CGI modules are handled in $RDEPEND.
+APACHE_MODULES="apache2_modules_alias," # RedirectMatch
+APACHE_MODULES+="apache2_modules_authn_core," # AuthType
+APACHE_MODULES+="apache2_modules_authz_core," # Require
+APACHE_MODULES+="apache2_modules_authz_host," # Require host
+APACHE_MODULES+="apache2_modules_authz_user" # Require valid-user
+
+DEPEND="dev-lang/perl
+ app-admin/apache-tools
+ app-admin/makepasswd"
+
+# Older versions of mod_perl think they're compatibile with apache-2.4,
+# so we require the new one explicitly.
+RDEPEND="${DEPEND}
+ virtual/perl-IO-Compress
+ dev-perl/Archive-Zip
+ dev-perl/libwww-perl
+ app-arch/tar
+ app-arch/par2cmdline
+ app-arch/gzip
+ app-arch/bzip2
+ virtual/mta
+ >=www-apache/mod_perl-2.0.9
+ www-apache/mpm_itk
+ || ( >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgi]
+
>=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgid]
+
>=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_fcgid] )
+ net-misc/rsync
+ dev-perl/File-RsyncP
+ rss? ( dev-perl/XML-RSS )
+ samba? ( net-fs/samba )"
+
+need_apache2_4
+
+SLOT="0"
+
+S="${WORKDIR}/${MY_P}"
+
+CGIDIR="/usr/lib/backuppc/htdocs"
+CONFDIR="/etc/BackupPC"
+DATADIR="/var/lib/backuppc"
+DOCDIR="/usr/share/doc/${PF}"
+LOGDIR="/var/log/BackupPC"
+
+pkg_setup() {
+ enewgroup backuppc
+ enewuser backuppc -1 /bin/bash /var/lib/backuppc backuppc
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/3.3.0/01-fix-configure.pl.patch"
+ epatch "${FILESDIR}/3.3.0/02-fix-config.pl-formatting.patch"
+ epatch "${FILESDIR}/3.3.0/03-reasonable-config.pl-defaults.patch"
+
+ epatch "${FILESDIR}/3.2.0/04-add-docdir-marker.patch"
+ epatch "${FILESDIR}/3.2.0/05-nicelevel.patch"
+
+ # Fix docs location using the marker that we've patched in.
+ sed -i "s+__DOCDIR__+${DOCDIR}+" "lib/BackupPC/CGI/View.pm" \
+ || die "failed to sed the documentation location"
+}
+
+src_install() {
+ local myconf
+ myconf=""
+ if use samba ; then
+ myconf="--bin-path smbclient=$(type -p smbclient)"
+ myco
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: 774b6be619d13ddd7ec789f35e8e43c71058cd3e Author: Michael Orlitzky gentoo org> AuthorDate: Mon Jan 18 23:50:20 2016 + Commit: Michael Orlitzky gentoo org> CommitDate: Tue Jan 19 00:02:15 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=774b6be6 profiles: mask the forthcoming app-backup/backuppc-3.3.1. The next version of app-backup/backuppc will require a mod_perl supporting apache-2.4, but the only such version in the tree at the moment (2.0.10_pre201601) is masked. So mask the new backuppc, too. Gentoo-Bug: 512504 Gentoo-Bug: 532718 Gentoo-Bug: 541312 Gentoo-Bug: 562454 profiles/package.mask | 6 ++ 1 file changed, 6 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index e547b2d..50ee140 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -30,6 +30,12 @@ #--- END OF EXAMPLES --- +# Michael Orlitzky (18 Jan 2016) +# Depends on a masked version of mod_perl. Feel free +# to unmask as soon as mod_perl supports apache-2.4. +# Bugs #512504, #532718, #541312,and #562454. +=app-backup/backuppc-3.3.1 + # Mike Frysinger (18 Jan 2016) # Force people to migrate to the new combined libraries: # media-libs/elementary & dev-libs/efl. #571796
[gentoo-commits] repo/user/bleeding-edge:master commit in: x11-drivers/ati-drivers/files/, x11-misc/pcmanfm/, x11-drivers/ati-drivers/, ...
commit: 8116b9ec3a9b110c737ee38bb8fa4c4afa29c985
Author: Jan Psota gmail com>
AuthorDate: Mon Jan 18 23:26:32 2016 +
Commit: Jan Psota gmail com>
CommitDate: Mon Jan 18 23:26:32 2016 +
URL:
https://gitweb.gentoo.org/repo/user/bleeding-edge.git/commit/?id=8116b9ec
pcmanfm using gtk3 from git, ati-drivers removed (15.12 in tree)
x11-drivers/ati-drivers/Manifest | 2 -
x11-drivers/ati-drivers/ati-drivers-15.11.ebuild | 636 -
.../files/15.11-remove-gpl-symbols.patch | 48 --
x11-drivers/ati-drivers/files/15.9-kcl_str.patch | 14 -
x11-drivers/ati-drivers/files/15.9-mtrr.patch | 27 -
x11-drivers/ati-drivers/files/15.9-preempt.patch | 103
.../files/15.9-remove-gpl-symbols.patch| 74 ---
.../ati-drivers/files/15.9-sep_printf.patch| 11 -
...ivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch | 27 -
.../ati-drivers-13.8-beta-include-seq_file.patch | 13 -
.../ati-drivers-x32_something_something.patch | 13 -
.../files/ati-powermode-opt-path-3.patch | 40 --
x11-drivers/ati-drivers/files/atieventsd.init | 20 -
x11-drivers/ati-drivers/files/atieventsd.service | 9 -
.../ati-drivers/files/const-notifier-block.patch | 25 -
.../files/fgl_glxgears-do-not-include-glATI.patch | 11 -
x11-drivers/ati-drivers/files/switchlibGL | 61 --
x11-libs/libfm/libfm-1.2.3-r2.ebuild | 12 +-
.../{libfm-1.2.3-r2.ebuild => libfm-.ebuild} | 23 +-
x11-misc/pcmanfm/pcmanfm-1.2.3-r2.ebuild | 13 +-
...pcmanfm-1.2.3-r2.ebuild => pcmanfm-.ebuild} | 28 +-
21 files changed, 37 insertions(+), 1173 deletions(-)
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
deleted file mode 100644
index edc7694..000
--- a/x11-drivers/ati-drivers/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST radeon-crimson-15.11-15.30.1025.zip 185334292 SHA256
5e3aeb28d2c25a4682a6ff8b9611c0c4a6b55c11e264515fa3963d58b8f10ba6 SHA512
12f81bf8c4dc96ff60830da6f84a585be033105a9bedd83672f8a3bddf906c4ead44239b0bf7ebf1da5c5b6e8f5516f2f1cdee8947173fbe8e527300f97d547b
WHIRLPOOL
c58dc438e5addf0bdae8b159b5afd1af18e6e547c7d81f436b5927fb69fd8d79449f31159bcd8ca75a2e95603bd3920fba12c053cd1a7bd6574bf99d2a2e99a9
-DIST xvba-sdk-0.74-404001.tar.gz 583847 SHA256
731a2c489f2fb5d7318c1976061b26c1057a696f46d09dcf55fbada97fed17eb SHA512
aa1dd52b59eeeabd026d8b76e3b75eaf02587ef286438ba28884afeef5a5efaf50283b5ee4f5b81b12cf79cb4ec77c9a235a886b29fb7cdf850c9779f4b07b35
WHIRLPOOL
69917b746d353a884512e97b9d9a9b89e6f51add3119e69ddd119d51c0c3f2820b93a449fe42bd76d671dc505f92bf25b7f2c5868b33768fc68a19596e460951
diff --git a/x11-drivers/ati-drivers/ati-drivers-15.11.ebuild
b/x11-drivers/ati-drivers/ati-drivers-15.11.ebuild
deleted file mode 100644
index 17406f7..000
--- a/x11-drivers/ati-drivers/ati-drivers-15.11.ebuild
+++ /dev/null
@@ -1,636 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit eutils multilib-build linux-info linux-mod systemd toolchain-funcs
versionator pax-utils
-
-DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and
newer chipsets"
-HOMEPAGE="http://www.amd.com";
-BUILD_VER=15.30.1025
-RUN="${WORKDIR}/fglrx-${BUILD_VER}/amd-driver-installer-${BUILD_VER}-x86.x86_64.run"
-SLOT="1"
-# Uses javascript for download YE
-#DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip";
-#DRV_VER="amd-catalyst-${PV}-linux-installer-15.201.1151-x86.x86_64.zip"
-DRV_VER="radeon-crimson-${PV}-${BUILD_VER}.zip"
-DRIVERS_URI="mirror://gentoo/${DRV_VER}"
-SDK_VER="xvba-sdk-0.74-404001.tar.gz"
-XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/${SDK_VER}";
-SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
-FOLDER_PREFIX="common/"
-IUSE="debug +modules qt4 static-libs pax_kernel gdm-hack"
-
-LICENSE="AMD GPL-2 QPL-1.0"
-KEYWORDS="-* ~amd64 ~x86"
-
-RESTRICT="bindist test fetch"
-
-RDEPEND="
- <=x11-base/xorg-server-1.17.49[-minimal]
- >=app-eselect/eselect-opengl-1.0.7
- app-eselect/eselect-opencl
- sys-power/acpid
- x11-apps/xauth
- !x11-libs/xvba-video
- virtual/glu[${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXinerama[${MULTILIB_USEDEP}]
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-libs/libXrender[${MULTILIB_USEDEP}]
- qt4? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXcursor
- x11-libs/libXfixes
- x11-libs/libXxf86vm
- dev-qt/qtcore:4
- dev-qt/qtgui:4[accessibility]
- )
- gdm-hack? (
- x11-base/xorg-server:=
- )
-"
-if [[ legacy
[gentoo-commits] proj/gkey-seeds:master commit in: /
commit: 26ff67eb40575e6716878cda4e76fe0a0bb5bbf6
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jan 18 23:17:24 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 23:17:24 2016 +
URL:https://gitweb.gentoo.org/proj/gkey-seeds.git/commit/?id=26ff67eb
Gentoo-keys: Update gentoo-devs.seeds
gentoo-devs.seeds | 4 ++--
gentoo-devs.seeds.sig | Bin 639 -> 639 bytes
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gentoo-devs.seeds b/gentoo-devs.seeds
index c7afac9..37d7f3b 100644
--- a/gentoo-devs.seeds
+++ b/gentoo-devs.seeds
@@ -3229,11 +3229,11 @@
},
"wschlich": {
"fingerprint": [
-"460E9001E33F6C60D88315CEB75E6F9EC1A30268"
+"FB06C39C8980A5CFB303004F5A72119F5748FC30"
],
"keydir": "wschlich",
"keys": [
-"460E9001E33F6C60D88315CEB75E6F9EC1A30268"
+"FB06C39C8980A5CFB303004F5A72119F5748FC30"
],
"name": "Wolfram Schlich",
"nick": "wschlich",
diff --git a/gentoo-devs.seeds.sig b/gentoo-devs.seeds.sig
index 7f2635a..df71021 100644
Binary files a/gentoo-devs.seeds.sig and b/gentoo-devs.seeds.sig differ
[gentoo-commits] data/api:master commit in: files/gentoo-keys/seeds/
commit: 4f0573be8e61e1852f476e7a582d90f787af58c9
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jan 18 23:17:29 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 23:17:29 2016 +
URL:https://gitweb.gentoo.org/data/api.git/commit/?id=4f0573be
Gentoo-keys: Update gentoo-devs.seeds
files/gentoo-keys/seeds/gentoo-devs.seeds | 4 ++--
files/gentoo-keys/seeds/gentoo-devs.seeds.sig | Bin 639 -> 639 bytes
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/files/gentoo-keys/seeds/gentoo-devs.seeds
b/files/gentoo-keys/seeds/gentoo-devs.seeds
index c7afac9..37d7f3b 100644
--- a/files/gentoo-keys/seeds/gentoo-devs.seeds
+++ b/files/gentoo-keys/seeds/gentoo-devs.seeds
@@ -3229,11 +3229,11 @@
},
"wschlich": {
"fingerprint": [
-"460E9001E33F6C60D88315CEB75E6F9EC1A30268"
+"FB06C39C8980A5CFB303004F5A72119F5748FC30"
],
"keydir": "wschlich",
"keys": [
-"460E9001E33F6C60D88315CEB75E6F9EC1A30268"
+"FB06C39C8980A5CFB303004F5A72119F5748FC30"
],
"name": "Wolfram Schlich",
"nick": "wschlich",
diff --git a/files/gentoo-keys/seeds/gentoo-devs.seeds.sig
b/files/gentoo-keys/seeds/gentoo-devs.seeds.sig
index 7f2635a..df71021 100644
Binary files a/files/gentoo-keys/seeds/gentoo-devs.seeds.sig and
b/files/gentoo-keys/seeds/gentoo-devs.seeds.sig differ
[gentoo-commits] proj/portage: New tag: v2.2.27
commit: Commit: Brian Dolbec gentoo org> CommitDate: Mon Jan 18 23:11:48 2016 + New tag: v2.2.27
[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/
commit: 43166a90f40ca486d4dd162878e57125f38761a0 Author: Brian Dolbec gentoo org> AuthorDate: Mon Jan 18 19:10:32 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Mon Jan 18 23:09:49 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43166a90 sys-apps/portage: Version bump for new release Remove old unstable versions. Fixes bugs 5632224, 566024, 561686, 567920, 567746, 568354, 567360, 568054, 568934, 569942, 486362, 562652, 570530, 570672, 570798. Package-Manager: portage-2.2.27 sys-apps/portage/Manifest | 3 +- sys-apps/portage/portage-2.2.25.ebuild | 362 - ...portage-2.2.23.ebuild => portage-2.2.27.ebuild} | 6 +- 3 files changed, 6 insertions(+), 365 deletions(-) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 5e6f760..e2b02ef 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,6 +1,5 @@ DIST portage-2.2.20.1.tar.bz2 950298 SHA256 84dd3ed1d9fd0a3336e956d057590c75834a906ae62a450411232fe5a842475c SHA512 5f7373da20d448059e8fdc8a3593eaca780be3184f0494bac66f5eea7c33d00dd61b9e74cbe9a52413f08cef29d426ed8751e20e16be09178468c18d77a6ae2e WHIRLPOOL 99643ce0ab74c5df64fb5239948c6102bc39847ff88eaf210c069c0c9587c1e8bdd1a032a7e61c1225b6113645387861d439e9c4f103df4d0f042b73e1afc328 -DIST portage-2.2.23.tar.bz2 960229 SHA256 9aecc9f4c813810f99f6604a9806e268b162d90243a9769f1410b3a96822cdfb SHA512 17b8fe4967719bacd8f3ca324bde3328d82f5b7748a05b66cca165dcc8a4abbaf7e05ec61a54684cd1b001297dc0adc04c3771d0fd3cc4732f17ac9e0810e6ad WHIRLPOOL da7229c2be8330e898ef1e422a62683a003c16a640fee9d183c8afc8474779d302c0de639072099c8d47372fa0c74e2a635c485d8c7ed2b2344cacc857199578 DIST portage-2.2.24.tar.bz2 972610 SHA256 c2dbd53dd474c6fe455ffa5920514a6afe467abf02959c33ddb7a7e363939550 SHA512 9dc00410de604db66843bdf62cf0ee7e93ff2c4d562390172c4f0c55ab98b2712078b0eb02c9f35d52633b0fff0b024736e25a1c66cf40ad61a6bf99a7cee4a6 WHIRLPOOL 3227c61662acf69abd843344d0fb1b7cc2cfa91c1bae48b08e1da8fdf42cda15834994852d42dfc089f189e318c657e12fd6b1c19885279e0bb5cfd2349235f8 -DIST portage-2.2.25.tar.bz2 961095 SHA256 834d1b1f3c6bc022b3608a826f940b5a43bfb13dd76377d237b001ec9cbad109 SHA512 9d64b2c7c48f38d48becf9961c5e7cdfc5428da59359b14cd37a3617f1db144258e8ba57d81fc64dc50e0aea755319ae08bd7ba6515c549c31096609fbd55d7c WHIRLPOOL 092d192d757e09e209c4fab529b3fe3786b5d639e2573dc36ad4dbd8fe365c8af32c24b05b289157cafe8d29c5a88f23323071d61a303d4a5c08f2b812547376 DIST portage-2.2.26.tar.bz2 977277 SHA256 7f57aa704c58ea47f031f177203dc7b335e01e7ec1e809437ea9e46e3f9263e5 SHA512 fd1a5e5d028d52ba82bbeb7f87bf331d0c1d8c7f5a3bd450c668dd742e99185b6d2b21944f5d7788fe941c99736744b08157ca30145f0964ea60a7c2c435d601 WHIRLPOOL 0469f4c5609146c57eae4baeb8488b95c04f336a5511460ee44d15746339fd43a7c2d61b58528845d77a6a0b21e46c2afad19a9f05e94ac8dc6180032d71f298 +DIST portage-2.2.27.tar.bz2 977125 SHA256 3126b59456d2f0a1c9b2c03df15154b2fb29e462abbbe1b8898fa7bc291421af SHA512 8f16a7c9ce33bd34d60f0b06d3e4e0bd4e2c27e6bdc0756e6d3b59108b5438e92f5ca9e981bbfe4ebe9b64f1afe9442d72c52c02fe456e0d36daffae6f77d694 WHIRLPOOL e467c6d9e4e1c177667389a4ce134fabc8676ff5baf9403d73de241086c7d5bab4d11bfe84be749cf9f9781cadc1dd8d173e03e9fba4c926e24131c261a28d1e DIST portage-2.2.8.tar.bz2 874672 SHA256 c1074e01173df5384e003598dbc5f64f09e92f83fd26faab2f88f9f0bc64aa7e SHA512 acc47d94ff8c08e5a7bf2d4c4e600863430dd1e7d0bb8b4254d6477a498933cae663db84debf9487d2243c2cba689629ef8e8b6cf108e10d40e89e8e8d7e1257 WHIRLPOOL d54290ede8d3d85e5211cda7e86ed740178121ef2f47cf0858c27941d8679d29c11445befff962986d40a47ded50d0d4654de19e7d4aef3fdf2546655a0d6fe2 diff --git a/sys-apps/portage/portage-2.2.25.ebuild b/sys-apps/portage/portage-2.2.25.ebuild deleted file mode 100644 index c310cb5..000 --- a/sys-apps/portage/portage-2.2.25.ebuild +++ /dev/null @@ -1,362 +0,0 @@ -# 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 python3_5 - python2_7 -) -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_gen_impl_dep 'ssl(+)') ) - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/sed-4.0.5 sys-devel/patch - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) - epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" -# Require sandbox-2.2 for bug #288863. -# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's -# quite slow, so it's not considered in the
[gentoo-commits] repo/gentoo:master commit in: dev-perl/GDGraph/
commit: 6151dde485dd1cae5357b50ff4de55d73c994ea9
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Mon Jan 18 22:54:36 2016 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Mon Jan 18 22:54:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6151dde4
dev-perl/GDGraph: Version bump
Package-Manager: portage-2.2.26
dev-perl/GDGraph/GDGraph-1.510.0.ebuild | 29 +
dev-perl/GDGraph/Manifest | 1 +
2 files changed, 30 insertions(+)
diff --git a/dev-perl/GDGraph/GDGraph-1.510.0.ebuild
b/dev-perl/GDGraph/GDGraph-1.510.0.ebuild
new file mode 100644
index 000..58130b1
--- /dev/null
+++ b/dev-perl/GDGraph/GDGraph-1.510.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=RUZ
+DIST_VERSION=1.51
+inherit perl-module
+
+DESCRIPTION="Perl5 module to create charts using the GD module"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+ >=dev-perl/GD-1.180.0
+ >=dev-perl/GDTextUtil-0.800.0
+ media-libs/gd
+"
+DEPEND="${RDEPEND}
+ >=virtual/perl-ExtUtils-MakeMaker-6.640.0
+ test? (
+ >=dev-perl/Capture-Tiny-0.300.0
+ >=dev-perl/Test-Exception-0.400.0
+ >=virtual/perl-Test-Simple-0.880.0
+ )
+"
diff --git a/dev-perl/GDGraph/Manifest b/dev-perl/GDGraph/Manifest
index 50cd015..524938f 100644
--- a/dev-perl/GDGraph/Manifest
+++ b/dev-perl/GDGraph/Manifest
@@ -1,2 +1,3 @@
DIST GDGraph-1.48.tar.gz 156383 SHA256
4324a104557edaf8925a20f24326af89c08e419989fbaa7380f0c9731bc2ac6c SHA512
1b72b0f647dbf79a358fdf49d10f5a016a075bbf257116f120af1874efc5615917d164d95d6125c7534e3fb14050127acbd5c2fb9f5bb745997e9401c7822040
WHIRLPOOL
47a6af3d33e9a9f5dca0226d1dbcb9f6b766b85755350040adac25fd29ea8f9a074f0368128fe375e25a96b427f7fa6caa10b0f160b4d90f5c3b110a082d865f
DIST GDGraph-1.49.tar.gz 155643 SHA256
d26538c827e35c1d4b27f3c045b60f1ab6b45401c54a87e86103cd7c2374cff5 SHA512
720cc51dda41963be087bb39418642f75dade1bbab54cd4d788c18c9328f3fbd6a5c0f73027bb0be64d44cd94b0c5f2d67c48d4b0c3c34736ac8f7bc8cba95ab
WHIRLPOOL
34aa2f5af03d8ce794863a7c9bbae3ad5a14a13cf85b5ecf67a4ee7ba44cfdb7036ad88b69d286198f5b3c99d75b30298321f1015d3bebd5ef545109c55bd739
+DIST GDGraph-1.51.tar.gz 156175 SHA256
0543f9549de28de05f0b40d1864cfa1f829577fad75063c45bf867d202d56123 SHA512
c9cafdc90905fea8689cac32d0429ae987a933ae090de9894c9f70668db5c636e9363e76a656898df667dd0b0b4f593a64f3327f0b8a9738f74cd2cd937005e0
WHIRLPOOL
717e90936dbe16beeff23dc85827c72a3ab32f7c2fb14f348f06bf7c30406d2c18cbb793c8103bfe1a8f2a5605201bac42b699795f7cdc84bdba2698fec24145
[gentoo-commits] repo/gentoo:master commit in: dev-perl/GD/
commit: 51b5d40268c1ae3d08ab6d0c435ffe301d18dfa2
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Mon Jan 18 22:52:36 2016 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Mon Jan 18 22:52:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51b5d402
dev-perl/GD: Remove old
Package-Manager: portage-2.2.26
dev-perl/GD/GD-2.500.0-r1.ebuild | 75 --
dev-perl/GD/GD-2.560.0.ebuild| 78
dev-perl/GD/Manifest | 1 -
3 files changed, 154 deletions(-)
diff --git a/dev-perl/GD/GD-2.500.0-r1.ebuild b/dev-perl/GD/GD-2.500.0-r1.ebuild
deleted file mode 100644
index 72490cf..000
--- a/dev-perl/GD/GD-2.500.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=LDS
-MODULE_VERSION=2.50
-inherit perl-module
-
-DESCRIPTION="interface to Thomas Boutell's gd library"
-
-LICENSE="|| ( Artistic-2 GPL-1 GPL-2 GPL-3 )" # Artistic-2 or GPL1+
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="animgif gif jpeg png truetype xpm"
-
-RDEPEND=">=media-libs/gd-2.0.33
- png? (
- media-libs/gd[png]
- media-libs/libpng
- sys-libs/zlib
- )
- jpeg? (
- media-libs/gd[jpeg]
- virtual/jpeg
- )
- truetype? (
- media-libs/gd[truetype]
- media-libs/freetype:2
- )
- xpm? (
- media-libs/gd[xpm]
- x11-libs/libXpm
- )
- gif? ( media-libs/giflib )"
-DEPEND="${RDEPEND}
- dev-perl/Module-Build
-"
-
-SRC_TEST=do
-
-src_prepare(){
- perl-module_src_prepare
- sed -i "s/use Getopt::Long;/use Getopt::Long qw(:config
pass_through);/" \
- "${S}"/Makefile.PL || die
-}
-
-src_configure() {
- local myconf
- use gif && use animgif && myconf+=",ANIMGIF"
- use jpeg && myconf+=",JPEG"
- use truetype && myconf+=",FREETYPE"
- use png && myconf+=",PNG"
- use xpm && myconf+=",XPM"
- use gif && myconf+=",GIF"
- myconf="-options '${myconf:1}'"
- perl-module_src_configure
-}
-
-src_test() {
- if use png || use jpeg || use gif ; then
- if has_version ">=media-libs/jpeg-7" || \
- has_version "media-libs/libjpeg-turbo" ; then
- # https://rt.cpan.org/Public/Bug/Display.html?id=49053
- ewarn "Tests fail with >=media-libs/jpeg-7 or
media-libs/libjpeg-turbo. Skipping tests..."
- return
- fi
- perl-module_src_test
- else
- ewarn "The test fails if neither of png, jpeg, gif is in USE!"
- ewarn "Skipping tests..."
- fi
-}
-mydoc="GD.html"
diff --git a/dev-perl/GD/GD-2.560.0.ebuild b/dev-perl/GD/GD-2.560.0.ebuild
deleted file mode 100644
index f412f88..000
--- a/dev-perl/GD/GD-2.560.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-DIST_AUTHOR=LDS
-DIST_VERSION=2.56
-inherit perl-module
-
-DESCRIPTION="Interface to Thomas Boutell's gd library"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="animgif gif jpeg png truetype xpm"
-
-RDEPEND="
- virtual/perl-Math-Complex
- >=media-libs/gd-2.0.33
- png? (
- media-libs/gd[png]
- media-libs/libpng:0
- sys-libs/zlib
- )
- jpeg? (
- media-libs/gd[jpeg]
- virtual/jpeg:0
- )
- truetype? (
- media-libs/gd[truetype]
- media-libs/freetype:2
- )
- xpm? (
- media-libs/gd[xpm]
- x11-libs/libXpm
- )
- gif? ( media-libs/giflib )
-"
-DEPEND="${RDEPEND}
- virtual/perl-ExtUtils-CBuilder
- virtual/perl-ExtUtils-MakeMaker
-"
-
-PREFER_BUILDPL="no"
-
-src_prepare(){
- perl-module_src_prepare
- sed -i "s/use Getopt::Long;/use Getopt::Long qw(:config
pass_through);/" \
- "${S}"/Makefile.PL || die
-}
-
-src_configure() {
- local myconf
- use gif && use animgif && myconf+=",ANIMGIF"
- use jpeg && myconf+=",JPEG"
- use truetype && myconf+=",FT"
- use png && myconf+=",PNG"
- use xpm && myconf+=",XPM"
- use gif && myconf+=",GIF"
- myconf="-options '${myconf:1}'"
- perl-module_src_configure
-}
-
-src_test() {
- if use png || use jpeg || use gif ; then
- if has_version ">=media-libs/jpeg-7" || \
[gentoo-commits] repo/gentoo:master commit in: dev-perl/Font-TTF/
commit: 9b4c54d198288f4349ab1ac1a922c3aa63c9b704
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Mon Jan 18 22:24:59 2016 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Mon Jan 18 22:50:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b4c54d1
dev-perl/Font-TTF: Remove old
Package-Manager: portage-2.2.26
dev-perl/Font-TTF/Font-TTF-0.480.0-r1.ebuild | 22 --
dev-perl/Font-TTF/Manifest | 1 -
2 files changed, 23 deletions(-)
diff --git a/dev-perl/Font-TTF/Font-TTF-0.480.0-r1.ebuild
b/dev-perl/Font-TTF/Font-TTF-0.480.0-r1.ebuild
deleted file mode 100644
index 537551d..000
--- a/dev-perl/Font-TTF/Font-TTF-0.480.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=MHOSKEN
-MODULE_VERSION=0.48
-inherit perl-module
-
-DESCRIPTION="module for compiling and altering fonts"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd
~x86-fbsd"
-IUSE=""
-
-RDEPEND="virtual/perl-IO-Compress
- dev-perl/XML-Parser"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Font-TTF/Manifest b/dev-perl/Font-TTF/Manifest
index 773ea93..4db9f7b 100644
--- a/dev-perl/Font-TTF/Manifest
+++ b/dev-perl/Font-TTF/Manifest
@@ -1,2 +1 @@
-DIST Font-TTF-0.48.tar.gz 201426 SHA256
f924dec242312dfbe2740b8f6f03c491b007c3494b9e3c8d2f432a18d13e1f52 SHA512
3458472a2985d14e07820d911fb1bf5ef6f9deac9d6ba8da3ea6f3576fb5df37487a7ca8c378cff2d97a7b0dd79655173a404b718ca7a089e9dc0c9be28e9157
WHIRLPOOL
f4828e404e9a5e761af25fb99c369b76af410d1d6fa696b0a668bd4fe7ba7108af7d3b316b0782fde96b0c1c2f2207000fb8ec797fc9dedb8920d3b600a68afd
DIST Font-TTF-1.02.tar.gz 220317 SHA256
ddf4d38d21d8aa865379867a64c34b88d347545bd1f3a526f1da8ec7a93199fa SHA512
0115330def2df1489826631af2b93675f8496b2cf24891666fe5a6578a9374f2f889bf01aa8a95620fd4475987e1f60a76f6eb05fda6d899a72edb7772ce1d9a
WHIRLPOOL
16a720db81087e7a3323240a709ba6b095aad9f80b098103f2d443dbc7b3428924883d5bc1180abdc2e494e6f7005733c400f1e68d1ae8475b0de990431d9a9c
[gentoo-commits] repo/gentoo:master commit in: dev-perl/GD/
commit: f2e30693a9587b0db81ce33388f1776ac05b1b96
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Mon Jan 18 22:50:20 2016 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Mon Jan 18 22:50:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2e30693
dev-perl/GD: Add a workaround for bug 572000; should build correctly now
Package-Manager: portage-2.2.26
dev-perl/GD/GD-2.560.0-r1.ebuild | 68
1 file changed, 68 insertions(+)
diff --git a/dev-perl/GD/GD-2.560.0-r1.ebuild b/dev-perl/GD/GD-2.560.0-r1.ebuild
new file mode 100644
index 000..9366bb0
--- /dev/null
+++ b/dev-perl/GD/GD-2.560.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=LDS
+DIST_VERSION=2.56
+inherit perl-module
+
+DESCRIPTION="Interface to Thomas Boutell's gd library"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="animgif gif jpeg png truetype xpm"
+
+RDEPEND="
+ virtual/perl-Math-Complex
+ >=media-libs/gd-2.0.33
+ png? (
+ media-libs/gd[png]
+ media-libs/libpng:0
+ sys-libs/zlib
+ )
+ jpeg? (
+ media-libs/gd[jpeg]
+ virtual/jpeg:0
+ )
+ truetype? (
+ media-libs/gd[truetype]
+ media-libs/freetype:2
+ )
+ xpm? (
+ media-libs/gd[xpm]
+ x11-libs/libXpm
+ )
+ gif? ( media-libs/giflib )
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-CBuilder
+ virtual/perl-ExtUtils-MakeMaker
+"
+
+PREFER_BUILDPL="no"
+
+src_prepare(){
+ perl-module_src_prepare
+
+ # bug 572000
+ ln -s "${S}"/lib/GD.xs "${S}"/GD.xs
+
+ sed -i "s/use Getopt::Long;/use Getopt::Long qw(:config
pass_through);/" \
+ "${S}"/Makefile.PL || die
+}
+
+src_configure() {
+ local myconf
+ use gif && use animgif && myconf+=",ANIMGIF"
+ use jpeg && myconf+=",JPEG"
+ use truetype && myconf+=",FT"
+ use png && myconf+=",PNG"
+ use xpm && myconf+=",XPM"
+ use gif && myconf+=",GIF"
+ myconf="-options '${myconf:1}'"
+ perl-module_src_configure
+}
+
+mydoc="GD.html"
[gentoo-commits] repo/gentoo:master commit in: app-portage/gs-elpa/
commit: fdcc681ce6501410c5fb84ec874a90a25596
Author: Jauhien Piatlicki gentoo org>
AuthorDate: Mon Jan 18 22:40:22 2016 +
Commit: Jauhien Piatlicki gentoo org>
CommitDate: Mon Jan 18 22:40:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdcc681c
app-portage/gs-elpa: update PYTHON_COMPAT
Package-Manager: portage-2.2.26
.../{gs-elpa-.ebuild => gs-elpa-0.1.3-r1.ebuild} | 15 +++
app-portage/gs-elpa/gs-elpa-.ebuild | 8
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/app-portage/gs-elpa/gs-elpa-.ebuild
b/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild
similarity index 56%
copy from app-portage/gs-elpa/gs-elpa-.ebuild
copy to app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild
index 943f447..8f84e6f 100644
--- a/app-portage/gs-elpa/gs-elpa-.ebuild
+++ b/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-PYTHON_COMPAT=(python{2_7,3_3,3_4})
+PYTHON_COMPAT=(python{2_7,3_3,3_4,3_5})
-inherit distutils-r1 git-2
+inherit distutils-r1
DESCRIPTION="g-sorcery backend for elisp packages"
HOMEPAGE="https://github.com/jauhien/gs-elpa";
-SRC_URI=""
-EGIT_BRANCH="master"
-EGIT_REPO_URI="https://github.com/jauhien/gs-elpa";
+SRC_URI="https://github.com/jauhien/gs-elpa/archive/${PV}.tar.gz ->
${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
+KEYWORDS="~amd64 ~x86"
-DEPEND=">=app-portage/g-sorcery-0.2[$(python_gen_usedep 'python*')]
+DEPEND="app-portage/g-sorcery[$(python_gen_usedep 'python*')]
dev-python/sexpdata[$(python_gen_usedep 'python*')]"
RDEPEND="${DEPEND}"
diff --git a/app-portage/gs-elpa/gs-elpa-.ebuild
b/app-portage/gs-elpa/gs-elpa-.ebuild
index 943f447..7d0ba36 100644
--- a/app-portage/gs-elpa/gs-elpa-.ebuild
+++ b/app-portage/gs-elpa/gs-elpa-.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-PYTHON_COMPAT=(python{2_7,3_3,3_4})
+PYTHON_COMPAT=(python{2_7,3_3,3_4,3_5})
-inherit distutils-r1 git-2
+inherit distutils-r1 git-r3
DESCRIPTION="g-sorcery backend for elisp packages"
HOMEPAGE="https://github.com/jauhien/gs-elpa";
[gentoo-commits] repo/gentoo:master commit in: app-portage/gs-pypi/
commit: 3eb86c6bd25612f9dc543e6822ac50918941b481
Author: Jauhien Piatlicki gentoo org>
AuthorDate: Mon Jan 18 22:16:41 2016 +
Commit: Jauhien Piatlicki gentoo org>
CommitDate: Mon Jan 18 22:17:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eb86c6b
app-portage/gs-pypi: update PYTHON_COMPAT
Package-Manager: portage-2.2.26
.../{gs-pypi-.ebuild => gs-pypi-0.2.1-r1.ebuild} | 15 +++
app-portage/gs-pypi/gs-pypi-.ebuild | 8
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/app-portage/gs-pypi/gs-pypi-.ebuild
b/app-portage/gs-pypi/gs-pypi-0.2.1-r1.ebuild
similarity index 54%
copy from app-portage/gs-pypi/gs-pypi-.ebuild
copy to app-portage/gs-pypi/gs-pypi-0.2.1-r1.ebuild
index 77a1336..c3d9d11 100644
--- a/app-portage/gs-pypi/gs-pypi-.ebuild
+++ b/app-portage/gs-pypi/gs-pypi-0.2.1-r1.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-PYTHON_COMPAT=(python{2_7,3_3,3_4})
+PYTHON_COMPAT=(python{2_7,3_3,3_4,3_5})
-inherit distutils-r1 git-2
+inherit distutils-r1
DESCRIPTION="g-sorcery backend for pypi packages"
HOMEPAGE="https://github.com/jauhien/gs-pypi";
-SRC_URI=""
-EGIT_BRANCH="master"
-EGIT_REPO_URI="https://github.com/jauhien/gs-pypi";
+SRC_URI="https://github.com/jauhien/gs-pypi/archive/${PV}.tar.gz ->
${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
+KEYWORDS="~amd64 ~x86"
-DEPEND=">=app-portage/g-sorcery-[bson(-),git(-),$(python_gen_usedep
'python*')]
+DEPEND=">=app-portage/g-sorcery-0.2.1[bson(-),git(-),$(python_gen_usedep
'python*')]
dev-python/beautifulsoup:4[$(python_gen_usedep 'python*')]"
RDEPEND="${DEPEND}"
diff --git a/app-portage/gs-pypi/gs-pypi-.ebuild
b/app-portage/gs-pypi/gs-pypi-.ebuild
index 77a1336..3990d05 100644
--- a/app-portage/gs-pypi/gs-pypi-.ebuild
+++ b/app-portage/gs-pypi/gs-pypi-.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-PYTHON_COMPAT=(python{2_7,3_3,3_4})
+PYTHON_COMPAT=(python{2_7,3_3,3_4,3_5})
-inherit distutils-r1 git-2
+inherit distutils-r1 git-r3
DESCRIPTION="g-sorcery backend for pypi packages"
HOMEPAGE="https://github.com/jauhien/gs-pypi";
[gentoo-commits] repo/gentoo:master commit in: /
commit: 0ed251a583f39e545c8993c7a507fe145006d41b Author: Patrice Clement gentoo org> AuthorDate: Mon Jan 18 21:18:24 2016 + Commit: Patrice Clement gentoo org> CommitDate: Mon Jan 18 21:18:40 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ed251a5 Merge remote-tracking branch 'github/pr/654'. media-plugins/audacious-plugins/Manifest | 2 + .../audacious-plugins-3.7.1.ebuild | 152 + media-sound/audacious/Manifest | 2 + media-sound/audacious/audacious-3.7.1.ebuild | 81 +++ 4 files changed, 237 insertions(+)
[gentoo-commits] repo/gentoo:master commit in: media-plugins/audacious-plugins/, media-sound/audacious/
commit: 9724ebde9a0e4085389b31b14e984cec9931c3aa
Author: RobinDX gmail com>
AuthorDate: Wed Jan 13 15:52:42 2016 +
Commit: Patrice Clement gentoo org>
CommitDate: Wed Jan 13 15:55:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9724ebde
media-sound/audacious&&media-plugins/audacious-plugins:Version bump to 3.7.1
media-plugins/audacious-plugins/Manifest | 2 +
.../audacious-plugins-3.7.1.ebuild | 152 +
media-sound/audacious/Manifest | 2 +
media-sound/audacious/audacious-3.7.1.ebuild | 81 +++
4 files changed, 237 insertions(+)
diff --git a/media-plugins/audacious-plugins/Manifest
b/media-plugins/audacious-plugins/Manifest
index 1b79e86..a117346 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -10,3 +10,5 @@ DIST audacious-plugins-3.4.1.tar.bz2 1765085 SHA256
ad86b31a69bd3305aa4e65bb9dae
DIST audacious-plugins-3.5.1.tar.bz2 1714137 SHA256
e6da3346df520f3c6cee3c3706eb09290840ea12dfff28d6bec32e5842dc9e26 SHA512
6359edd6c89220f110dc20cf52418b741cfbbce4618f6ba4e4c97d6656216575aba1dfa8e7de4f11a24a28a27cc008e2f7e551759185972a17748f7e043b8823
WHIRLPOOL
e4885108904f0badf81411040e1a5098190ab4dd4b53b14ddb5c39148dc01f982a95d1143ff2d8dd9e9cfbad75fa40654791dcf2a7e21d95e80c3ec0d484d218
DIST audacious-plugins-3.6.2-gtk3.tar.bz2 176 SHA256
943d94c1ea09817caba627b6abbf0de301c3cd19f2c8c0afae1ebc4dbe31fc95 SHA512
1745c48ec5a71ed92d938fc56d0ae06fbbd43b2ef62652dd06178a3c739e2f8c701ee55249db135ee8afca663151482bb9a2b8c83f1d5bbfcd0408b0594d5847
WHIRLPOOL
2ff212a964c959d1acaf4c9d35e3ce0e3ef7261054ccef3f8174e6188d1bfb9215b780bd17df9e4c6848d4e3fd2e29d8847d3cf37e4203430a87b9fd439080a3
DIST audacious-plugins-3.6.2.tar.bz2 1786338 SHA256
e7798936249e1601177503d148a3dd59edd289579f3f1667351eb0ba463642e8 SHA512
d0715bdc819b115e55daafc6715a770a9e2d8d61d19b9a9485195774e8ace672144dc7852f71bd0b796d26bfcb82766252f65d58a2a061e7a0228a1dda3148c5
WHIRLPOOL
055be62da6c7f8ddacf2c3ef18194ba09bf63dc3699919f6e5068740c0fc6db2b370da999ffe8724e62c60363928ae87ca86d526458fa93b9a3cce37799b12af
+DIST audacious-plugins-3.7.1-gtk3.tar.bz2 1838067 SHA256
75469b52694fcfce237a937c6c64c0d355aefa6a7b6c2504ab447d901afc073f SHA512
77b0e3c167d430ed97dfb2bd344d856de9a384a4667f7759ad59f47706de12d7b5b849455c381c27a58f82d3b423d08e922ac81f5e1bb0dd763b9a09bc3e53c6
WHIRLPOOL
fbbc8e4a512b681ff2a87ea7c971b3496ff007dab5fdb534457e5608724ba43fc71642384a417190ded19d900b6e1dc20c1369f59882d91791bbcc637402c4a3
+DIST audacious-plugins-3.7.1.tar.bz2 1838045 SHA256
228a384f26afb99166776d3454539956aa00fde90dcb4612ce8910ed4116 SHA512
2d22131babba572af235ec5f27135061a1602be55a2f709e327b7cd4052f7c11bc31398d01574a6f07197daa6b79cb42d5fa7b26f75764680420a46aede5cd9a
WHIRLPOOL
026c355c6323aa6b56b09c119d9320ec5a7306f11b90504631f8a25c05b4f9bd1641ff223e0122a7b5be48f341a3820b759d1829ca60274285cfe19897c9edae
\ No newline at end of file
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.7.1.ebuild
b/media-plugins/audacious-plugins/audacious-plugins-3.7.1.ebuild
new file mode 100644
index 000..fc4405b
--- /dev/null
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.7.1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/";
+SRC_URI="!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
+gtk3? (
http://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~x86-freebsd
~x86-interix ~amd64-linux ~x86-linux"
+IUSE="aac +adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome http gtk
gtk3 jack
+lame libnotify libsamplerate lirc mms mp3 nls pulseaudio qt5 scrobbler sdl sid
sndfile vorbis wavpack"
+REQUIRED_USE="
+ ?? ( gtk gtk3 qt5 )
+"
+
+RDEPEND="app-arch/unzip
+ >=dev-libs/dbus-glib-0.60
+ dev-libs/libxml2:2
+ media-libs/libmodplug
+ ~media-sound/audacious-${PV}
+ ( || ( >=dev-libs/glib-2.32.2[utils] dev-util/gdbus-codegen ) )
+ aac? ( >=media-libs/faad2-2.7 )
+ adplug? ( media-libs/adplug )
+ alsa? ( >=media-libs/alsa-lib-1.0.16 )
+ bs2b? ( media-libs/libbs2b )
+ cdda? ( >=media-libs/libcddb-1.2.1
+ dev-libs/libcdio-paranoia )
+ cue? ( media-libs/libcue )
+ ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
+ flac? ( >=media-libs/libvorbis-1.0
+ >=media-libs/flac-1.2.1-r1 )
+ fluidsynth? ( media-sound/fluidsynth )
+ http? ( >=net-libs/neon-0.26.4 )
+ gtk? ( x11-libs/gtk+:2 )
+ gtk3? ( x11-libs/gtk+:3
+ media-libs/adplug )
+ qt5?
[gentoo-commits] repo/gentoo:master commit in: app-portage/g-sorcery/
commit: 6be48927e572121ecfa921513707bca4b2bc4abc
Author: Jauhien Piatlicki gentoo org>
AuthorDate: Mon Jan 18 21:04:55 2016 +
Commit: Jauhien Piatlicki gentoo org>
CommitDate: Mon Jan 18 21:06:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6be48927
app-portage/g-sorcery: update PYTHON_COMPAT
Package-Manager: portage-2.2.26
.../{g-sorcery-.ebuild => g-sorcery-0.2.1-r1.ebuild}| 13 ++---
app-portage/g-sorcery/g-sorcery-.ebuild | 8
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/app-portage/g-sorcery/g-sorcery-.ebuild
b/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild
similarity index 74%
copy from app-portage/g-sorcery/g-sorcery-.ebuild
copy to app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild
index 7536261..5d35b25 100644
--- a/app-portage/g-sorcery/g-sorcery-.ebuild
+++ b/app-portage/g-sorcery/g-sorcery-0.2.1-r1.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-PYTHON_COMPAT=(python{2_7,3_3,3_4})
+PYTHON_COMPAT=(python{2_7,3_3,3_4,3_5})
-inherit distutils-r1 git-2
+inherit distutils-r1
DESCRIPTION="framework for ebuild generators"
HOMEPAGE="https://github.com/jauhien/g-sorcery";
-SRC_URI=""
-EGIT_BRANCH="master"
-EGIT_REPO_URI="git://git.gentoo.org/proj/g-sorcery.git"
+SRC_URI="https://github.com/jauhien/g-sorcery/archive/${PV}.tar.gz ->
${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
IUSE="bson git"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
git? ( dev-vcs/git )
diff --git a/app-portage/g-sorcery/g-sorcery-.ebuild
b/app-portage/g-sorcery/g-sorcery-.ebuild
index 7536261..bfde259 100644
--- a/app-portage/g-sorcery/g-sorcery-.ebuild
+++ b/app-portage/g-sorcery/g-sorcery-.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-PYTHON_COMPAT=(python{2_7,3_3,3_4})
+PYTHON_COMPAT=(python{2_7,3_3,3_4,3_5})
-inherit distutils-r1 git-2
+inherit distutils-r1 git-r3
DESCRIPTION="framework for ebuild generators"
HOMEPAGE="https://github.com/jauhien/g-sorcery";
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
commit: fd9b596cf9e8a8efb5dbb0041496b45fbe8249fd
Author: Ilya Tumaykin gmail com>
AuthorDate: Mon Jan 18 19:45:47 2016 +
Commit: Patrice Clement gentoo org>
CommitDate: Mon Jan 18 20:48:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd9b596c
media-video/mpv: revbump to 0.15.0-r1 to fix null pointer dereference
Upstream issue: https://github.com/mpv-player/mpv/issues/2729
Package-Manager: portage-2.2.26
.../mpv-0.15.0-fix-null-pointer-dereference.patch | 21 +
.../mpv/{mpv-0.15.0.ebuild => mpv-0.15.0-r1.ebuild} | 2 ++
2 files changed, 23 insertions(+)
diff --git
a/media-video/mpv/files/mpv-0.15.0-fix-null-pointer-dereference.patch
b/media-video/mpv/files/mpv-0.15.0-fix-null-pointer-dereference.patch
new file mode 100644
index 000..4cc4c87
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.15.0-fix-null-pointer-dereference.patch
@@ -0,0 +1,21 @@
+commit 5053f4cc3f48538c3d9a3ba13dc98442f3302052
+Author: wm4
+Date: Mon Jan 18 20:10:28 2016 +0100
+
+command: fix NULL pointer deref in "video-codec" property
+
+Fixes #2729.
+
+diff --git a/player/command.c b/player/command.c
+index 3c7cfb2..413349d 100644
+--- a/player/command.c
b/player/command.c
+@@ -2438,7 +2438,7 @@ static int mp_property_video_codec(void *ctx, struct
m_property *prop,
+ {
+ MPContext *mpctx = ctx;
+ struct track *track = mpctx->current_track[0][STREAM_VIDEO];
+-const char *c = track->d_video ? track->d_video->decoder_desc : NULL;
++const char *c = track && track->d_video ? track->d_video->decoder_desc :
NULL;
+ return m_property_strdup_ro(action, arg, c);
+ }
+
diff --git a/media-video/mpv/mpv-0.15.0.ebuild
b/media-video/mpv/mpv-0.15.0-r1.ebuild
similarity index 99%
rename from media-video/mpv/mpv-0.15.0.ebuild
rename to media-video/mpv/mpv-0.15.0-r1.ebuild
index b6a0297..ca974a9 100644
--- a/media-video/mpv/mpv-0.15.0.ebuild
+++ b/media-video/mpv/mpv-0.15.0-r1.ebuild
@@ -161,6 +161,8 @@ pkg_pretend() {
src_prepare() {
cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
chmod +x "${S}"/waf || die
+
+ epatch "${FILESDIR}/${P}-fix-null-pointer-dereference.patch"
epatch_user
}
[gentoo-commits] repo/gentoo:master commit in: /
commit: 88f6c22027dc9d6da6c0ffea8808fb974045e0f8
Author: Patrice Clement gentoo org>
AuthorDate: Mon Jan 18 20:47:30 2016 +
Commit: Patrice Clement gentoo org>
CommitDate: Mon Jan 18 20:48:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88f6c220
Merge remote-tracking branch 'github/pr/679'.
.../gtk2hs-buildtools-0.13.0.4-alex-3.1.6.patch| 9 +
.../gtk2hs-buildtools-0.13.0.4-r3.ebuild | 1 +
dev-libs/dbus-c++/dbus-c++-0.9.0-r2.ebuild | 4 +-
dev-python/pygments/Manifest | 1 +
dev-python/pygments/pygments-2.1.ebuild| 52 +
dev-python/pymongo/Manifest| 1 +
dev-python/pymongo/pymongo-3.2.ebuild | 121
games-fps/alienarena/alienarena-20130827.ebuild| 8 +-
.../files/alienarena-20130827-format.patch | 11 ++
...le-15.08.3.ebuild => konsole-15.08.3-r1.ebuild} | 8 +-
kde-apps/konsole/konsole-4.14.3-r1.ebuild | 55 --
kde-apps/konsole/konsole-4.14.3.ebuild | 13 +-
.../files/breeze-5.4.2-fix-breeze-dark.patch | 23 ---
...plasma-desktop-5.5.0-favourites-migration.patch | 26 ---
mail-filter/rmilter/Manifest | 1 +
mail-filter/rmilter/rmilter-1.7.0.ebuild | 37
mail-filter/rspamd/Manifest| 1 +
mail-filter/rspamd/rspamd-1.0.11.ebuild| 2 +-
.../{rspamd-1.0.11.ebuild => rspamd-1.1.0.ebuild} | 5 +-
mail-mta/exim/Manifest | 4 +-
.../{exim-4.87_rc1.ebuild => exim-4.87_rc3.ebuild} | 0
.../imlib2_loaders/imlib2_loaders-1.4.7.ebuild | 4 +-
.../imlib2_loaders/imlib2_loaders-.ebuild | 4 +-
.../mpv-0.15.0-fix-null-pointer-dereference.patch | 21 ++
.../{mpv-0.15.0.ebuild => mpv-0.15.0-r1.ebuild}| 2 +
net-im/gajim/gajim-0.16.5.ebuild | 2 +-
net-print/cups-filters/cups-filters-1.5.0.ebuild | 4 +-
profiles/package.mask | 2 +-
sci-geosciences/merkaartor/Manifest| 1 -
.../merkaartor/files/merkaartor-gdal-2-fix.patch | 212 +
18.1-r1.ebuild => merkaartor-0.18.1-r2.ebuild} | 6 +-
.../merkaartor/merkaartor-0.18.1.ebuild| 69 ---
32 files changed, 501 insertions(+), 209 deletions(-)
[gentoo-commits] proj/tinderbox-cluster:master commit in: pym/tbc/
commit: 250f837e65c6e28381ca57ecbe97085974902bdf
Author: Magnus Granberg gentoo org>
AuthorDate: Mon Jan 18 20:28:04 2016 +
Commit: Magnus Granberg gentoo org>
CommitDate: Mon Jan 18 20:28:04 2016 +
URL:
https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=250f837e
move the hash for the build log
pym/tbc/build_log.py | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pym/tbc/build_log.py b/pym/tbc/build_log.py
index 79dbe2a..7b3784a 100644
--- a/pym/tbc/build_log.py
+++ b/pym/tbc/build_log.py
@@ -28,7 +28,7 @@ from tbc.ConnectionManager import NewConnection
from tbc.sqlquerys import add_logs, get_config_id, get_ebuild_id_db,
add_new_buildlog, \
get_package_info, get_build_job_id, get_use_id, get_config_info,
get_hilight_info, get_error_info_list, \
add_e_info, get_fail_times, add_fail_times, update_fail_times,
del_old_build_jobs, add_old_ebuild, \
- update_buildjobs_status, update_manifest_sql, add_repoman_qa,
get_config_id_fqdn, get_setup_info, \
+ update_buildjobs_status, update_mtime_sql, add_repoman_qa,
get_config_id_fqdn, get_setup_info, \
add_repoman_log
from sqlalchemy.orm import sessionmaker
@@ -107,7 +107,7 @@ def get_build_dict_db(session, config_id, settings,
tbc_settings_dict, pkg):
if ebuild_id_list is None:
log_msg = "%s:%s Don't have any ebuild_id!" % (pkg.cpv,
repo,)
add_logs(session, log_msg, "info", config_id)
- update_manifest_sql(session, build_dict['package_id'],
"0")
+ update_mtime_sql(session, build_dict['package_id'], 0)
else:
old_ebuild_id_list = []
for ebuild_id in ebuild_id_list:
@@ -293,7 +293,7 @@ def add_buildlog_main(settings, pkg, trees):
if error_log_list != []:
for log_line in error_log_list:
build_error = build_error + log_line
- log_hash.update(log_line.encode('utf-8'))
+ log_hash.update(build_error.encode('utf-8'))
build_log_dict['build_error'] = build_error
build_log_dict['log_hash'] = log_hash.hexdigest()
build_log_dict['logfilename'] =
settings.get("PORTAGE_LOG_FILE").split(host_config)[1]
@@ -322,7 +322,7 @@ def add_buildlog_main(settings, pkg, trees):
qa_msg = "QA: FAILD"
else:
build_msg = "BUILD: FAILD"
- msg = "Package: %s Repo: %s %s %s %s Weblink
http://foo.gg.oo/buildpackage/%s\n"; % (pkg.cpv, pkg.repo, build_msg,
repoman_msg, qa_msg, log_id,)
+ msg = "Package: %s Repo: %s %s %s %s Weblink
http://foo.gg.oo/new/logs/build/%s\n"; % (pkg.cpv, pkg.repo, build_msg,
repoman_msg, qa_msg, log_id,)
send_irk(msg)
session.close
[gentoo-commits] repo/gentoo:master commit in: dev-haskell/gtk2hs-buildtools/, dev-haskell/gtk2hs-buildtools/files/
commit: 9b29f788870a4fe29461df825050808cda4b5c4a
Author: Sergei Trofimovich gentoo org>
AuthorDate: Mon Jan 18 20:04:24 2016 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Mon Jan 18 20:04:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b29f788
dev-haskell/gtk2hs-buildtools: build fix fox alex3.1.7, bug #572260
Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/show_bug.cgi?id=572260
Package-Manager: portage-2.2.26
.../files/gtk2hs-buildtools-0.13.0.4-alex-3.1.6.patch| 9 +
.../gtk2hs-buildtools/gtk2hs-buildtools-0.13.0.4-r3.ebuild | 1 +
2 files changed, 10 insertions(+)
diff --git
a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.0.4-alex-3.1.6.patch
b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.0.4-alex-3.1.6.patch
new file mode 100644
index 000..a772e67
--- /dev/null
+++
b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.0.4-alex-3.1.6.patch
@@ -0,0 +1,9 @@
+diff --git a/c2hs/c/CLexer.x b/c2hs/c/CLexer.x
+index 77702ed..1cd2483 100644
+--- a/c2hs/c/CLexer.x
b/c2hs/c/CLexer.x
+@@ -68,3 +68,3 @@ module CLexer (lexC, parseError) where
+
+-import Data.Char (isDigit)
++import Data.Char (ord, isDigit)
+ import Data.Word (Word8)
diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.0.4-r3.ebuild
b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.0.4-r3.ebuild
index 8397870..1f2796b 100644
--- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.0.4-r3.ebuild
+++ b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.0.4-r3.ebuild
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}"/${P}-ia64.patch
+ epatch "${FILESDIR}"/${P}-alex-3.1.6.patch
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: dev-libs/dbus-c++/
commit: e2cae2b96a86cfe06a6f5fb9f7e3cbf13c8f1be4
Author: Mike Frysinger gentoo org>
AuthorDate: Mon Jan 18 19:29:35 2016 +
Commit: Mike Frysinger gentoo org>
CommitDate: Mon Jan 18 19:29:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2cae2b9
dev-libs/dbus-c++: switch ecore dep to efl #571796
The ecore package is dead now and is replaced by the efl package.
dev-libs/dbus-c++/dbus-c++-0.9.0-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-libs/dbus-c++/dbus-c++-0.9.0-r2.ebuild
b/dev-libs/dbus-c++/dbus-c++-0.9.0-r2.ebuild
index eddd151..8ada821 100644
--- a/dev-libs/dbus-c++/dbus-c++-0.9.0-r2.ebuild
+++ b/dev-libs/dbus-c++/dbus-c++-0.9.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~x86"
IUSE="doc ecore glib static-libs test"
RDEPEND="sys-apps/dbus[${MULTILIB_USEDEP}]
- ecore? ( dev-libs/ecore )
+ ecore? ( dev-libs/efl )
glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
[gentoo-commits] data/api:master commit in: files/overlays/
commit: 59b2c6560bacd8372876853c9c4a3a1ded454476 Author: Michał Górny gentoo org> AuthorDate: Mon Jan 18 19:26:33 2016 + Commit: Michał Górny gentoo org> CommitDate: Mon Jan 18 19:26:33 2016 + URL:https://gitweb.gentoo.org/data/api.git/commit/?id=59b2c656 repositories: Add hexedit-overlay, #572288 files/overlays/repositories.xml | 10 ++ 1 file changed, 10 insertions(+) diff --git a/files/overlays/repositories.xml b/files/overlays/repositories.xml index 1822adb..0036237 100644 --- a/files/overlays/repositories.xml +++ b/files/overlays/repositories.xml @@ -2011,6 +2011,16 @@ FIN https://github.com/internethering/hering-overlay/commits/master.atom +hexedit-overlay +Ebuilds for infrastructure-related packages and my own projects +http://hexedit.me/gentoo/ + + hexe...@ifproject.ru + Timofey Negrebetsky + +https://svn.ifproject.ru/gentoo-overlay/ + + https://github.com/reanimus/hhvm-overlay
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/eclasses/, pym/repoman/checks/ebuilds/eclasses/, ...
commit: 19b613f7105474f6c3414de05de2da91abe8826f
Author: Brian Dolbec gentoo org>
AuthorDate: Fri Jan 8 08:46:01 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 19:20:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=19b613f7
repoman: Create RubyEclassChecks class plugin
pym/repoman/checks/ebuilds/eclasses/__init__.py| 0
pym/repoman/modules/scan/eclasses/__init__.py | 8
.../{checks/ebuilds => modules/scan}/eclasses/ruby.py | 18 ++
pym/repoman/scanner.py | 9 ++---
4 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/eclasses/__init__.py
b/pym/repoman/checks/ebuilds/eclasses/__init__.py
deleted file mode 100644
index e69de29..000
diff --git a/pym/repoman/modules/scan/eclasses/__init__.py
b/pym/repoman/modules/scan/eclasses/__init__.py
index a821f5c..70a6252 100644
--- a/pym/repoman/modules/scan/eclasses/__init__.py
+++ b/pym/repoman/modules/scan/eclasses/__init__.py
@@ -18,6 +18,14 @@ module_spec = {
'func_kwargs': {
},
},
+ 'ruby-module': {
+ 'name': "ruby",
+ 'class': "RubyEclassChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_kwargs': {
+ },
+ },
}
}
diff --git a/pym/repoman/checks/ebuilds/eclasses/ruby.py
b/pym/repoman/modules/scan/eclasses/ruby.py
similarity index 62%
rename from pym/repoman/checks/ebuilds/eclasses/ruby.py
rename to pym/repoman/modules/scan/eclasses/ruby.py
index e8d36ea..4dc5d62 100644
--- a/pym/repoman/checks/ebuilds/eclasses/ruby.py
+++ b/pym/repoman/modules/scan/eclasses/ruby.py
@@ -4,19 +4,23 @@ Performs Ruby eclass checks
'''
from repoman.qa_data import ruby_deprecated
+from repoman.modules.scan.scanbase import ScanBase
-class RubyEclassChecks(object):
+class RubyEclassChecks(ScanBase):
'''Performs checks for the usage of Ruby eclasses in ebuilds'''
- def __init__(self, qatracker):
+ def __init__(self, **kwargs):
'''
@param qatracker: QATracker instance
'''
- self.qatracker = qatracker
+ super(RubyEclassChecks, self).__init__(**kwargs)
+ self.qatracker = kwargs.get('qatracker')
self.old_ruby_eclasses = ["ruby-ng", "ruby-fakegem", "ruby"]
- def check(self, pkg, ebuild):
+ def check(self, **kwargs):
+ pkg = kwargs.get('pkg')
+ ebuild = kwargs.get('ebuild')
is_inherited = lambda eclass: eclass in pkg.inherited
is_old_ruby_eclass_inherited = filter(
is_inherited, self.old_ruby_eclasses)
@@ -30,3 +34,9 @@ class RubyEclassChecks(object):
"IUSE.rubydeprecated",
(ebuild.relative_path + ":
Deprecated ruby target: %s")
% myruby)
+ return {'continue': False}
+
+ @property
+ def runInEbuilds(self):
+ '''Ebuild level scans'''
+ return (True, [self.check])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 0227a93..e6a17cd 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -18,7 +18,6 @@ from portage import _unicode_encode
from portage.dep import Atom
from portage.output import green
from repoman.checks.ebuilds.checks import run_checks
-from repoman.checks.ebuilds.eclasses.ruby import RubyEclassChecks
from repoman.checks.ebuilds.variables.license import LicenseChecks
from repoman.checks.ebuilds.variables.restrict import RestrictChecks
from repoman.modules.commit import repochecks
@@ -211,7 +210,6 @@ class Scanner(object):
self.modules[mod_class.__name__] =
mod_class(**self.kwargs)
# initialize our checks classes here before the big xpkg loop
- self.rubyeclasscheck = RubyEclassChecks(self.qatracker)
self.licensecheck = LicenseChecks(self.qatracker, liclist,
liclist_deprecated)
self.restrictcheck = RestrictChecks(self.qatracker)
@@ -298,7 +296,7 @@ class Scanner(object):
('thirdpartymirrors', 'ThirdPartyMirrors'),
('description', 'DescriptionChecks'), (None,
'KeywordChecks'),
('arches', 'ArchChecks'), ('depend',
'DependChecks'),
- ('use_flags', 'USEFlagChecks'),
+ ('use_flags', 'USEFlagChecks'), ('ruby',
'RubyEclassChecks'),
]:
if mod[0]:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/depend/, pym/repoman/
commit: d41825e26f02b97ac4889dfbf90b4a151e19dd72
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jan 4 07:57:36 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 19:20:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d41825e2
repoman: Move the large depency checks loop to a new plugin
ProfileDependsChecks class
pym/repoman/modules/scan/depend/__init__.py | 8 ++
pym/repoman/modules/scan/depend/profile.py | 211
pym/repoman/repos.py| 1 +
pym/repoman/scanner.py | 181 +---
4 files changed, 227 insertions(+), 174 deletions(-)
diff --git a/pym/repoman/modules/scan/depend/__init__.py
b/pym/repoman/modules/scan/depend/__init__.py
index 73d3f8f..2dac94b 100644
--- a/pym/repoman/modules/scan/depend/__init__.py
+++ b/pym/repoman/modules/scan/depend/__init__.py
@@ -18,6 +18,14 @@ module_spec = {
'func_desc': {
},
},
+ 'profile-module': {
+ 'name': "profile",
+ 'class': "ProfileDependsChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
}
}
diff --git a/pym/repoman/modules/scan/depend/profile.py
b/pym/repoman/modules/scan/depend/profile.py
new file mode 100644
index 000..91c52cc
--- /dev/null
+++ b/pym/repoman/modules/scan/depend/profile.py
@@ -0,0 +1,211 @@
+# -*- coding:utf-8 -*-
+
+
+import copy
+from pprint import pformat
+
+from _emerge.Package import Package
+
+# import our initialized portage instance
+from repoman._portage import portage
+from portage.dep import Atom
+
+
+def sort_key(item):
+ return item[2].sub_path
+
+
+class ProfileDependsChecks(object):
+
+ def __init__(self, **kwargs):
+ self.qatracker = kwargs.get('qatracker')
+ self.portdb = kwargs.get('portdb')
+ self.profiles = kwargs.get('profiles')
+ self.options = kwargs.get('options')
+ self.repo_settings = kwargs.get('repo_settings')
+ self.include_arches = kwargs.get('include_arches')
+ self.caches = kwargs.get('caches')
+ self.repoman_incrementals = kwargs.get('repoman_incrementals')
+ self.env = kwargs.get('env')
+ self.have = kwargs.get('have')
+ self.dev_keywords = kwargs.get('dev_keywords')
+
+ def check(self, **kwargs):
+ arches = kwargs.get('arches')
+ ebuild = kwargs.get('ebuild')
+ pkg = kwargs.get('pkg')
+ baddepsyntax = kwargs.get('baddepsyntax')
+ unknown_pkgs = kwargs.get('unknown_pkgs')
+
+ relevant_profiles = []
+ for keyword, arch, groups in arches:
+ if arch not in self.profiles:
+ # A missing profile will create an error
further down
+ # during the KEYWORDS verification.
+ continue
+
+ if self.include_arches is not None:
+ if arch not in self.include_arches:
+ continue
+
+ relevant_profiles.extend(
+ (keyword, groups, prof) for prof in
self.profiles[arch])
+
+ relevant_profiles.sort(key=sort_key)
+
+ for keyword, groups, prof in relevant_profiles:
+
+ is_stable_profile = prof.status == "stable"
+ is_dev_profile = prof.status == "dev" and \
+ self.options.include_dev
+ is_exp_profile = prof.status == "exp" and \
+ self.options.include_exp_profiles == 'y'
+ if not (is_stable_profile or is_dev_profile or
is_exp_profile):
+ continue
+
+ dep_settings = self.caches['arch'].get(prof.sub_path)
+ if dep_settings is None:
+ dep_settings = portage.config(
+ config_profile_path=prof.abs_path,
+
config_incrementals=self.repoman_incrementals,
+
config_root=self.repo_settings.config_root,
+ local_config=False,
+
_unmatched_removal=self.options.unmatched_removal,
+ env=self.env,
repositories=self.repo_settings.repoman_settings.repositories)
+ dep_settings.categories =
self.repo_settings.repoman_settings.categories
+ if self.opti
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: a7fcddb10817b1dc3dc834125c097a51aa23c6d4
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 05:33:17 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 19:20:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a7fcddb1
repoman: Enable verbosity option to be useful for setting the logging level
Verbosity option was not being used internally.
Convert debug print's added to proper debug messages.
pym/repoman/main.py| 13 ++---
pym/repoman/scanner.py | 35 +++
2 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 8784685..d43a688 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -19,7 +19,6 @@ from portage import os
import portage.checksum
import portage.const
import portage.repository.config
-from portage import util
from portage.output import create_color_func, nocolor
from portage.output import ConsoleStyleFile, StyleWriter
from portage.util import formatter
@@ -38,13 +37,14 @@ from repoman.modules.vcs.settings import VCSSettings
if sys.hexversion >= 0x300:
basestring = str
-util.initialize_logger()
-
bad = create_color_func("BAD")
# A sane umask is needed for files that portage creates.
os.umask(0o22)
+LOGLEVEL = logging.WARNING
+portage.util.initialize_logger(LOGLEVEL)
+
def repoman_main(argv):
config_root = os.environ.get("PORTAGE_CONFIGROOT")
@@ -62,6 +62,13 @@ def repoman_main(argv):
print("Portage", portage.VERSION)
sys.exit(0)
+ logger = logging.getLogger()
+
+ if options.verbosity > 0:
+ logger.setLevel(LOGLEVEL - 10 * options.verbosity)
+ else:
+ logger.setLevel(LOGLEVEL)
+
if options.experimental_inherit == 'y':
# This is experimental, so it's non-fatal.
qawarnings.add("inherit.missing")
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 50dd259..2620df3 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -19,13 +19,13 @@ from portage.module import Modules
MODULES_PATH = os.path.join(os.path.dirname(__file__), "modules", "scan")
# initial development debug info
-#print("module path:", path)
+logging.debug("module path: %s", MODULES_PATH)
MODULE_CONTROLLER = Modules(path=MODULES_PATH, namepath="repoman.modules.scan")
-# initial development debug info
-#print(module_controller.module_names)
MODULE_NAMES = MODULE_CONTROLLER.module_names[:]
+# initial development debug info
+logging.debug("module_names: %s", MODULE_NAMES)
class Scanner(object):
@@ -197,7 +197,7 @@ class Scanner(object):
for mod in ['manifests', 'isebuild', 'keywords', 'files',
'vcsstatus',
'fetches', 'pkgmetadata']:
mod_class = MODULE_CONTROLLER.get_class(mod)
- print("Initializing class name:", mod_class.__name__)
+ logging.debug("Initializing class name: %s",
mod_class.__name__)
self.modules[mod_class.__name__] =
mod_class(**self.kwargs)
# initialize our checks classes here before the big xpkg loop
@@ -207,7 +207,7 @@ class Scanner(object):
for xpkg in self.effective_scanlist:
xpkg_continue = False
# ebuilds and digests added to cvs respectively.
- logging.info("checking package %s" % xpkg)
+ logging.info("checking package %s", xpkg)
# save memory by discarding xmatch caches from previous
package(s)
self.caches['arch_xmatch'].clear()
self.eadded = []
@@ -235,7 +235,7 @@ class Scanner(object):
# need to set it up for ==> self.modules or some other
ordered list
for mod in ['Manifests', 'IsEbuild', 'KeywordChecks',
'FileChecks',
'VCSStatus', 'FetchChecks',
'PkgMetadata']:
- print("scan_pkgs(): module:", mod)
+ logging.debug("scan_pkgs; module: %s", mod)
do_it, functions = self.modules[mod].runInPkgs
if do_it:
for func in functions:
@@ -299,7 +299,7 @@ class Scanner(object):
logging.debug("do_it: %s, functions: %s",
do_it, [x.__name__ for x in functions])
if do_it:
for func in functions:
- print("\tRunning function:",
func)
+ logging.debug("\tRunning
function: %s", func)
rdata = func(**dynamic_data)
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/keywords/
commit: 2897811ee4dd018671eb41f6dbe4b312e9e6441d
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 18:28:58 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 19:20:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2897811e
repoman: Complete KeywordChecks migration
pym/repoman/modules/scan/keywords/keywords.py | 47 ---
pym/repoman/scanner.py| 3 +-
2 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/pym/repoman/modules/scan/keywords/keywords.py
b/pym/repoman/modules/scan/keywords/keywords.py
index 484d7d5..e34c891 100644
--- a/pym/repoman/modules/scan/keywords/keywords.py
+++ b/pym/repoman/modules/scan/keywords/keywords.py
@@ -19,6 +19,8 @@ class KeywordChecks(ScanBase):
super(KeywordChecks, self).__init__(**kwargs)
self.qatracker = kwargs.get('qatracker')
self.options = kwargs.get('options')
+ self.repo_metadata = kwargs.get('repo_metadata')
+ self.profiles = kwargs.get('profiles')
self.slot_keywords = {}
def prepare(self, **kwargs):
@@ -45,21 +47,19 @@ class KeywordChecks(ScanBase):
live_ebuild = kwargs.get('live_ebuild')
if not self.options.straight_to_stable:
self._checkAddedWithStableKeywords(
- package, ebuild, y_ebuild, keywords, changed)
+ xpkg, ebuild, y_ebuild, ebuild.keywords,
changed)
- self._checkForDroppedKeywords(
- pkg, ebuild, ebuild_archs, live_ebuild)
+ self._checkForDroppedKeywords(pkg, ebuild, ebuild.archs,
live_ebuild)
- self._checkForInvalidKeywords(
- pkg, package, y_ebuild, kwlist, profiles)
+ self._checkForInvalidKeywords(ebuild, xpkg, y_ebuild)
- self._checkForMaskLikeKeywords(
- package, y_ebuild, keywords, kwlist)
+ self._checkForMaskLikeKeywords(xpkg, y_ebuild, ebuild.keywords)
- self.slot_keywords[pkg.slot].update(ebuild_archs)
+ self.slot_keywords[pkg.slot].update(ebuild.archs)
return {'continue': False}
- def _isKeywordStable(self, keyword):
+ @staticmethod
+ def _isKeywordStable(keyword):
return not keyword.startswith("~") and not
keyword.startswith("-")
def _checkAddedWithStableKeywords(
@@ -88,9 +88,8 @@ class KeywordChecks(ScanBase):
ebuild.relative_path,
"
".join(sorted(dropped_keywords
- def _checkForInvalidKeywords(
- self, pkg, package, y_ebuild, kwlist, profiles):
- myuse = pkg._metadata["KEYWORDS"].split()
+ def _checkForInvalidKeywords(self, ebuild, xpkg, y_ebuild):
+ myuse = ebuild.keywords
for mykey in myuse:
if mykey not in ("-*", "*", "~*"):
@@ -99,20 +98,16 @@ class KeywordChecks(ScanBase):
if not self._isKeywordStable(myskey[:1]):
myskey = myskey[1:]
- if myskey not in kwlist:
+ if myskey not in self.repo_metadata['kwlist']:
+
self.qatracker.add_error("KEYWORDS.invalid",
+ "%s/%s.ebuild: %s" % (xpkg,
y_ebuild, mykey))
+ elif myskey not in self.profiles:
self.qatracker.add_error(
"KEYWORDS.invalid",
- "%s/%s.ebuild: %s" % (
- package, y_ebuild,
mykey))
- elif myskey not in profiles:
- self.qatracker.add_error(
- "KEYWORDS.invalid",
- "%s/%s.ebuild: %s (profile
invalid)" % (
- package, y_ebuild,
mykey))
-
- def _checkForMaskLikeKeywords(
- self, package, y_ebuild, keywords, kwlist):
+ "%s/%s.ebuild: %s (profile
invalid)"
+ % (xpkg, y_ebuild,
mykey))
+ def _checkForMaskLikeKeywords(self, xpkg, y_ebuild, keywords):
# KEYWORDS="-*" is a stupid replacement for package.mask
# and screws general KEYWORDS semantics
if "-*" in keywords:
@@ -121,12 +116,12 @@ class KeywordChecks(ScanBase):
for kw in keywords:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/depend/
commit: d2905f81b0563ffd4b8188a52a966b525a506c1c
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jan 4 08:09:33 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 19:20:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d2905f81
repoman: Create a new DependUnknown plugin class
pym/repoman/modules/scan/depend/__init__.py | 8
pym/repoman/modules/scan/depend/unknown.py | 30 +
pym/repoman/scanner.py | 10 +-
3 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/pym/repoman/modules/scan/depend/__init__.py
b/pym/repoman/modules/scan/depend/__init__.py
index 2dac94b..6b4 100644
--- a/pym/repoman/modules/scan/depend/__init__.py
+++ b/pym/repoman/modules/scan/depend/__init__.py
@@ -26,6 +26,14 @@ module_spec = {
'func_desc': {
},
},
+ 'unknown-module': {
+ 'name': "unknown",
+ 'class': "DependUnknown",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
}
}
diff --git a/pym/repoman/modules/scan/depend/unknown.py
b/pym/repoman/modules/scan/depend/unknown.py
new file mode 100644
index 000..61d51b9
--- /dev/null
+++ b/pym/repoman/modules/scan/depend/unknown.py
@@ -0,0 +1,30 @@
+# -*- coding:utf-8 -*-
+
+
+class DependUnknown(object):
+
+ def __init__(self, **kwargs):
+ self.qatracker = kwargs.get('qatracker')
+
+ def check(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
+ baddepsyntax = kwargs.get('baddepsyntax')
+ unknown_pkgs = kwargs.get('unknown_pkgs')
+
+ if not baddepsyntax and unknown_pkgs:
+ type_map = {}
+ for mytype, atom in unknown_pkgs:
+ type_map.setdefault(mytype, set()).add(atom)
+ for mytype, atoms in type_map.items():
+ self.qatracker.add_error(
+ "dependency.unknown", "%s: %s: %s"
+ % (ebuild.relative_path, mytype, ",
".join(sorted(atoms
+ return {'continue': False}
+
+ @property
+ def runInPkgs(self):
+ return (False, [])
+
+ @property
+ def runInEbuilds(self):
+ return (True, [self.check])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index be971db..89eaa57 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -289,6 +289,7 @@ class Scanner(object):
('mtime', 'MtimeChecks'), ('encoding',
'EncodingCheck'),
# Options.is_forced() is used to bypass further
checks
('options', 'Options'), ('profile',
'ProfileDependsChecks'),
+ ('unknown', 'DependUnknown'),
]:
if mod[0]:
mod_class =
MODULE_CONTROLLER.get_class(mod[0])
@@ -316,15 +317,6 @@ class Scanner(object):
if y_ebuild_continue:
continue
- if not dynamic_data['baddepsyntax'] and
dynamic_data['unknown_pkgs']:
- type_map = {}
- for mytype, atom in
dynamic_data['unknown_pkgs']:
- type_map.setdefault(mytype,
set()).add(atom)
- for mytype, atoms in type_map.items():
- self.qatracker.add_error(
- "dependency.unknown", "%s: %s:
%s"
- %
(dynamic_data['ebuild'].relative_path, mytype, ", ".join(sorted(atoms
-
# check if there are unused local USE-descriptions in
metadata.xml
# (unless there are any invalids, to avoid noise)
if dynamic_data['allvalid']:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/, pym/repoman/modules/scan/use/
commit: 613bfeedd8a77c8d0a1f978e999d86ec3aa69b51
Author: Brian Dolbec gentoo org>
AuthorDate: Fri Jan 8 01:37:39 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 19:20:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=613bfeed
repoman: Create USEFlagChecks class plugin
pym/repoman/modules/scan/use/__init__.py | 23 ++
.../ebuilds => modules/scan/use}/use_flags.py | 36 ++
pym/repoman/scanner.py | 8 ++---
3 files changed, 49 insertions(+), 18 deletions(-)
diff --git a/pym/repoman/modules/scan/use/__init__.py
b/pym/repoman/modules/scan/use/__init__.py
new file mode 100644
index 000..e400719
--- /dev/null
+++ b/pym/repoman/modules/scan/use/__init__.py
@@ -0,0 +1,23 @@
+# Copyright 2015-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+doc = """Use plug-in module for repoman.
+Performs use flag checks on ebuilds."""
+__doc__ = doc[:]
+
+
+module_spec = {
+ 'name': 'use',
+ 'description': doc,
+ 'provides':{
+ 'use-module': {
+ 'name': "use_flags",
+ 'class': "USEFlagChecks",
+ 'description': doc,
+ 'functions': ['check', 'getUsedUseFlags'],
+ 'func_desc': {
+ },
+ },
+ }
+}
+
diff --git a/pym/repoman/checks/ebuilds/use_flags.py
b/pym/repoman/modules/scan/use/use_flags.py
similarity index 74%
rename from pym/repoman/checks/ebuilds/use_flags.py
rename to pym/repoman/modules/scan/use/use_flags.py
index ac21b47..acc7dd3 100644
--- a/pym/repoman/checks/ebuilds/use_flags.py
+++ b/pym/repoman/modules/scan/use/use_flags.py
@@ -9,31 +9,39 @@ from repoman._portage import portage
from portage import eapi
from portage.eapi import eapi_has_iuse_defaults, eapi_has_required_use
+from repoman.modules.scan.scanbase import ScanBase
-class USEFlagChecks(object):
+class USEFlagChecks(ScanBase):
'''Performs checks on USE flags listed in the ebuilds and
metadata.xml'''
- def __init__(self, qatracker, globalUseFlags):
- '''
+ def __init__(self, **kwargs):
+ '''Class init
+
@param qatracker: QATracker instance
@param globalUseFlags: Global USE flags
'''
- self.qatracker = qatracker
- self.globalUseFlags = globalUseFlags
+ super(USEFlagChecks, self).__init__(**kwargs)
+ self.qatracker = kwargs.get('qatracker')
+ self.globalUseFlags = kwargs.get('uselist')
self.useFlags = []
self.defaultUseFlags = []
self.usedUseFlags = set()
- def check(self, pkg, package, ebuild, y_ebuild, localUseFlags):
+ def check(self, **kwargs):
'''Perform the check.
@param pkg: Package in which we check (object).
- @param package: Package in which we check (string).
+ @param xpkg: Package in which we check (string).
@param ebuild: Ebuild which we check (object).
@param y_ebuild: Ebuild which we check (string).
- @param localUseFlags: Local USE flags of the package
+ @param muselist: Local USE flags of the package
'''
+ pkg = kwargs.get('pkg')
+ package = kwargs.get('xpkg')
+ ebuild = kwargs.get('ebuild')
+ y_ebuild = kwargs.get('y_ebuild')
+ localUseFlags = kwargs.get('muselist')
# reset state variables for the run
self.useFlags = []
self.defaultUseFlags = []
@@ -41,10 +49,9 @@ class USEFlagChecks(object):
self._checkGlobal(pkg)
self._checkMetadata(package, ebuild, y_ebuild, localUseFlags)
self._checkRequiredUSE(pkg, ebuild)
-
- def getUsedUseFlags(self):
- '''Get the USE flags that this check has seen'''
- return self.usedUseFlags
+ used_useflags =
kwargs.get('used_useflags').union(self.usedUseFlags)
+ return {'continue': False, 'ebuild_UsedUseFlags':
self.usedUseFlags,
+ 'used_useflags': used_useflags}
def _checkGlobal(self, pkg):
for myflag in pkg._metadata["IUSE"].split():
@@ -88,3 +95,8 @@ class USEFlagChecks(object):
"REQUIRED_USE.syntax",
"%s: REQUIRED_USE: %s" %
(ebuild.relative_path, e))
del e
+
+ @property
+ def runInEbuilds(self):
+ '''Ebuild level scans'''
+ return (True, [self.check])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 7f770c3..0227a93 100644
--- a/p
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/directories/, pym/repoman/
commit: 7609a1b012c9b91b01164dad8e4bc16cf0c3871e
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jan 4 04:44:05 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 19:20:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=7609a1b0
repoman: Create new EncodingCheck class plugin
pym/repoman/modules/scan/directories/__init__.py | 8 +
pym/repoman/modules/scan/directories/encoding.py | 41
pym/repoman/scanner.py | 21 +---
3 files changed, 50 insertions(+), 20 deletions(-)
diff --git a/pym/repoman/modules/scan/directories/__init__.py
b/pym/repoman/modules/scan/directories/__init__.py
index b9daef0..548d393 100644
--- a/pym/repoman/modules/scan/directories/__init__.py
+++ b/pym/repoman/modules/scan/directories/__init__.py
@@ -26,6 +26,14 @@ module_spec = {
'func_kwargs': {
},
},
+ 'encoding-module': {
+ 'name': "encoding",
+ 'class': "EncodingCheck",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_kwargs': {
+ },
+ },
}
}
diff --git a/pym/repoman/modules/scan/directories/encoding.py
b/pym/repoman/modules/scan/directories/encoding.py
new file mode 100644
index 000..0985e16
--- /dev/null
+++ b/pym/repoman/modules/scan/directories/encoding.py
@@ -0,0 +1,41 @@
+
+import io
+
+from portage import _encodings
+from portage import _unicode_encode
+
+from repoman.checks.ebuilds.checks import run_checks
+
+
+class EncodingCheck(object):
+
+ def __init__(self, **kwargs):
+ self.qatracker = kwargs.get('qatracker')
+
+ def check(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
+ pkg = kwargs.get('pkg')
+ try:
+ # All ebuilds should have utf_8 encoding.
+ f = io.open(
+ _unicode_encode(ebuild.full_path,
encoding=_encodings['fs'],
+ errors='strict'),
+ mode='r', encoding=_encodings['repo.content'])
+ try:
+ for check_name, e in run_checks(f, pkg):
+ self.qatracker.add_error(
+ check_name,
ebuild.relative_path + ': %s' % e)
+ finally:
+ f.close()
+ except UnicodeDecodeError:
+ # A file.UTF8 failure will have already been recorded.
+ pass
+ return {'continue': False}
+
+ @property
+ def runInPkgs(self):
+ return (False, [])
+
+ @property
+ def runInEbuilds(self):
+ return (True, [self.check])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index b00dbd9..ac77d1f 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -3,7 +3,6 @@
from __future__ import print_function, unicode_literals
import copy
-import io
import logging
from itertools import chain
from pprint import pformat
@@ -13,11 +12,8 @@ from _emerge.Package import Package
import portage
from portage import normalize_path
from portage import os
-from portage import _encodings
-from portage import _unicode_encode
from portage.dep import Atom
from portage.output import green
-from repoman.checks.ebuilds.checks import run_checks
from repoman.modules.commit import repochecks
from repoman.profile import check_profiles, dev_profile_keywords, setup_profile
from repoman.repos import repo_metadata
@@ -293,7 +289,7 @@ class Scanner(object):
('arches', 'ArchChecks'), ('depend',
'DependChecks'),
('use_flags', 'USEFlagChecks'), ('ruby',
'RubyEclassChecks'),
('license', 'LicenseChecks'), ('restrict',
'RestrictChecks'),
- ('mtime', 'MtimeChecks'),
+ ('mtime', 'MtimeChecks'), ('encoding',
'EncodingCheck'),
]:
if mod[0]:
mod_class =
MODULE_CONTROLLER.get_class(mod[0])
@@ -322,21 +318,6 @@ class Scanner(object):
continue
# Syntax Checks
- try:
- # All ebuilds should have utf_8 encoding.
- f = io.open(
- _unicode_encode(
-
dynamic_data['ebuild'].full_path, encoding=_encodings['fs'], errors='strict'),
- mode='r',
encoding=_encodings['repo.content
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/
commit: a4c362af74e3f3060a1421566cb14d1307972889 Author: Brian Dolbec gentoo org> AuthorDate: Sun Jan 3 21:55:33 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Mon Jan 18 19:20:03 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=a4c362af repoman: Migrate additional dynamic data setting to the USEFlagsChecks pym/repoman/scanner.py | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 6d5416b..d5faded 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -283,7 +283,7 @@ class Scanner(object): def _scan_ebuilds(self, ebuildlist, dynamic_data): xpkg = dynamic_data['xpkg'] # detect unused local USE-descriptions - used_useflags = set() + dynamic_data['used_useflags'] = set() for y_ebuild in ebuildlist: dynamic_data['y_ebuild'] = y_ebuild @@ -324,8 +324,6 @@ class Scanner(object): if y_ebuild_continue: continue - used_useflags = used_useflags.union(dynamic_data['ebuild_UsedUseFlags']) - # license checks if not dynamic_data['badlicsyntax']: self.licensecheck.check(dynamic_data['pkg'], xpkg, dynamic_data['ebuild'], y_ebuild) @@ -535,7 +533,7 @@ class Scanner(object): # check if there are unused local USE-descriptions in metadata.xml # (unless there are any invalids, to avoid noise) if dynamic_data['allvalid']: - for myflag in dynamic_data['muselist'].difference(used_useflags): + for myflag in dynamic_data['muselist'].difference(dynamic_data['used_useflags']): self.qatracker.add_error( "metadata.warning", "%s/metadata.xml: unused local USE-description: '%s'"
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/options/
commit: 03e79db5d907fa5bf426565e254c630908d75298
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jan 4 07:55:55 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 19:20:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=03e79db5
repoman: Create a new Options class plugin
This handles an options.force bypass using the is_forced() from withing the
plugin system.
pym/repoman/modules/scan/options/__init__.py | 23 +++
pym/repoman/modules/scan/options/options.py | 22 ++
pym/repoman/scanner.py | 10 ++
3 files changed, 47 insertions(+), 8 deletions(-)
diff --git a/pym/repoman/modules/scan/options/__init__.py
b/pym/repoman/modules/scan/options/__init__.py
new file mode 100644
index 000..8424058
--- /dev/null
+++ b/pym/repoman/modules/scan/options/__init__.py
@@ -0,0 +1,23 @@
+# Copyright 2015-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+doc = """Options plug-in module for repoman.
+Performs option related actions on ebuilds."""
+__doc__ = doc[:]
+
+
+module_spec = {
+ 'name': 'options',
+ 'description': doc,
+ 'provides':{
+ 'options-module': {
+ 'name': "options",
+ 'class': "Options",
+ 'description': doc,
+ 'functions': ['is_forced'],
+ 'func_desc': {
+ },
+ },
+ }
+}
+
diff --git a/pym/repoman/modules/scan/options/options.py
b/pym/repoman/modules/scan/options/options.py
new file mode 100644
index 000..b592884
--- /dev/null
+++ b/pym/repoman/modules/scan/options/options.py
@@ -0,0 +1,22 @@
+
+
+class Options(object):
+
+ def __init__(self, **kwargs):
+ self.options = kwargs.get('options')
+
+ def is_forced(self, **kwargs):
+ if self.options.force:
+ # The dep_check() calls are the most expensive QA test.
If --force
+ # is enabled, there's no point in wasting time on these
since the
+ # user is intent on forcing the commit anyway.
+ return {'continue': True}
+ return {'continue': False}
+
+ @property
+ def runInPkgs(self):
+ return (False, [])
+
+ @property
+ def runInEbuilds(self):
+ return (True, [self.is_forced])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index ac77d1f..a047237 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -290,6 +290,8 @@ class Scanner(object):
('use_flags', 'USEFlagChecks'), ('ruby',
'RubyEclassChecks'),
('license', 'LicenseChecks'), ('restrict',
'RestrictChecks'),
('mtime', 'MtimeChecks'), ('encoding',
'EncodingCheck'),
+ # Options.is_forced() is used to bypass further
checks
+ ('options', 'Options'),
]:
if mod[0]:
mod_class =
MODULE_CONTROLLER.get_class(mod[0])
@@ -317,14 +319,6 @@ class Scanner(object):
if y_ebuild_continue:
continue
- # Syntax Checks
-
- if self.options.force:
- # The dep_check() calls are the most expensive
QA test. If --force
- # is enabled, there's no point in wasting time
on these since the
- # user is intent on forcing the commit anyway.
- continue
-
relevant_profiles = []
for keyword, arch, groups in dynamic_data['arches']:
if arch not in self.profiles:
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/metadata/, ...
commit: ac5c53283cc17ba5cabc21d65db5ab86c3f95f70
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 23:10:48 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 19:20:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ac5c5328
repoman: Migrate RestrictChecks to a plugin module
pym/repoman/modules/scan/metadata/__init__.py | 8 ++
.../scan/metadata}/restrict.py | 29 +++---
pym/repoman/scanner.py | 7 +-
3 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/pym/repoman/modules/scan/metadata/__init__.py
b/pym/repoman/modules/scan/metadata/__init__.py
index ed0c59d..6ab44f6 100644
--- a/pym/repoman/modules/scan/metadata/__init__.py
+++ b/pym/repoman/modules/scan/metadata/__init__.py
@@ -42,6 +42,14 @@ module_spec = {
'func_desc': {
},
},
+ 'restrict-metadata': {
+ 'name': "restrict",
+ 'class': "RestrictChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
}
}
diff --git a/pym/repoman/checks/ebuilds/variables/restrict.py
b/pym/repoman/modules/scan/metadata/restrict.py
similarity index 54%
rename from pym/repoman/checks/ebuilds/variables/restrict.py
rename to pym/repoman/modules/scan/metadata/restrict.py
index 215b792..93ca298 100644
--- a/pym/repoman/checks/ebuilds/variables/restrict.py
+++ b/pym/repoman/modules/scan/metadata/restrict.py
@@ -12,21 +12,23 @@ from repoman.qa_data import valid_restrict
class RestrictChecks(object):
'''Perform checks on the RESTRICT variable.'''
- def __init__(self, qatracker):
+ def __init__(self, **kwargs):
'''
@param qatracker: QATracker instance
'''
- self.qatracker = qatracker
+ self.qatracker = kwargs.get('qatracker')
- def check(self, pkg, package, ebuild, y_ebuild):
+ def check(self, **kwargs):
+ xpkg = kwargs.get('xpkg')
+ ebuild = kwargs.get('ebuild')
+ y_ebuild = kwargs.get('y_ebuild')
myrestrict = None
try:
myrestrict = portage.dep.use_reduce(
- pkg._metadata["RESTRICT"], matchall=1,
flat=True)
+ ebuild.metadata["RESTRICT"], matchall=1,
flat=True)
except portage.exception.InvalidDependString as e:
- self. qatracker.add_error(
- "RESTRICT.syntax",
+ self.qatracker.add_error("RESTRICT.syntax",
"%s: RESTRICT: %s" % (ebuild.relative_path, e))
del e
@@ -36,6 +38,15 @@ class RestrictChecks(object):
if mybadrestrict:
for mybad in mybadrestrict:
- self.qatracker.add_error(
- "RESTRICT.invalid",
- package + "/" + y_ebuild +
".ebuild: %s" % mybad)
+
self.qatracker.add_error("RESTRICT.invalid",
+ "%s/%s.ebuild: %s" % (xpkg,
y_ebuild, mybad))
+ return {'continue': False}
+
+ @property
+ def runInPkgs(self):
+ return (False, [])
+
+ @property
+ def runInEbuilds(self):
+ return (True, [self.check])
+
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 1f792bd..8657c73 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -18,7 +18,6 @@ from portage import _unicode_encode
from portage.dep import Atom
from portage.output import green
from repoman.checks.ebuilds.checks import run_checks
-from repoman.checks.ebuilds.variables.restrict import RestrictChecks
from repoman.modules.commit import repochecks
from repoman.profile import check_profiles, dev_profile_keywords, setup_profile
from repoman.repos import repo_metadata
@@ -209,8 +208,6 @@ class Scanner(object):
self.modules[mod_class.__name__] =
mod_class(**self.kwargs)
# initialize our checks classes here before the big xpkg loop
- self.restrictcheck = RestrictChecks(self.qatracker)
-
def scan_pkgs(self, can_force):
dynamic_data = {'can_force': can_force}
@@ -295,7 +292,7 @@ class Scanner(object):
('description', 'DescriptionChecks'), (None,
'KeywordChecks'),
('arches', 'ArchChecks'), ('depend',
'DependChecks'),
('use_flags', 'USEFlagChecks'), ('ruby',
'
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/directories/, pym/repoman/
commit: 451fb7d79279e9a7339e84b802cf15443466f370
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 23:23:52 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 19:20:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=451fb7d7
repoman: Migrate code to a new MtimeChecks class in directories plugin
pym/repoman/modules/scan/directories/__init__.py | 8
pym/repoman/modules/scan/directories/mtime.py| 24
pym/repoman/scanner.py | 5 +
3 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/pym/repoman/modules/scan/directories/__init__.py
b/pym/repoman/modules/scan/directories/__init__.py
index 7fe9f0e..b9daef0 100644
--- a/pym/repoman/modules/scan/directories/__init__.py
+++ b/pym/repoman/modules/scan/directories/__init__.py
@@ -18,6 +18,14 @@ module_spec = {
'func_kwargs': {
},
},
+ 'mtime-module': {
+ 'name': "mtime",
+ 'class': "MtimeChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_kwargs': {
+ },
+ },
}
}
diff --git a/pym/repoman/modules/scan/directories/mtime.py
b/pym/repoman/modules/scan/directories/mtime.py
new file mode 100644
index 000..e113cdd
--- /dev/null
+++ b/pym/repoman/modules/scan/directories/mtime.py
@@ -0,0 +1,24 @@
+
+
+class MtimeChecks(object):
+
+ def __init__(self, **kwargs):
+ self.vcs_settings = kwargs.get('vcs_settings')
+
+ def check(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
+ changed = kwargs.get('changed')
+ pkg = kwargs.get('pkg')
+ if not self.vcs_settings.vcs_preserves_mtime:
+ if ebuild.ebuild_path not in changed.new_ebuilds and \
+ ebuild.ebuild_path not in
changed.ebuilds:
+ pkg.mtime = None
+ return {'continue': False}
+
+ @property
+ def runInPkgs(self):
+ return (False, [])
+
+ @property
+ def runInEbuilds(self):
+ return (True, [self.check])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 8657c73..b00dbd9 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -293,6 +293,7 @@ class Scanner(object):
('arches', 'ArchChecks'), ('depend',
'DependChecks'),
('use_flags', 'USEFlagChecks'), ('ruby',
'RubyEclassChecks'),
('license', 'LicenseChecks'), ('restrict',
'RestrictChecks'),
+ ('mtime', 'MtimeChecks'),
]:
if mod[0]:
mod_class =
MODULE_CONTROLLER.get_class(mod[0])
@@ -321,10 +322,6 @@ class Scanner(object):
continue
# Syntax Checks
- if not self.vcs_settings.vcs_preserves_mtime:
- if dynamic_data['ebuild'].ebuild_path not in
self.changed.new_ebuilds and \
- dynamic_data['ebuild'].ebuild_path not
in self.changed.ebuilds:
- dynamic_data['pkg'].mtime = None
try:
# All ebuilds should have utf_8 encoding.
f = io.open(
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/metadata/, ...
commit: 38712a290941b001a8f14e9c068c604d291142d4
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 23:09:27 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 19:20:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=38712a29
repoman: Migrate license checks to a plugin module
pym/repoman/checks/ebuilds/variables/license.py | 47 --
pym/repoman/modules/scan/metadata/__init__.py | 8
pym/repoman/modules/scan/metadata/license.py| 53 +
pym/repoman/scanner.py | 7 +---
4 files changed, 62 insertions(+), 53 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/variables/license.py
b/pym/repoman/checks/ebuilds/variables/license.py
deleted file mode 100644
index bdc859c..000
--- a/pym/repoman/checks/ebuilds/variables/license.py
+++ /dev/null
@@ -1,47 +0,0 @@
-
-'''description.py
-Perform checks on the LICENSE variable.
-'''
-
-# import our initialized portage instance
-from repoman._portage import portage
-
-
-class LicenseChecks(object):
- '''Perform checks on the LICENSE variable.'''
-
- def __init__(self, qatracker, liclist, liclist_deprecated):
- '''
- @param qatracker: QATracker instance
- @param liclist: List of licenses.
- @param liclist: List of deprecated licenses.
- '''
- self.qatracker = qatracker
- self.liclist = liclist
- self.liclist_deprecated = liclist_deprecated
-
- def check(
- self, pkg, package, ebuild, y_ebuild):
- '''
- @param pkg: Package in which we check (object).
- @param package: Package in which we check (string).
- @param ebuild: Ebuild which we check (object).
- @param y_ebuild: Ebuild which we check (string).
- '''
-
- # Parse the LICENSE variable, remove USE conditions and flatten
it.
- licenses = portage.dep.use_reduce(
- pkg._metadata["LICENSE"], matchall=1, flat=True)
-
- # Check each entry to ensure that it exists in
${PORTDIR}/licenses/.
- for lic in licenses:
- # Need to check for "||" manually as no portage
- # function will remove it without removing values.
- if lic not in self.liclist and lic != "||":
- self.qatracker.add_error(
- "LICENSE.invalid",
- package + "/" + y_ebuild + ".ebuild:
%s" % lic)
- elif lic in self.liclist_deprecated:
- self.qatracker.add_error(
- "LICENSE.deprecated",
- "%s: %s" % (ebuild.relative_path, lic))
diff --git a/pym/repoman/modules/scan/metadata/__init__.py
b/pym/repoman/modules/scan/metadata/__init__.py
index 2506521..ed0c59d 100644
--- a/pym/repoman/modules/scan/metadata/__init__.py
+++ b/pym/repoman/modules/scan/metadata/__init__.py
@@ -34,6 +34,14 @@ module_spec = {
'func_desc': {
},
},
+ 'license-metadata': {
+ 'name': "license",
+ 'class': "LicenseChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
}
}
diff --git a/pym/repoman/modules/scan/metadata/license.py
b/pym/repoman/modules/scan/metadata/license.py
new file mode 100644
index 000..b022b20
--- /dev/null
+++ b/pym/repoman/modules/scan/metadata/license.py
@@ -0,0 +1,53 @@
+
+'''license.py
+Perform checks on the LICENSE variable.
+'''
+
+# import our initialized portage instance
+from repoman._portage import portage
+
+
+class LicenseChecks(object):
+ '''Perform checks on the LICENSE variable.'''
+
+ def __init__(self, **kwargs):
+ '''
+ @param qatracker: QATracker instance
+ @param repo_metadata: dictionary of various repository items.
+ '''
+ self.qatracker = kwargs.get('qatracker')
+ self.repo_metadata = kwargs.get('repo_metadata')
+
+ def check(self, **kwargs):
+ '''
+ @param xpkg: Package in which we check (string).
+ @param ebuild: Ebuild which we check (object).
+ @param y_ebuild: Ebuild which we check (string).
+ '''
+ xpkg = kwargs.get('xpkg')
+ ebuild = kwargs.get('ebuild')
+ y_ebuild = kwargs.get('y_ebuild')
+ if not kwargs.get('badlicsyntax'):
+ # Parse the LICENSE variable, remove USE conditions and
flatte
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/ebuild/
commit: d59fe586d5c358bbe43f807fb6c2ac8bb8131249
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 17:33:26 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 19:20:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d59fe586
repoman: Move ebuild_archs to the Ebuild class
pym/repoman/modules/scan/ebuild/ebuild.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/pym/repoman/modules/scan/ebuild/ebuild.py
b/pym/repoman/modules/scan/ebuild/ebuild.py
index 62c9e52..7362ff7 100644
--- a/pym/repoman/modules/scan/ebuild/ebuild.py
+++ b/pym/repoman/modules/scan/ebuild/ebuild.py
@@ -35,6 +35,7 @@ class Ebuild(ScanBase):
self.eapi = None
self.inherited = None
self.keywords = None
+ self.archs = None
def _set_paths(self, **kwargs):
repolevel = kwargs.get('repolevel')
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/metadata/
commit: 390cda1fe14dc7d6c66dc623fa48acc7155e5d3e
Author: Brian Dolbec gentoo org>
AuthorDate: Mon Jan 4 08:37:22 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 19:20:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=390cda1f
repoman: Create a metadata UnusedCheck and final pkg checks
Create a plugin loop for any final pkg checks.
Create the one plugin for the unused use-descriptions in mteadata.xml
pym/repoman/modules/scan/metadata/__init__.py | 8 ++
pym/repoman/modules/scan/metadata/unused.py | 32
pym/repoman/scanner.py| 36 ---
3 files changed, 67 insertions(+), 9 deletions(-)
diff --git a/pym/repoman/modules/scan/metadata/__init__.py
b/pym/repoman/modules/scan/metadata/__init__.py
index 6ab44f6..ed4a967 100644
--- a/pym/repoman/modules/scan/metadata/__init__.py
+++ b/pym/repoman/modules/scan/metadata/__init__.py
@@ -50,6 +50,14 @@ module_spec = {
'func_desc': {
},
},
+ 'unused-metadata': {
+ 'name': "unused",
+ 'class': "UnusedCheck",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
}
}
diff --git a/pym/repoman/modules/scan/metadata/unused.py
b/pym/repoman/modules/scan/metadata/unused.py
new file mode 100644
index 000..5eb6716
--- /dev/null
+++ b/pym/repoman/modules/scan/metadata/unused.py
@@ -0,0 +1,32 @@
+
+
+class UnusedCheck(object):
+
+ def __init__(self, **kwargs):
+ self.qatracker = kwargs.get('qatracker')
+
+ def check(self, **kwargs):
+ xpkg = kwargs.get('xpkg')
+ muselist = kwargs.get('muselist')
+ used_useflags = kwargs.get('used_useflags')
+ # check if there are unused local USE-descriptions in
metadata.xml
+ # (unless there are any invalids, to avoid noise)
+ if kwargs.get('allvalid'):
+ for myflag in muselist.difference(used_useflags):
+ self.qatracker.add_error(
+ "metadata.warning",
+ "%s/metadata.xml: unused local
USE-description: '%s'"
+ % (xpkg, myflag))
+ return {'continue': False}
+
+ @property
+ def runInPkgs(self):
+ return (False, [])
+
+ @property
+ def runInEbuilds(self):
+ return (False, [])
+
+ @property
+ def runInFinal(self):
+ return (True, [self.check])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 89eaa57..50dd259 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -269,7 +269,6 @@ class Scanner(object):
def _scan_ebuilds(self, ebuildlist, dynamic_data):
- xpkg = dynamic_data['xpkg']
# detect unused local USE-descriptions
dynamic_data['used_useflags'] = set()
@@ -317,11 +316,30 @@ class Scanner(object):
if y_ebuild_continue:
continue
- # check if there are unused local USE-descriptions in
metadata.xml
- # (unless there are any invalids, to avoid noise)
- if dynamic_data['allvalid']:
- for myflag in
dynamic_data['muselist'].difference(dynamic_data['used_useflags']):
- self.qatracker.add_error(
- "metadata.warning",
- "%s/metadata.xml: unused local
USE-description: '%s'"
- % (xpkg, myflag))
+ # Final checks
+ # initialize per pkg plugin final checks here
+ # need to set it up for ==> self.modules_list or some other
ordered list
+ xpkg_complete = False
+ for mod in [('unused', 'UnusedChecks')]:
+ if mod[0]:
+ mod_class = MODULE_CONTROLLER.get_class(mod[0])
+ print("Initializing class name:",
mod_class.__name__)
+ self.modules[mod[1]] = mod_class(**self.kwargs)
+ print("scan_ebuilds final checks: module:", mod[1])
+ do_it, functions = self.modules[mod[1]].runInFinal
+ # print("do_it", do_it, "functions", functions)
+ if do_it:
+ for func in functions:
+ print("\tRunning function:", func)
+ rdata = func(**dynamic_data)
+ if rdata.g
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/depend/
commit: e7ca910fb8be063d2311508b337d299418ade1f5
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 21:19:59 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 19:20:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e7ca910f
repoman: Migrate some additional Dependency code to the plugin
pym/repoman/modules/scan/depend/depend.py | 13 -
pym/repoman/scanner.py| 22 +++---
2 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/pym/repoman/modules/scan/depend/depend.py
b/pym/repoman/modules/scan/depend/depend.py
index 8a0ff48..7f1d007 100644
--- a/pym/repoman/modules/scan/depend/depend.py
+++ b/pym/repoman/modules/scan/depend/depend.py
@@ -1,3 +1,5 @@
+# -*- coding:utf-8 -*-
+
from _emerge.Package import Package
@@ -121,7 +123,16 @@ class DependChecks(object):
qacat = m + ".syntax"
self.qatracker.add_error(
qacat, "%s: %s: %s" % (ebuild.relative_path, m,
b))
- return {'continue': False, 'unknown_pkgs': unknown_pkgs,
'type_list': type_list}
+
+ # data required for some other tests
+ badlicsyntax = len([z for z in type_list if z == "LICENSE"])
+ badprovsyntax = len([z for z in type_list if z == "PROVIDE"])
+ baddepsyntax = len(type_list) != badlicsyntax + badprovsyntax
+ badlicsyntax = badlicsyntax > 0
+ #badprovsyntax = badprovsyntax > 0
+
+ return {'continue': False, 'unknown_pkgs': unknown_pkgs,
'type_list': type_list,
+ 'badlicsyntax': badlicsyntax, 'baddepsyntax':
baddepsyntax}
@property
def runInPkgs(self):
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index d42fd33..6d5416b 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -324,26 +324,10 @@ class Scanner(object):
if y_ebuild_continue:
continue
- if dynamic_data['live_ebuild'] and
self.repo_settings.repo_config.name == "gentoo":
- self.liveeclasscheck.check(
- dynamic_data['pkg'], xpkg,
dynamic_data['ebuild'], y_ebuild, dynamic_data['ebuild'].keywords,
self.repo_metadata['pmaskdict'])
-
- unknown_pkgs = set()
- baddepsyntax = False
- badlicsyntax = False
- badprovsyntax = False
- # catpkg = catdir + "/" + y_ebuild
-
- badlicsyntax = len([z for z in
dynamic_data['type_list'] if z == "LICENSE"])
- badprovsyntax = len([z for z in
dynamic_data['type_list'] if z == "PROVIDE"])
- baddepsyntax = len(dynamic_data['type_list']) !=
badlicsyntax + badprovsyntax
- badlicsyntax = badlicsyntax > 0
- badprovsyntax = badprovsyntax > 0
-
used_useflags =
used_useflags.union(dynamic_data['ebuild_UsedUseFlags'])
# license checks
- if not badlicsyntax:
+ if not dynamic_data['badlicsyntax']:
self.licensecheck.check(dynamic_data['pkg'],
xpkg, dynamic_data['ebuild'], y_ebuild)
self.restrictcheck.check(dynamic_data['pkg'], xpkg,
dynamic_data['ebuild'], y_ebuild)
@@ -449,7 +433,7 @@ class Scanner(object):
dep_settings.usemask =
dep_settings._use_manager.getUseMask(
dynamic_data['pkg'],
stable=dep_settings._parent_stable)
- if not baddepsyntax:
+ if not dynamic_data['baddepsyntax']:
ismasked = not
dynamic_data['ebuild'].archs or \
dynamic_data['pkg'].cpv not in
self.portdb.xmatch("match-visible",
Atom("%s::%s" %
(dynamic_data['pkg'].cp, self.repo_settings.repo_config.name)))
@@ -539,7 +523,7 @@ class Scanner(object):
%
(dynamic_data['ebuild'].relative_path, mytype, keyword,
prof, pformat(atoms, indent=6)))
- if not baddepsyntax and dynamic_data['unknown_pkgs']:
+ if not dynamic_data['baddepsyntax'] and
dynamic_data['unknown_pkgs']:
type_map = {}
for mytype, atom in
dynamic_data['unknown_pkgs']:
type_map.setdefault(mytype,
set()).add(atom)
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/fix/, pym/repoman/modules/full/, ...
commit: 5019fd88d67127dc53aca46c894df2bed9e797b5 Author: Brian Dolbec gentoo org> AuthorDate: Wed Jan 6 03:08:08 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Mon Jan 18 19:20:03 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=5019fd88 repoman: Delete unused subpkgs pym/repoman/checks/ebuilds/variables/__init__.py | 0 pym/repoman/modules/fix/__init__.py | 0 pym/repoman/modules/full/__init__.py | 0 pym/repoman/modules/manifest/__init__.py | 0 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/pym/repoman/checks/ebuilds/variables/__init__.py b/pym/repoman/checks/ebuilds/variables/__init__.py deleted file mode 100644 index e69de29..000 diff --git a/pym/repoman/modules/fix/__init__.py b/pym/repoman/modules/fix/__init__.py deleted file mode 100644 index e69de29..000 diff --git a/pym/repoman/modules/full/__init__.py b/pym/repoman/modules/full/__init__.py deleted file mode 100644 index e69de29..000 diff --git a/pym/repoman/modules/manifest/__init__.py b/pym/repoman/modules/manifest/__init__.py deleted file mode 100644 index e69de29..000
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/variables/, pym/repoman/, ...
commit: 3df90a153e0f81fa8815d4fdbab4d972a7c4eda9
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 17:36:26 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 19:20:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=3df90a15
repoman: Migrate DescriptionChecks to the plugin system
pym/repoman/modules/scan/metadata/__init__.py| 8
.../scan/metadata}/description.py| 20 ++--
pym/repoman/scanner.py | 5 +
3 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/pym/repoman/modules/scan/metadata/__init__.py
b/pym/repoman/modules/scan/metadata/__init__.py
index eba6565..2506521 100644
--- a/pym/repoman/modules/scan/metadata/__init__.py
+++ b/pym/repoman/modules/scan/metadata/__init__.py
@@ -26,6 +26,14 @@ module_spec = {
'func_desc': {
},
},
+ 'description-metadata': {
+ 'name': "description",
+ 'class': "DescriptionChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
}
}
diff --git a/pym/repoman/checks/ebuilds/variables/description.py
b/pym/repoman/modules/scan/metadata/description.py
similarity index 66%
rename from pym/repoman/checks/ebuilds/variables/description.py
rename to pym/repoman/modules/scan/metadata/description.py
index a2b1057..3570607 100644
--- a/pym/repoman/checks/ebuilds/variables/description.py
+++ b/pym/repoman/modules/scan/metadata/description.py
@@ -9,20 +9,19 @@ from repoman.qa_data import max_desc_len
class DescriptionChecks(object):
'''Perform checks on the DESCRIPTION variable.'''
- def __init__(self, qatracker):
+ def __init__(self, **kwargs):
'''
@param qatracker: QATracker instance
'''
- self.qatracker = qatracker
+ self.qatracker = kwargs.get('qatracker')
- def check(self, pkg, ebuild):
+ def checkTooLong(self, **kwargs):
'''
@param pkg: Package in which we check (object).
@param ebuild: Ebuild which we check (object).
'''
- self._checkTooLong(pkg, ebuild)
-
- def _checkTooLong(self, pkg, ebuild):
+ ebuild = kwargs.get('ebuild')
+ pkg = kwargs.get('pkg')
# 14 is the length of DESCRIPTION=""
if len(pkg._metadata['DESCRIPTION']) > max_desc_len:
self.qatracker.add_error(
@@ -30,3 +29,12 @@ class DescriptionChecks(object):
"%s: DESCRIPTION is %d characters (max %d)" %
(ebuild.relative_path, len(
pkg._metadata['DESCRIPTION']),
max_desc_len))
+ return {'continue': False}
+
+ @property
+ def runInPkgs(self):
+ return (False, [])
+
+ @property
+ def runInEbuilds(self):
+ return (True, [self.checkTooLong])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 955440e..bb856b8 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -21,7 +21,6 @@ from repoman.checks.ebuilds.checks import run_checks
from repoman.checks.ebuilds.eclasses.ruby import RubyEclassChecks
from repoman.check_missingslot import check_missingslot
from repoman.checks.ebuilds.use_flags import USEFlagChecks
-from repoman.checks.ebuilds.variables.description import DescriptionChecks
from repoman.checks.ebuilds.variables.license import LicenseChecks
from repoman.checks.ebuilds.variables.restrict import RestrictChecks
from repoman.modules.commit import repochecks
@@ -216,7 +215,6 @@ class Scanner(object):
# initialize our checks classes here before the big xpkg loop
self.use_flag_checks = USEFlagChecks(self.qatracker, uselist)
self.rubyeclasscheck = RubyEclassChecks(self.qatracker)
- self.descriptioncheck = DescriptionChecks(self.qatracker)
self.licensecheck = LicenseChecks(self.qatracker, liclist,
liclist_deprecated)
self.restrictcheck = RestrictChecks(self.qatracker)
@@ -301,6 +299,7 @@ class Scanner(object):
for mod in [('ebuild', 'Ebuild'), ('live',
'LiveEclassChecks'),
('eapi', 'EAPIChecks'), ('ebuild_metadata',
'EbuildMetadata'),
('thirdpartymirrors', 'ThirdPartyMirrors'),
+ ('description', 'DescriptionChecks'),
]:
if mod[0]:
mod_class =
MODULE_CONTROLLER.get_class(mod[0])
@@ -347,8 +346,6 @@ class Scan
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/metadata/
commit: fceec7352038d21e2bbd774fb4e0a270386ef74a
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 11:31:26 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 19:20:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=fceec735
scanner.py: Migrate another metadata check to ebuild_metadata
pym/repoman/modules/scan/metadata/ebuild_metadata.py | 3 +++
pym/repoman/scanner.py | 2 --
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pym/repoman/modules/scan/metadata/ebuild_metadata.py
b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
index 143a40e..2dc1db2 100644
--- a/pym/repoman/modules/scan/metadata/ebuild_metadata.py
+++ b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
@@ -28,6 +28,9 @@ class EbuildMetadata(object):
"%s: %s variable contains non-ASCII "
"character at position %s" %
(ebuild.relative_path, k, m.start() +
1))
+ if ebuild.metadata.get("PROVIDE"):
+ self.qatracker.add_error("virtual.oldstyle",
ebuild.relative_path)
+
return {'continue': False}
@property
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index e6a17cd..46f46f5 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -324,8 +324,6 @@ class Scanner(object):
if y_ebuild_continue:
continue
- if dynamic_data['ebuild'].metadata.get("PROVIDE"):
- self.qatracker.add_error("virtual.oldstyle",
dynamic_data['ebuild'].relative_path)
for pos, missing_var in enumerate(missingvars):
if not
dynamic_data['ebuild'].metadata.get(missing_var):
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/variables/, pym/repoman/modules/scan/eapi/, ...
commit: 5e92237f48cc20c87a0a5212f4b4150e2965d592
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 10:03:26 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 19:20:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=5e92237f
repoman: Migrate eapi.py to the plugin module
pym/repoman/checks/ebuilds/variables/eapi.py | 44 -
pym/repoman/modules/scan/eapi/__init__.py| 23 +
pym/repoman/modules/scan/eapi/eapi.py| 49
pym/repoman/scanner.py | 6 ++--
4 files changed, 74 insertions(+), 48 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/variables/eapi.py
b/pym/repoman/checks/ebuilds/variables/eapi.py
deleted file mode 100644
index 2f8b1cb..000
--- a/pym/repoman/checks/ebuilds/variables/eapi.py
+++ /dev/null
@@ -1,44 +0,0 @@
-
-'''eapi.py
-Perform checks on the EAPI variable.
-'''
-
-
-class EAPIChecks(object):
- '''Perform checks on the EAPI variable.'''
-
- def __init__(self, qatracker, repo_settings):
- '''
- @param qatracker: QATracker instance
- @param repo_settings: Repository settings
- '''
- self.qatracker = qatracker
- self.repo_settings = repo_settings
-
- def check(self, pkg, ebuild):
- '''
- @param pkg: Package in which we check (object).
- @param ebuild: Ebuild which we check (object).
- '''
- eapi = pkg._metadata["EAPI"]
-
- if not self._checkBanned(ebuild, eapi):
- self._checkDeprecated(ebuild, eapi)
-
- def _checkBanned(self, ebuild, eapi):
- if self.repo_settings.repo_config.eapi_is_banned(eapi):
- self.qatracker.add_error(
- "repo.eapi.banned", "%s: %s" %
(ebuild.relative_path, eapi))
-
- return True
-
- return False
-
- def _checkDeprecated(self, ebuild, eapi):
- if self.repo_settings.repo_config.eapi_is_deprecated(eapi):
- self.qatracker.add_error(
- "repo.eapi.deprecated", "%s: %s" %
(ebuild.relative_path, eapi))
-
- return True
-
- return False
diff --git a/pym/repoman/modules/scan/eapi/__init__.py
b/pym/repoman/modules/scan/eapi/__init__.py
new file mode 100644
index 000..de586a8
--- /dev/null
+++ b/pym/repoman/modules/scan/eapi/__init__.py
@@ -0,0 +1,23 @@
+# Copyright 2015-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+doc = """Eapi plug-in module for repoman.
+Performs an IsEbuild check on ebuilds."""
+__doc__ = doc[:]
+
+
+module_spec = {
+ 'name': 'eapi',
+ 'description': doc,
+ 'provides':{
+ 'live-module': {
+ 'name': "eapi",
+ 'class': "EAPIChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_kwargs': {
+ },
+ },
+ }
+}
+
diff --git a/pym/repoman/modules/scan/eapi/eapi.py
b/pym/repoman/modules/scan/eapi/eapi.py
new file mode 100644
index 000..1190b1a
--- /dev/null
+++ b/pym/repoman/modules/scan/eapi/eapi.py
@@ -0,0 +1,49 @@
+
+'''eapi.py
+Perform checks on the EAPI variable.
+'''
+
+
+class EAPIChecks(object):
+ '''Perform checks on the EAPI variable.'''
+
+ def __init__(self, **kwargs):
+ '''
+ @param qatracker: QATracker instance
+ @param repo_settings: Repository settings
+ '''
+ self.qatracker = kwargs.get('qatracker')
+ self.repo_settings = kwargs.get('repo_settings')
+
+ def check(self, **kwargs):
+ '''
+ @param pkg: Package in which we check (object).
+ @param ebuild: Ebuild which we check (object).
+ '''
+ ebuild = kwargs.get('ebuild')
+
+ if not self._checkBanned(ebuild):
+ self._checkDeprecated(ebuild)
+ return {'continue': False}
+
+ def _checkBanned(self, ebuild):
+ if self.repo_settings.repo_config.eapi_is_banned(ebuild.eapi):
+ self.qatracker.add_error(
+ "repo.eapi.banned", "%s: %s" %
(ebuild.relative_path, ebuild.eapi))
+ return True
+ return False
+
+ def _checkDeprecated(self, ebuild):
+ if
self.repo_settings.repo_config.eapi_is_deprecated(ebuild.eapi):
+ self.qatracker.add_error(
+ "repo.eapi.deprecated", "%s: %s" %
(ebuild.relative_path, ebuild.eapi))
+ return True
+ return False
+
+
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/ebuilds/eclasses/, ...
commit: 6d0d5f4507fa95bd357e9119aef802c95fc48324
Author: Brian Dolbec gentoo org>
AuthorDate: Fri Jan 8 08:15:22 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 19:20:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=6d0d5f45
repoman: Create LiveEclassChecks class plugin
pym/repoman/checks/ebuilds/eclasses/live.py | 39 --
pym/repoman/modules/scan/eclasses/__init__.py | 23
pym/repoman/modules/scan/eclasses/live.py | 75 +++
pym/repoman/repos.py | 10
pym/repoman/scanner.py| 12 ++---
5 files changed, 102 insertions(+), 57 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/eclasses/live.py
b/pym/repoman/checks/ebuilds/eclasses/live.py
deleted file mode 100644
index bf14cff..000
--- a/pym/repoman/checks/ebuilds/eclasses/live.py
+++ /dev/null
@@ -1,39 +0,0 @@
-
-'''live.py
-Performs Live eclass checks
-'''
-
-from repoman.repos import has_global_mask
-
-
-class LiveEclassChecks(object):
- '''Performs checks for the usage of Live eclasses in ebuilds'''
-
- def __init__(self, qatracker):
- '''
- @param qatracker: QATracker instance
- '''
- self.qatracker = qatracker
-
- def check(self, pkg, package, ebuild, y_ebuild, keywords,
global_pmaskdict):
- '''Ebuilds that inherit a "Live" eclass (darcs, subversion,
git, cvs,
- etc..) should not be allowed to be marked stable
-
- @param pkg: Package in which we check (object).
- @param package: Package in which we check (string).
- @param ebuild: Ebuild which we check (object).
- @param y_ebuild: Ebuild which we check (string).
- @param keywords: The keywords of the ebuild.
- @param global_pmaskdict: A global dictionary of all the masks.
- '''
- is_stable = lambda kw: not kw.startswith("~") and not
kw.startswith("-")
- bad_stable_keywords = list(filter(is_stable, keywords))
-
- if bad_stable_keywords:
- self.qatracker.add_error(
- "LIVEVCS.stable", "%s/%s.ebuild with stable
keywords:%s " % (
- package, y_ebuild, bad_stable_keywords))
-
- good_keywords_exist = len(bad_stable_keywords) < len(keywords)
- if good_keywords_exist and not has_global_mask(pkg,
global_pmaskdict):
- self.qatracker.add_error("LIVEVCS.unmasked",
ebuild.relative_path)
diff --git a/pym/repoman/modules/scan/eclasses/__init__.py
b/pym/repoman/modules/scan/eclasses/__init__.py
new file mode 100644
index 000..a821f5c
--- /dev/null
+++ b/pym/repoman/modules/scan/eclasses/__init__.py
@@ -0,0 +1,23 @@
+# Copyright 2015-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+doc = """Eclasses plug-in module for repoman.
+Performs an live and ruby eclass checks on ebuilds."""
+__doc__ = doc[:]
+
+
+module_spec = {
+ 'name': 'eclasses',
+ 'description': doc,
+ 'provides':{
+ 'live-module': {
+ 'name': "live",
+ 'class': "LiveEclassChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_kwargs': {
+ },
+ },
+ }
+}
+
diff --git a/pym/repoman/modules/scan/eclasses/live.py
b/pym/repoman/modules/scan/eclasses/live.py
new file mode 100644
index 000..3216dd1
--- /dev/null
+++ b/pym/repoman/modules/scan/eclasses/live.py
@@ -0,0 +1,75 @@
+
+'''live.py
+Performs Live eclass checks
+'''
+
+from repoman._portage import portage
+from portage.const import LIVE_ECLASSES
+
+class LiveEclassChecks(object):
+ '''Performs checks for the usage of Live eclasses in ebuilds'''
+
+ def __init__(self, **kwargs):
+ '''
+ @param qatracker: QATracker instance
+ '''
+ self.qatracker = kwargs.get('qatracker')
+ self.pmaskdict = kwargs.get('repo_metadata')['pmaskdict']
+ self.repo_settings = kwargs.get('repo_settings')
+
+ def is_live(self, **kwargs):
+ return {'continue': False,
+ 'live_ebuild': LIVE_ECLASSES.intersection(
+ kwargs.get('ebuild').inherited)}
+
+ def check(self, **kwargs):
+ '''Ebuilds that inherit a "Live" eclass (darcs, subversion,
git, cvs,
+ etc..) should not be allowed to be marked stable
+
+ @param pkg: Package in which we check (object).
+ @param package: Package in which we check (string).
+ @param ebuild: Ebuild which we check (object).
+ @param y_ebuild: Ebuild wh
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/depend/
commit: 435bde48afe0926e4e4d3e9671d6378954053c21
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 20:38:11 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 19:20:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=435bde48
repoman: New DependChecks plugin
Migrate code from _scan_ebuilds to the plugin system
pym/repoman/modules/scan/depend/__init__.py | 23 +
pym/repoman/modules/scan/depend/depend.py | 132
pym/repoman/scanner.py | 119 ++---
3 files changed, 162 insertions(+), 112 deletions(-)
diff --git a/pym/repoman/modules/scan/depend/__init__.py
b/pym/repoman/modules/scan/depend/__init__.py
new file mode 100644
index 000..73d3f8f
--- /dev/null
+++ b/pym/repoman/modules/scan/depend/__init__.py
@@ -0,0 +1,23 @@
+# Copyright 2015-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+doc = """Depend plug-in module for repoman.
+Performs Dependency checks on ebuilds."""
+__doc__ = doc[:]
+
+
+module_spec = {
+ 'name': 'depend',
+ 'description': doc,
+ 'provides':{
+ 'depend-module': {
+ 'name': "depend",
+ 'class': "DependChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
+ }
+}
+
diff --git a/pym/repoman/modules/scan/depend/depend.py
b/pym/repoman/modules/scan/depend/depend.py
new file mode 100644
index 000..8a0ff48
--- /dev/null
+++ b/pym/repoman/modules/scan/depend/depend.py
@@ -0,0 +1,132 @@
+
+from _emerge.Package import Package
+
+from repoman.check_missingslot import check_missingslot
+# import our initialized portage instance
+from repoman._portage import portage
+from repoman.qa_data import suspect_virtual, suspect_rdepend
+
+
+class DependChecks(object):
+
+ def __init__(self, **kwargs):
+ self.qatracker = kwargs.get('qatracker')
+ self.portdb = kwargs.get('portdb')
+
+ def check(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
+ pkg = kwargs.get('pkg')
+
+ unknown_pkgs = set()
+
+ inherited_java_eclass = "java-pkg-2" in ebuild.inherited or \
+ "java-pkg-opt-2" in ebuild.inherited,
+ inherited_wxwidgets_eclass = "wxwidgets" in ebuild.inherited
+ # operator_tokens = set(["||", "(", ")"])
+ type_list, badsyntax = [], []
+ for mytype in Package._dep_keys + ("LICENSE", "PROPERTIES",
"PROVIDE"):
+ mydepstr = ebuild.metadata[mytype]
+
+ buildtime = mytype in Package._buildtime_keys
+ runtime = mytype in Package._runtime_keys
+ token_class = None
+ if mytype.endswith("DEPEND"):
+ token_class = portage.dep.Atom
+
+ try:
+ atoms = portage.dep.use_reduce(
+ mydepstr, matchall=1, flat=True,
+ is_valid_flag=pkg.iuse.is_valid_flag,
token_class=token_class)
+ except portage.exception.InvalidDependString as e:
+ atoms = None
+ badsyntax.append(str(e))
+
+ if atoms and mytype.endswith("DEPEND"):
+ if runtime and \
+ "test?" in mydepstr.split():
+ self.qatracker.add_error(
+ mytype + '.suspect',
+ "%s: 'test?' USE conditional in
%s" %
+ (ebuild.relative_path, mytype))
+
+ for atom in atoms:
+ if atom == "||":
+ continue
+
+ is_blocker = atom.blocker
+
+ # Skip dependency.unknown for blockers,
so that we
+ # don't encourage people to remove
necessary blockers,
+ # as discussed in bug 382407. We use
atom.without_use
+ # due to bug 525376.
+ if not is_blocker and \
+ not
self.portdb.xmatch("match-all", atom.without_use) and \
+ not
atom.cp.startswith("virtual/"):
+ unknown_pkgs.add((mytype,
atom.unevaluated_atom))
+
+
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/metadata/
commit: 22c3194ea5023a9b5c399642498f0b38c82e2530
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 11:56:25 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 19:20:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=22c3194e
repoman: Migrate more metadata checks to ebuild_metadata.py
.../modules/scan/metadata/ebuild_metadata.py | 32 --
pym/repoman/scanner.py | 17
2 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/pym/repoman/modules/scan/metadata/ebuild_metadata.py
b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
index 2dc1db2..77c947e 100644
--- a/pym/repoman/modules/scan/metadata/ebuild_metadata.py
+++ b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
@@ -5,6 +5,8 @@
import re
import sys
+from repoman.qa_data import missingvars
+
if sys.hexversion >= 0x300:
basestring = str
@@ -16,7 +18,7 @@ class EbuildMetadata(object):
def __init__(self, **kwargs):
self.qatracker = kwargs.get('qatracker')
- def check(self, **kwargs):
+ def invalidchar(self, **kwargs):
ebuild = kwargs.get('ebuild')
for k, v in ebuild.metadata.items():
if not isinstance(v, basestring):
@@ -28,9 +30,35 @@ class EbuildMetadata(object):
"%s: %s variable contains non-ASCII "
"character at position %s" %
(ebuild.relative_path, k, m.start() +
1))
+ return {'continue': False}
+
+ def missing(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
+ for pos, missing_var in enumerate(missingvars):
+ if not ebuild.metadata.get(missing_var):
+ if kwargs.get('catdir') == "virtual" and \
+ missing_var in ("HOMEPAGE", "LICENSE"):
+ continue
+ if kwargs.get('live_ebuild') and missing_var ==
"KEYWORDS":
+ continue
+ myqakey = missingvars[pos] + ".missing"
+ self.qatracker.add_error(myqakey, '%s/%s.ebuild'
+ % (kwargs.get('xpkg'),
kwargs.get('y_ebuild')))
+ return {'continue': False}
+
+ def old_virtual(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
if ebuild.metadata.get("PROVIDE"):
self.qatracker.add_error("virtual.oldstyle",
ebuild.relative_path)
+ return {'continue': False}
+ def virtual(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
+ if kwargs.get('catdir') == "virtual":
+ for var in ("HOMEPAGE", "LICENSE"):
+ if ebuild.metadata.get(var):
+ myqakey = var + ".virtual"
+ self.qatracker.add_error(myqakey,
ebuild.relative_path)
return {'continue': False}
@property
@@ -39,4 +67,4 @@ class EbuildMetadata(object):
@property
def runInEbuilds(self):
- return (True, [self.check])
+ return (True, [self.invalidchar, self.missing,
self.old_virtual, self.virtual])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 46f46f5..d42fd33 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -324,23 +324,6 @@ class Scanner(object):
if y_ebuild_continue:
continue
-
- for pos, missing_var in enumerate(missingvars):
- if not
dynamic_data['ebuild'].metadata.get(missing_var):
- if dynamic_data['catdir'] == "virtual"
and \
- missing_var in ("HOMEPAGE",
"LICENSE"):
- continue
- if dynamic_data['live_ebuild'] and
missing_var == "KEYWORDS":
- continue
- myqakey = missingvars[pos] + ".missing"
- self.qatracker.add_error(myqakey, xpkg
+ "/" + y_ebuild + ".ebuild")
-
- if dynamic_data['catdir'] == "virtual":
- for var in ("HOMEPAGE", "LICENSE"):
- if
dynamic_data['ebuild'].metadata.get(var):
- myqakey = var + ".virtual"
-
self.qatracker.add_error(myqakey, dynamic_data['ebuild'].relative_path)
-
if dynami
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/modules/scan/arches/
commit: b392459cc67b64ab8cc0f75b6bdf554833a8b202
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 19:11:22 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 19:20:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=b392459c
repoman: Create a new ArchChecks class plugin
pym/repoman/modules/scan/arches/__init__.py | 23 +++
pym/repoman/modules/scan/arches/arches.py | 64 +
pym/repoman/scanner.py | 47 +
3 files changed, 89 insertions(+), 45 deletions(-)
diff --git a/pym/repoman/modules/scan/arches/__init__.py
b/pym/repoman/modules/scan/arches/__init__.py
new file mode 100644
index 000..b570dac
--- /dev/null
+++ b/pym/repoman/modules/scan/arches/__init__.py
@@ -0,0 +1,23 @@
+# Copyright 2015-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+doc = """Arches plug-in module for repoman.
+Performs archs checks on ebuilds."""
+__doc__ = doc[:]
+
+
+module_spec = {
+ 'name': 'arches',
+ 'description': doc,
+ 'provides':{
+ 'archs-module': {
+ 'name': "arches",
+ 'class': "ArchChecks",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
+ }
+}
+
diff --git a/pym/repoman/modules/scan/arches/arches.py
b/pym/repoman/modules/scan/arches/arches.py
new file mode 100644
index 000..2c32028
--- /dev/null
+++ b/pym/repoman/modules/scan/arches/arches.py
@@ -0,0 +1,64 @@
+# -*- coding:utf-8 -*-
+
+
+class ArchChecks(object):
+
+ def __init__(self, **kwargs):
+ self.options = kwargs.get('options')
+ self.repo_settings = kwargs.get('repo_settings')
+ self.profiles = kwargs.get('profiles')
+
+ def check(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
+ if self.options.ignore_arches:
+ arches = [[
+ self.repo_settings.repoman_settings["ARCH"],
self.repo_settings.repoman_settings["ARCH"],
+
self.repo_settings.repoman_settings["ACCEPT_KEYWORDS"].split()]]
+ else:
+ arches = set()
+ for keyword in ebuild.keywords:
+ if keyword[0] == "-":
+ continue
+ elif keyword[0] == "~":
+ arch = keyword[1:]
+ if arch == "*":
+ for expanded_arch in
self.profiles:
+ if expanded_arch ==
"**":
+ continue
+ arches.add(
+ (keyword,
expanded_arch, (
+
expanded_arch, "~" + expanded_arch)))
+ else:
+ arches.add((keyword, arch,
(arch, keyword)))
+ else:
+ # For ebuilds with stable keywords,
check if the
+ # dependencies are satisfiable for
unstable
+ # configurations, since use.stable.mask
is not
+ # applied for unstable configurations
(see bug
+ # 563546).
+ if keyword == "*":
+ for expanded_arch in
self.profiles:
+ if expanded_arch ==
"**":
+ continue
+ arches.add(
+ (keyword,
expanded_arch, (expanded_arch,)))
+ arches.add(
+ (keyword,
expanded_arch,
+
(expanded_arch, "~" + expanded_arch)))
+ else:
+ arches.add((keyword, keyword,
(keyword,)))
+ arches.add((keyword, keyword,
+ (keyword, "~" +
keyword)))
+ if not arches:
+ # Use an empty profile for checking
dependencies of
+
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/, pym/repoman/, pym/repoman/modules/scan/mirrors/
commit: 582926eb82f54d4e6396c7ac94ee0ecc27a6c288
Author: Brian Dolbec gentoo org>
AuthorDate: Fri Jan 8 01:29:42 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 19:20:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=582926eb
repoman: Create the ThirdPartyMirrors class plugin
pym/repoman/checks/ebuilds/thirdpartymirrors.py| 39 --
pym/repoman/modules/scan/mirrors/__init__.py | 23 +
.../modules/scan/mirrors/thirdpartymirrors.py | 59 ++
pym/repoman/scanner.py | 6 +--
4 files changed, 85 insertions(+), 42 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/thirdpartymirrors.py
b/pym/repoman/checks/ebuilds/thirdpartymirrors.py
deleted file mode 100644
index 848dfb9..000
--- a/pym/repoman/checks/ebuilds/thirdpartymirrors.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding:utf-8 -*-
-
-# import our initialized portage instance
-from repoman._portage import portage
-
-
-class ThirdPartyMirrors(object):
-
- def __init__(self, repoman_settings, qatracker):
- # TODO: Build a regex instead here, for the SRC_URI.mirror
check.
- self.thirdpartymirrors = {}
- profile_thirdpartymirrors =
repoman_settings.thirdpartymirrors().items()
- for mirror_alias, mirrors in profile_thirdpartymirrors:
- for mirror in mirrors:
- if not mirror.endswith("/"):
- mirror += "/"
- self.thirdpartymirrors[mirror] = mirror_alias
-
- self.qatracker = qatracker
-
- def check(self, myaux, relative_path):
- # Check that URIs don't reference a server from
thirdpartymirrors.
- for uri in portage.dep.use_reduce(
- myaux["SRC_URI"], matchall=True, is_src_uri=True,
- eapi=myaux["EAPI"], flat=True):
- contains_mirror = False
- for mirror, mirror_alias in
self.thirdpartymirrors.items():
- if uri.startswith(mirror):
- contains_mirror = True
- break
- if not contains_mirror:
- continue
-
- new_uri = "mirror://%s/%s" % (mirror_alias,
uri[len(mirror):])
- self.qatracker.add_error(
- "SRC_URI.mirror",
- "%s: '%s' found in thirdpartymirrors, use '%s'"
% (
- relative_path, mirror, new_uri))
- return
diff --git a/pym/repoman/modules/scan/mirrors/__init__.py
b/pym/repoman/modules/scan/mirrors/__init__.py
new file mode 100644
index 000..37dfc53
--- /dev/null
+++ b/pym/repoman/modules/scan/mirrors/__init__.py
@@ -0,0 +1,23 @@
+# Copyright 2015-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+doc = """Mirrors plug-in module for repoman.
+Performs third party mirrors checks on ebuilds."""
+__doc__ = doc[:]
+
+
+module_spec = {
+ 'name': 'mirrors',
+ 'description': doc,
+ 'provides':{
+ 'mirrors-module': {
+ 'name': "thirdpartymirrors",
+ 'class': "ThirdPartyMirrors",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
+ }
+}
+
diff --git a/pym/repoman/modules/scan/mirrors/thirdpartymirrors.py
b/pym/repoman/modules/scan/mirrors/thirdpartymirrors.py
new file mode 100644
index 000..9404e28
--- /dev/null
+++ b/pym/repoman/modules/scan/mirrors/thirdpartymirrors.py
@@ -0,0 +1,59 @@
+# -*- coding:utf-8 -*-
+
+# import our initialized portage instance
+from repoman._portage import portage
+from repoman.modules.scan.scanbase import ScanBase
+
+
+class ThirdPartyMirrors(ScanBase):
+
+ def __init__(self, **kwargs):
+ '''Class init
+
+ @param repo_settings: settings instance
+ @param qatracker: QATracker instance
+ '''
+ super(ThirdPartyMirrors, self).__init__(**kwargs)
+ repo_settings = kwargs.get('repo_settings')
+ self.qatracker = kwargs.get('qatracker')
+
+ # TODO: Build a regex instead here, for the SRC_URI.mirror
check.
+ self.thirdpartymirrors = {}
+ profile_thirdpartymirrors =
repo_settings.repoman_settings.thirdpartymirrors().items()
+ for mirror_alias, mirrors in profile_thirdpartymirrors:
+ for mirror in mirrors:
+ if not mirror.endswith("/"):
+ mirror += "/"
+
[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/metadata/, pym/repoman/
commit: e0d88104006627f24165ac88ef121025dc844952
Author: Brian Dolbec gentoo org>
AuthorDate: Sun Jan 3 10:35:49 2016 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Jan 18 19:20:03 2016 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e0d88104
repoman: Migrate code from _scan_ebuilds to a new EbuildMetadata class and check
pym/repoman/modules/scan/metadata/__init__.py | 10 +-
.../modules/scan/metadata/ebuild_metadata.py | 39 ++
pym/repoman/scanner.py | 27 +--
3 files changed, 49 insertions(+), 27 deletions(-)
diff --git a/pym/repoman/modules/scan/metadata/__init__.py
b/pym/repoman/modules/scan/metadata/__init__.py
index 7327ec0..eba6565 100644
--- a/pym/repoman/modules/scan/metadata/__init__.py
+++ b/pym/repoman/modules/scan/metadata/__init__.py
@@ -10,7 +10,7 @@ module_spec = {
'name': 'metadata',
'description': doc,
'provides':{
- 'metadata-module': {
+ 'pkg-metadata': {
'name': "pkgmetadata",
'class': "PkgMetadata",
'description': doc,
@@ -18,6 +18,14 @@ module_spec = {
'func_desc': {
},
},
+ 'ebuild-metadata': {
+ 'name': "ebuild_metadata",
+ 'class': "EbuildMetadata",
+ 'description': doc,
+ 'functions': ['check'],
+ 'func_desc': {
+ },
+ },
}
}
diff --git a/pym/repoman/modules/scan/metadata/ebuild_metadata.py
b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
new file mode 100644
index 000..143a40e
--- /dev/null
+++ b/pym/repoman/modules/scan/metadata/ebuild_metadata.py
@@ -0,0 +1,39 @@
+# -*- coding:utf-8 -*-
+
+'''Ebuild Metadata Checks'''
+
+import re
+import sys
+
+if sys.hexversion >= 0x300:
+ basestring = str
+
+NON_ASCII_RE = re.compile(r'[^\x00-\x7f]')
+
+
+class EbuildMetadata(object):
+
+ def __init__(self, **kwargs):
+ self.qatracker = kwargs.get('qatracker')
+
+ def check(self, **kwargs):
+ ebuild = kwargs.get('ebuild')
+ for k, v in ebuild.metadata.items():
+ if not isinstance(v, basestring):
+ continue
+ m = NON_ASCII_RE.search(v)
+ if m is not None:
+ self.qatracker.add_error(
+ "variable.invalidchar",
+ "%s: %s variable contains non-ASCII "
+ "character at position %s" %
+ (ebuild.relative_path, k, m.start() +
1))
+ return {'continue': False}
+
+ @property
+ def runInPkgs(self):
+ return (False, [])
+
+ @property
+ def runInEbuilds(self):
+ return (True, [self.check])
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index a8aa2f3..6f3fb53 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -5,8 +5,6 @@ from __future__ import print_function, unicode_literals
import copy
import io
import logging
-import re
-import sys
from itertools import chain
from pprint import pformat
@@ -47,18 +45,10 @@ MODULE_CONTROLLER = Modules(path=MODULES_PATH,
namepath="repoman.modules.scan")
MODULE_NAMES = MODULE_CONTROLLER.module_names[:]
-
-if sys.hexversion >= 0x300:
- basestring = str
-
-NON_ASCII_RE = re.compile(r'[^\x00-\x7f]')
-
-
def sort_key(item):
return item[2].sub_path
-
class Scanner(object):
'''Primary scan class. Operates all the small Q/A tests and checks'''
@@ -311,7 +301,7 @@ class Scanner(object):
# initialize per ebuild plugin checks here
# need to set it up for ==> self.modules_list or some
other ordered list
for mod in [('ebuild', 'Ebuild'), ('live',
'LiveEclassChecks'),
- ('eapi', 'EAPIChecks')]:
+ ('eapi', 'EAPIChecks'), ('ebuild_metadata',
'EbuildMetadata')]:
if mod[0]:
mod_class =
MODULE_CONTROLLER.get_class(mod[0])
logging.debug("Initializing class name:
%s", mod_class.__name__)
@@ -338,21 +328,6 @@ class Scanner(object):
if y_ebuild_continue:
continue
-
- for k, v in dynamic_data['ebuild'].metadata.items():
- if not isinstance(v, basestring):
- continue
- m = NON_ASCII_RE.search(v)
-
[gentoo-commits] repo/gentoo:master commit in: media-plugins/imlib2_loaders/
commit: b7e9f37c646024326dfd328424008b7655c61d1c
Author: Mike Frysinger gentoo org>
AuthorDate: Mon Jan 18 19:21:49 2016 +
Commit: Mike Frysinger gentoo org>
CommitDate: Mon Jan 18 19:22:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7e9f37c
media-plugins/imlib2_loaders: switch eet dep to efl #571796
The eet package is dead now and is replaced by the efl package.
media-plugins/imlib2_loaders/imlib2_loaders-1.4.7.ebuild | 4 ++--
media-plugins/imlib2_loaders/imlib2_loaders-.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-1.4.7.ebuild
b/media-plugins/imlib2_loaders/imlib2_loaders-1.4.7.ebuild
index 81893bd..8fb93aa 100644
--- a/media-plugins/imlib2_loaders/imlib2_loaders-1.4.7.ebuild
+++ b/media-plugins/imlib2_loaders/imlib2_loaders-1.4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -19,7 +19,7 @@ HOMEPAGE="https://www.enlightenment.org/pages/imlib2.html";
IUSE="eet xcf"
RDEPEND=">=media-libs/imlib2-${PV}
- eet? ( dev-libs/eet )"
+ eet? ( dev-libs/efl )"
src_configure() {
E_ECONF=(
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-.ebuild
b/media-plugins/imlib2_loaders/imlib2_loaders-.ebuild
index 81893bd..8fb93aa 100644
--- a/media-plugins/imlib2_loaders/imlib2_loaders-.ebuild
+++ b/media-plugins/imlib2_loaders/imlib2_loaders-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -19,7 +19,7 @@ HOMEPAGE="https://www.enlightenment.org/pages/imlib2.html";
IUSE="eet xcf"
RDEPEND=">=media-libs/imlib2-${PV}
- eet? ( dev-libs/eet )"
+ eet? ( dev-libs/efl )"
src_configure() {
E_ECONF=(
[gentoo-commits] repo/gentoo:master commit in: games-fps/alienarena/files/, games-fps/alienarena/
commit: e3a760e62c0a9d431cc9d3f7f84fa0e62ef5046b
Author: Tupone Alfredo gentoo org>
AuthorDate: Mon Jan 18 19:20:00 2016 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Mon Jan 18 19:20:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3a760e6
games-fps/alienarena: Fix format-security. Bug #571894
Package-Manager: portage-2.2.26
games-fps/alienarena/alienarena-20130827.ebuild | 8 ++--
games-fps/alienarena/files/alienarena-20130827-format.patch | 11 +++
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/games-fps/alienarena/alienarena-20130827.ebuild
b/games-fps/alienarena/alienarena-20130827.ebuild
index b07a3c2..4e19f1a 100644
--- a/games-fps/alienarena/alienarena-20130827.ebuild
+++ b/games-fps/alienarena/alienarena-20130827.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-inherit eutils gnome2-utils games
+inherit eutils gnome2-utils eutils games
MY_PN=alienarena-7.66
DESCRIPTION="Fast-paced multiplayer deathmatch game"
@@ -35,6 +35,10 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${MY_PN/_/.}
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-format.patch
+}
+
src_configure() {
egamesconf \
--with-icondir=/usr/share/icons/hicolor/48x48/apps/ \
diff --git a/games-fps/alienarena/files/alienarena-20130827-format.patch
b/games-fps/alienarena/files/alienarena-20130827-format.patch
new file mode 100644
index 000..4a88eab
--- /dev/null
+++ b/games-fps/alienarena/files/alienarena-20130827-format.patch
@@ -0,0 +1,11 @@
+--- source/game/p_client.c.old 2016-01-18 20:13:25.147714704 +0100
source/game/p_client.c 2016-01-18 20:13:38.776476727 +0100
+@@ -2123,7 +2123,7 @@
+ #else
+ ent->ctype = 0; //alien is default
+ sprintf(modelpath, "players/%s/human", playermodel);
+- sprintf(ent->charModel, playermodel);
++ sprintf(ent->charModel, "%s", playermodel);
+ Q2_FindFile (modelpath, &file);
+ if(file)
+ {
[gentoo-commits] proj/portage:master commit in: /
commit: d2b36c40342cae68983c14a464f9b1202a25ea1b Author: Brian Dolbec gentoo org> AuthorDate: Mon Jan 18 18:38:38 2016 + Commit: Brian Dolbec gentoo org> CommitDate: Mon Jan 18 18:38:38 2016 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=d2b36c40 Updates for the release NEWS | 6 ++ RELEASE-NOTES | 25 + setup.py | 2 +- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index dd04a44..48dd7f2 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,11 @@ News (mainly features/major bug fixes) + +portage-2.2.26 +-- +* EAPI 6 stable portage release + + portage-2.2.25 -- * EAPI 6 final fully implemented. diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 6a81495..6e3e591 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -1,6 +1,30 @@ Release Notes; upgrade information mainly. Features/major bugfixes are listed in NEWS +portage-2.2.27 +== +* Bug Fixes: +- Bug 532224 Fixes commit 28828655da86 @profile pkg set support +- Bug 566024 Fix logic when deep is True +- Bug 567932 SyncManager.sync: always return 4-tuple +- Bug 561686 _dep_check_composite_db._visible: verify that highest_visible + matches +- Bug 567920 Manifest._apply_max_mtime: account for removals and renames +- Bug 567746 repoman: use metadata.dtd from rsync tree if available +- Bug 568354 depgraph._resolve: consider unresolved @system atoms fatal +- Bug 567360 doebuild: Support finding lib* for ccache/distcc/icecc + masquerade dir +- Bug 568054 repoman: Do not check for PATCHES array in EAPI 6 and later. +- Bug 568934 flat_hash: enable md5 validation for /var/cache/edb/dep +- Bug 569942 elog/mod_save: fix CATEGORY KeyError +- Bug 486362 repoman: add clutter to inherit.deprecated +- Bug 562652 emaint/.../merges: Rename --purge-tracker option +- Bug 570530 INSTALL_MASK: enable matching of broken symlinks +- Bug 570672 emerge: Add --autounmask-only parameter +- Bug 570798 support bsddb3 module + + + portage-2.2.26 == * Bug Fixes: @@ -13,6 +37,7 @@ portage-2.2.26 - Bug 566704 depgraph: autounmask for conditional USE deps * other EAPI 6 code changes: eapply_user, several corrections + portage-2.2.25 == * Bug Fixes: diff --git a/setup.py b/setup.py index 3c0ce0c..62c2662 100755 --- a/setup.py +++ b/setup.py @@ -615,7 +615,7 @@ def get_manpages(): setup( name = 'portage', - version = '2.2.26', + version = '2.2.27', url = 'https://wiki.gentoo.org/wiki/Project:Portage', author = 'Gentoo Portage Development Team', author_email = 'dev-port...@gentoo.org',
[gentoo-commits] repo/gentoo:master commit in: dev-python/pymongo/
commit: 8290538a2cb2cb7905387bdabdbe4c4daea7e646
Author: Jauhien Piatlicki gentoo org>
AuthorDate: Sun Jan 17 16:14:13 2016 +
Commit: Jauhien Piatlicki gentoo org>
CommitDate: Mon Jan 18 18:44:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8290538a
dev-python/pymongo: version bump
Package-Manager: portage-2.2.26
dev-python/pymongo/Manifest | 1 +
dev-python/pymongo/pymongo-3.2.ebuild | 121 ++
2 files changed, 122 insertions(+)
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index 92d8eca..bc875d3 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -4,3 +4,4 @@ DIST pymongo-2.8.1.tar.gz 399521 SHA256
300ea5762d059c07d1bb2578f35bd0e55bc31753
DIST pymongo-2.9.tar.gz 430741 SHA256
90e994cfe5928841960dabdca709e75ab4d0f44b288fd59742113982d96290c4 SHA512
c12701797643b41503829b6c7e573cfff7d8c63c56d9eb195f1a67dc3204cd7ed2a28ee2bd2ce34d0c68bade3f44c8bd5c069b15082bf3388c3a401a35424b1e
WHIRLPOOL
699a7f658734837f40fe4190251f8e8bb69dba80bbc6dba60207bb18d5dfb43ec5d1c6aca8810b45e7914705305416d0f76face88fd0c43aa20c6d0765eff01c
DIST pymongo-3.0.3.tar.gz 419692 SHA256
3c6b2317f8031bc1e200fd1ea35f00a96f4569e3f3f220a5e66ab6227d96ccaf SHA512
7a20fdcae5b3f852bded19c95b36ef6a8141bce0179440a2c5966cbb9f18f3985b7b6b4584c5253c34d0f846d809d72ec0ae076c88472a3de6f090466e9132b4
WHIRLPOOL
ae610909b610c7d116dd3aa7c04ab9ce357b25208b07c025924c53bb36183a6d344ecff214def6a01b929dc50d698464c8dd33b6eafd2d88dd8534858a38
DIST pymongo-3.1.tar.gz 462030 SHA256
fe7033007100f825a67640e77abdafee28713f255da88fcfc8d6abad0bb34285 SHA512
886cfbffd4514741e92ad1c79e97ee443d5c9874c823b64c3c2f2566e3005d588d7dd4ae813c320c94f3e6e12b1dd8c7ad56f0e6d2ee419f0d66f4c38321c9ab
WHIRLPOOL
ec39a42738b751875b92ca8501ccc1711f8e474efef8cf2817525dc47e420e03b7a581d9e35e4f94f529e07a7d81499f7d6e9402c085d9e47861c8a691d1e37e
+DIST pymongo-3.2.tar.gz 473631 SHA256
f50a5380b45a83c5ea1e673ff19363d3cfd5850f7620536e51341d26eb2ae979 SHA512
e0962729bada4ee03cafebac4cd8a0da8abd2e1ef75672897b974e6752acbee247007c8bc5344a28b04b09bcd87c1cbef82e5e71e1b4fdd9074fc3bf56000d2c
WHIRLPOOL
b4e4ce729c0033071cb99436fd4d380e4818e4bd056c73aa1f2d8e6151ba03152db7426eeb7e9e8af94d6d7e7de63889201e0240cab3ec9b52e0690b3d1eea7c
diff --git a/dev-python/pymongo/pymongo-3.2.ebuild
b/dev-python/pymongo/pymongo-3.2.ebuild
new file mode 100644
index 000..8fbd7cd
--- /dev/null
+++ b/dev-python/pymongo/pymongo-3.2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
+
+inherit check-reqs distutils-r1
+
+DESCRIPTION="Python driver for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver
https://pypi.python.org/pypi/pymongo";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="doc kerberos test"
+
+RDEPEND="
+ kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ >=dev-db/mongodb-2.6.0
+ )
+"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+reqcheck() {
+ if use test; then
+ # During the tests, database size reaches 1.5G.
+ local CHECKREQS_DISK_BUILD=1536M
+
+ check-reqs_${1}
+ fi
+}
+
+pkg_pretend() {
+ reqcheck pkg_pretend
+}
+
+pkg_setup() {
+ reqcheck pkg_setup
+}
+
+python_compile_all() {
+ if use doc; then
+ mkdir html || die
+ sphinx-build doc html || die
+ fi
+}
+
+python_test() {
+ # Yes, we need TCP/IP for that...
+ local DB_IP=127.0.0.1
+ local DB_PORT=27000
+
+ export DB_IP DB_PORT
+
+ local dbpath=${TMPDIR}/mongo.db
+ local logpath=${TMPDIR}/mongod.log
+
+ # Now, the hard part: we need to find a free port for mongod.
+ # We're just trying to run it random port numbers and check the log
+ # for bind errors. It shall be noted that 'mongod --fork' does not
+ # return failure when it fails to bind.
+
+ mkdir -p "${dbpath}" || die
+ while true; do
+ ebegin "Trying to start mongod on port ${DB_PORT}"
+
+ LC_ALL=C \
+ mongod --dbpath "${dbpath}" --smallfiles --nojournal \
+ --bind_ip ${DB_IP} --port ${DB_PORT} \
+ --unixSocketPrefix "${TMPDIR}" \
+ --logpath "${logpath}" --fork \
+ && sleep 2
+
+ # Now we need to check if the server actually started...
+ if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]];
then
+ # yay!
+ eend
[gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/
commit: eccc8ee695ac470be84569a2a3e04ec9ef24b7fd
Author: Andreas Schuerch gentoo org>
AuthorDate: Mon Jan 18 18:34:59 2016 +
Commit: Andreas Schuerch gentoo org>
CommitDate: Mon Jan 18 18:36:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eccc8ee6
net-print/cups-filters: 1.5.0 stable on x86, see bug 567286
Package-Manager: portage-2.2.26
net-print/cups-filters/cups-filters-1.5.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-print/cups-filters/cups-filters-1.5.0.ebuild
b/net-print/cups-filters/cups-filters-1.5.0.ebuild
index 155d0f2..15dc57b 100644
--- a/net-print/cups-filters/cups-filters-1.5.0.ebuild
+++ b/net-print/cups-filters/cups-filters-1.5.0.ebuild
@@ -11,10 +11,10 @@ inherit base eutils perl-module autotools systemd
if [[ "${PV}" == "" ]] ; then
inherit bzr
EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters";
- KEYWORDS="alpha arm hppa ppc ppc64"
+ KEYWORDS="alpha arm hppa ppc ppc64 x86"
else
SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz";
- KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390
~sparc ~x86 ~amd64-fbsd ~m68k-mint"
+ KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390
~sparc x86 ~amd64-fbsd ~m68k-mint"
fi
DESCRIPTION="Cups PDF filters"
HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat";
[gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/
commit: c0e38f4f9bd8f6d115e0e1bb0621693046afaee0
Author: Andreas Sturmlechner gmail com>
AuthorDate: Sat Jan 16 22:03:22 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Mon Jan 18 18:33:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0e38f4f
kde-apps/konsole: Auto-block slot 4 again
Package-Manager: portage-2.2.26
.../konsole/{konsole-15.08.3.ebuild => konsole-15.08.3-r1.ebuild} | 8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/kde-apps/konsole/konsole-15.08.3.ebuild
b/kde-apps/konsole/konsole-15.08.3-r1.ebuild
similarity index 89%
rename from kde-apps/konsole/konsole-15.08.3.ebuild
rename to kde-apps/konsole/konsole-15.08.3-r1.ebuild
index b73cd81..b89b816 100644
--- a/kde-apps/konsole/konsole-15.08.3.ebuild
+++ b/kde-apps/konsole/konsole-15.08.3-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-KDE_BLOCK_SLOT4="false"
KDE_HANDBOOK="forceoptional"
KDE_TEST="true"
VIRTUALX_REQUIRED="test"
@@ -47,10 +46,7 @@ DEPEND="
dev-qt/qtxml:5
X? ( x11-libs/libX11 )
"
-RDEPEND="${DEPEND}
- !kde-apps/konsole:4[handbook]
- !kde-apps/konsole:4[-minimal(-)]
-"
+RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
[gentoo-commits] repo/gentoo:master commit in: kde-apps/konsole/
commit: 4296fbfe17f53dd61af679ea74c22e9c42c9c1e1
Author: Andreas Sturmlechner gmail com>
AuthorDate: Sat Jan 16 21:59:52 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Mon Jan 18 18:33:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4296fbfe
kde-apps/konsole: Drop USE=minimal
Now there is konsolepart, prevent users from ending up without konsole
binary after rebuild, following the switch to plasma profile.
Package-Manager: portage-2.2.26
kde-apps/konsole/konsole-4.14.3-r1.ebuild | 55 ---
kde-apps/konsole/konsole-4.14.3.ebuild| 13 ++--
2 files changed, 2 insertions(+), 66 deletions(-)
diff --git a/kde-apps/konsole/konsole-4.14.3-r1.ebuild
b/kde-apps/konsole/konsole-4.14.3-r1.ebuild
deleted file mode 100644
index f5cb4e9..000
--- a/kde-apps/konsole/konsole-4.14.3-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KDE_DOC_DIRS="doc/manual"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit kde4-base
-
-DESCRIPTION="X terminal for use with KDE"
-HOMEPAGE="https://www.kde.org/applications/system/konsole
https://konsole.kde.org";
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug minimal"
-
-COMMONDEPEND="
- !aqua? (
- x11-libs/libX11
- x11-libs/libXext
- >=x11-libs/libxklavier-3.2
- x11-libs/libXrender
- x11-libs/libXtst
- !minimal? ( $(add_kdeapps_dep libkonq) )
- )
-"
-DEPEND="${COMMONDEPEND}
- !aqua? (
- x11-apps/bdftopcf
- x11-proto/kbproto
- x11-proto/renderproto
- )
-"
-RDEPEND="${COMMONDEPEND}"
-
-# can't connect to a kded instance, fails to connect to dbus
-RESTRICT="test"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_with "!minimal" LibKonq)
- )
-
- kde4-base_src_configure
-}
-
-src_install() {
- kde4-base_src_install
-
- if use minimal; then
- rm "${D}/usr/bin/konsole" || die
- rm "${D}/usr/bin/konsoleprofile" || die
- fi
-}
diff --git a/kde-apps/konsole/konsole-4.14.3.ebuild
b/kde-apps/konsole/konsole-4.14.3.ebuild
index e1a86c6..a43086a 100644
--- a/kde-apps/konsole/konsole-4.14.3.ebuild
+++ b/kde-apps/konsole/konsole-4.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ inherit kde4-base
DESCRIPTION="X terminal for use with KDE"
HOMEPAGE="https://www.kde.org/applications/system/konsole
https://konsole.kde.org";
KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug minimal"
+IUSE="debug"
COMMONDEPEND="
!aqua? (
@@ -36,12 +36,3 @@ RDEPEND="${COMMONDEPEND}"
# can't connect to a kded instance, fails to connect to dbus
RESTRICT="test"
-
-src_install() {
- kde4-base_src_install
-
- if use minimal; then
- rm "${D}/usr/bin/konsole" || die
- rm "${D}/usr/bin/konsoleprofile" || die
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/files/, sci-geosciences/merkaartor/
commit: 469204d2eb46c95572471d9fea1b2339b334c314
Author: Amy Winston gentoo org>
AuthorDate: Mon Jan 18 18:28:31 2016 +
Commit: Amy Winston gentoo org>
CommitDate: Mon Jan 18 18:28:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=469204d2
sci-geosciences/merkaartor: compatibility with gdal bug #554304. By wraeth
Package-Manager: portage-2.2.24
sci-geosciences/merkaartor/Manifest| 1 -
.../merkaartor/files/merkaartor-gdal-2-fix.patch | 212 +
18.1-r1.ebuild => merkaartor-0.18.1-r2.ebuild} | 6 +-
.../merkaartor/merkaartor-0.18.1.ebuild| 69 ---
4 files changed, 217 insertions(+), 71 deletions(-)
diff --git a/sci-geosciences/merkaartor/Manifest
b/sci-geosciences/merkaartor/Manifest
index 9950ede..1b431ef 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,3 +1,2 @@
DIST merkaartor-0.17.2.tar.bz2 7138991 SHA256
425f4facefbf20a3dd1a09ee61ff8a8912482d1a30c957c50869d8ff59ba702a SHA512
3718131d855ad6ea17537c7879a3249f25f6f5aaaf00e2e59df10c5497a628f0877f85129a209d11dc969b5771598f9989cc6ca3a972dab4c3eaef507784d4ed
WHIRLPOOL
22a07736e7da44d3799831352d0e9d323143f228dcf7693b6f90fe101a8a04c74c2c5186db15723902b7dd8aadd93a78547e4622b5238ceb7074027e987b8487
-DIST merkaartor-0.18.1.tar.bz2 5579080 SHA256
3d6a96599815d5f1c8558acd255a413ea47b93ddad8414147d11775a6f21139f SHA512
d45b25ad5a7f19b32ca3e91ad514ef1a8450024bdab9e8c215f60a5ec3fc6332a5cadfcec586a32805c7727d224588b504b01d3023120d55476660a8a394cd45
WHIRLPOOL
23327a7eaa91531a95665fe9ff647712606babf96e3843ef33b94a37f6f7ca6d1cb09576b0b31197badc32e87cfc7ca275a9e3792e57f57dd58fe0509ec1b46d
DIST merkaartor-0.18.1.tar.gz 6459640 SHA256
e9fa5e30e6392c9224f73e9bb7d17b66c4eb6c023633eb2af0cf58ba8acf684f SHA512
5ccb2aca7463cd3b31790b0f231cd18f4499b38ec3eb14c3600bdaae880194a71aaf63a2c2f814af6277b1b07fd618b4393309aa5ded375940bd464d1e77d71d
WHIRLPOOL
fde10a93510c123f2e1065ad745c3abc7860892c55ed615e75214dd172bfbec1da6f254377cc2d6e0f1df6f9d0680d0f7878ba3224651f5b09c590c335211d9c
diff --git a/sci-geosciences/merkaartor/files/merkaartor-gdal-2-fix.patch
b/sci-geosciences/merkaartor/files/merkaartor-gdal-2-fix.patch
new file mode 100644
index 000..4197610
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-gdal-2-fix.patch
@@ -0,0 +1,212 @@
+--- a/src/ImportExport/ImportExportGdal.cpp 2015-06-15 18:48:39.604575423 +0200
b/src/ImportExport/ImportExportGdal.cpp 2015-06-15 18:48:39.604575423 +0200
+@@ -21,10 +21,13 @@
+ #include "ProjectionChooser.h"
+ #include "Global.h"
+
+-#include "cpl_vsi.h"
++#include
++#include
++#include
+
+ #include
+
++
+ bool parseContainer(QDomElement& e, Layer* aLayer);
+
+ ImportExportGdal::ImportExportGdal(Document* doc)
+@@ -55,6 +58,55 @@ bool ImportExportGdal::saveFile(QString)
+ bool ImportExportGdal::export_(const QList& featList)
+ {
+ const char *pszDriverName = "SQLite";
++QString fileName(HOMEDIR + "/test.sqlite");
++#ifdef GDAL2
++GDALDriver *poDriver;
++GDALDriverManager *driverManager = GetGDALDriverManager();
++GDALAllRegister();
++driverManager->AutoLoadDrivers();
++
++poDriver = driverManager->GetDriverByName(pszDriverName);
++if( poDriver == NULL )
++{
++qDebug( "%s driver not available.", pszDriverName );
++return false;
++}
++
++/* Create create options */
++char **createOptions = NULL;
++createOptions = CSLSetNameValue( createOptions, "SPATIALITE", "YES" );
++
++/* Open new dataset */
++GDALDataset *poDS;
++
++QFile::remove(fileName);
++poDS = poDriver->Create( fileName.toUtf8().constData(), 0, 0, 0,
GDT_Unknown, createOptions );
++if( poDS == NULL )
++{
++qDebug( "Creation of output file failed." );
++return false;
++}
++poDS->ExecuteSQL("PRAGMA synchronous = OFF", NULL, NULL);
++
++/* Create Spatial reference object */
++OGRSpatialReference *poSRS;
++poSRS = new OGRSpatialReference();
++poSRS->importFromEPSG(4326);
++
++/* Create layer options */
++char **layerOptions = NULL;
++layerOptions = CSLSetNameValue( layerOptions, "FORMAT", "SPATIALITE" );
++layerOptions = CSLSetNameValue( layerOptions, "SPATIAL_INDEX", "YES" );
++
++/* Create layer */
++OGRLayer *poLayer;
++poLayer = poDS->CreateLayer( "osm", poSRS, wkbUnknown, layerOptions);
++
++/* Free the options */
++CSLDestroy( createOptions );
++CSLDestroy( layerOptions );
++#else
++/* This is legacy code, and is not tested at all */
+ OGRSFDriver *poDriver;
+
+ OGRRegisterAll();
+@@ -68,8 +120,8 @@ bool ImportExportGdal::export_(const QList&
featList)
+
+ OGRDataSource *poDS;
+
+-QFile::remove(QString(HOMEDIR + "/test.sqlite"));
+-poDS = poDriver->CreateDataSource( QString(HOMEDIR +
"/test.sqlite").toUtf8().constData(), NULL );
++QFile::remove(fileName);
++poDS = poDriver->Creat
[gentoo-commits] repo/gentoo:master commit in: dev-python/pygments/
commit: 45c0de8fa6ee02f85d2039698e0b882fd362ccee
Author: Dirkjan Ochtman gentoo org>
AuthorDate: Mon Jan 18 18:23:20 2016 +
Commit: Dirkjan Ochtman gentoo org>
CommitDate: Mon Jan 18 18:23:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c0de8f
dev-python/pygments: version bump to 2.1
Package-Manager: portage-2.2.26
dev-python/pygments/Manifest| 1 +
dev-python/pygments/pygments-2.1.ebuild | 52 +
2 files changed, 53 insertions(+)
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 35a8030..867492f 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1 +1,2 @@
DIST Pygments-2.0.2.tar.gz 3462280 SHA256
7320919084e6dac8f4540638a46447a3bd730fca172afc17d2c03eed22cf4f51 SHA512
b58e2cc535ba3f1fda7cb147e12af128bc2755de56cf465f8f1d642730eaef50c06551cc4cc44f25f726b00f3f1c9c2078977233b11c0b6a7e1add6a4069c27e
WHIRLPOOL
4c98134f27dd29c89e4d6157284bdeecaa81c53d823e089292be21a6c418ba4ccfd458ced50326d5a356a7b6cb761a1990440096f5f3d820f776bb19fc0da09d
+DIST Pygments-2.1.tar.gz 2078224 SHA256
13a0ef5fafd7b16cf995bc28fe7aab0780dab1b2fda0fc89e033709af8b8a47b SHA512
4103a636a23d4a7f26c1eb98dc0d2386be17031715ceabb0f1dafb78f2635d8a7f2fe02ff7659c63fbc5c778dff9053c8ef2d916bbbab53841e2b0fafe64c213
WHIRLPOOL
81c5c5d110d2813acc12b7fb1800560189a37b51a2720dae2c9b612ec7c694fa381953491eab336a92ebf290fec505bea850fc0a8288f4b0964cfab0134dae8b
diff --git a/dev-python/pygments/pygments-2.1.ebuild
b/dev-python/pygments/pygments-2.1.ebuild
new file mode 100644
index 000..4e0af7e
--- /dev/null
+++ b/dev-python/pygments/pygments-2.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1 bash-completion-r1 vcs-snapshot
+
+MY_PN="Pygments"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pygments is a syntax highlighting package written in Python"
+HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments";
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
~x86-solaris"
+IUSE="doc test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ virtual/ttf-fonts )"
+# dev-texlive/texlive-latexrecommended
+# Removing / commenting out this dep. I can find no mention of it in tests
other than
+# importing pygment's own tex module. If it's there and I missed it just
uncomment and re-add
+# Tests pass without it
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+ use doc && emake -C doc html
+}
+
+python_test() {
+ cp -r -l tests "${BUILD_DIR}"/ || die
+ # With pypy3 there is 1 error out of 1556 tests when run as is and
+ # (SKIP=8, errors=1, failures=1) when run with 2to3; meh
+ nosetests -w "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/_build/html/. )
+
+ distutils-r1_python_install_all
+ newbashcomp external/pygments.bashcomp pygmentize
+}
[gentoo-commits] proj/kde:master commit in: sets/
commit: f992c698880c22f38e54c0bda229e1e4dac936a9 Author: Andreas Sturmlechner gmail com> AuthorDate: Mon Jan 18 18:13:25 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Mon Jan 18 18:20:48 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f992c698 sets: Update kde and kde-4.14 sets/kde | 2 +- sets/kde-4.14 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sets/kde b/sets/kde index f94f71e..e93739d 100644 --- a/sets/kde +++ b/sets/kde @@ -2,7 +2,7 @@ # We don't include kdesdk on the global set kde-apps/kate-4.14.50 kde-apps/kde4-l10n-4.14.50 -kde-base/kde-meta:4 +kde-apps/kde-meta:4 kde-base/kdeplasma-addons:4 @kdeaccessibility diff --git a/sets/kde-4.14 b/sets/kde-4.14 index 7325d29..ef64150 100644 --- a/sets/kde-4.14 +++ b/sets/kde-4.14 @@ -1,7 +1,7 @@ # We don't include kdesdk on the global set
[gentoo-commits] proj/kde:master commit in: Documentation/package.accept_keywords/, Documentation/package.unmask/, ...
commit: e4107cc2618a3b6371b277f4fe4fb432ba533043 Author: Andreas Sturmlechner gmail com> AuthorDate: Mon Jan 18 18:15:26 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Mon Jan 18 18:20:49 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e4107cc2 Documentation: Regenerate files Documentation/package.accept_keywords/kde-4.14.keywords | 2 +- Documentation/package.mask/kde-4.14 | 2 +- Documentation/package.unmask/kde-4.14 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/package.accept_keywords/kde-4.14.keywords b/Documentation/package.accept_keywords/kde-4.14.keywords index e723a67..adf7677 100644 --- a/Documentation/package.accept_keywords/kde-4.14.keywords +++ b/Documentation/package.accept_keywords/kde-4.14.keywords @@ -296,7 +296,7 @@ =kde-misc/baloo-kcmadv-2014.04.27 >=media-libs/phonon-4.7.80 diff --git a/Documentation/package.mask/kde-4.14 b/Documentation/package.mask/kde-4.14 index 59e5bd9..1b63b17 100644 --- a/Documentation/package.mask/kde-4.14 +++ b/Documentation/package.mask/kde-4.14 @@ -295,5 +295,5 @@ =kde-base/kde-meta-4.14 +>=kde-apps/kde-meta-4.14 diff --git a/Documentation/package.unmask/kde-4.14 b/Documentation/package.unmask/kde-4.14 index 7111925..4a3750b 100644 --- a/Documentation/package.unmask/kde-4.14 +++ b/Documentation/package.unmask/kde-4.14 @@ -295,5 +295,5 @@
[gentoo-commits] proj/kde:master commit in: profiles/package.mask/
commit: 7f89c2cf23c6a52921b25e603b20d5e20f9f7415 Author: Andreas Sturmlechner gmail com> AuthorDate: Sun Jan 17 13:25:02 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Mon Jan 18 18:18:32 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7f89c2cf profiles: Update kde-apps-15.08.3 package.mask profiles/package.mask/kde-apps-15.08.3 | 3 --- 1 file changed, 3 deletions(-) diff --git a/profiles/package.mask/kde-apps-15.08.3 b/profiles/package.mask/kde-apps-15.08.3 index bcba49c..ed8923f 100644 --- a/profiles/package.mask/kde-apps-15.08.3 +++ b/profiles/package.mask/kde-apps-15.08.3 @@ -16,11 +16,8 @@ ~kde-apps/kcalcore-15.08.3 ~kde-apps/kcalutils-15.08.3 ~kde-apps/kcontacts-15.08.3 -~kde-apps/kde-apps-meta-15.08.3 -~kde-apps/kdebase-meta-15.08.3 ~kde-apps/kdeedu-data-15.08.3 ~kde-apps/kdeedu-meta-15.08.3 -~kde-apps/kdenetwork-meta-15.08.3 ~kde-apps/kdepim-15.08.3 ~kde-apps/kdepimlibs-15.08.3 ~kde-apps/kdepim-meta-15.08.3
[gentoo-commits] proj/kde:master commit in: kde-apps/kwalletd-pam/
commit: 754f8c9d426cdf010e3a89bf7775b8dc79432568
Author: Andreas Sturmlechner gmail com>
AuthorDate: Sun Jan 17 23:32:40 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Mon Jan 18 18:18:33 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=754f8c9d
kde-apps/kwalletd-pam: Add aptly named slot 4 version of kwallet(d)-pam
Package-Manager: portage-2.2.26
kde-apps/kwalletd-pam/kwalletd-pam-5.5.3.ebuild | 36 +
kde-apps/kwalletd-pam/metadata.xml | 5
2 files changed, 41 insertions(+)
diff --git a/kde-apps/kwalletd-pam/kwalletd-pam-5.5.3.ebuild
b/kde-apps/kwalletd-pam/kwalletd-pam-5.5.3.ebuild
new file mode 100644
index 000..9fc7022
--- /dev/null
+++ b/kde-apps/kwalletd-pam/kwalletd-pam-5.5.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="kwallet-pam"
+inherit cmake-utils multilib
+
+DESCRIPTION="KWallet PAM module to not enter password again"
+HOMEPAGE="https://www.kde.org/";
+SRC_URI="mirror://kde/stable/plasma/${PV}/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-libs/libgcrypt:0=
+ virtual/pam
+"
+RDEPEND="${DEPEND}
+ net-misc/socat
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+ -DKWALLET4=1
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/kde-apps/kwalletd-pam/metadata.xml
b/kde-apps/kwalletd-pam/metadata.xml
new file mode 100644
index 000..a23f444
--- /dev/null
+++ b/kde-apps/kwalletd-pam/metadata.xml
@@ -0,0 +1,5 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+ kde
+
[gentoo-commits] proj/kde:master commit in: kde-apps/kdebase-meta/
commit: 44acc4528aa5e799ef7c91db20dd62d97d260500 Author: Andreas Sturmlechner gmail com> AuthorDate: Mon Jan 18 17:35:32 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Mon Jan 18 18:16:39 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=44acc452 kde-apps/kdebase-meta: RDEPEND on kdecore-meta, drop USE=display-manager The same use flag is already part of plasma-meta, remove redundancy. Package-Manager: portage-2.2.26 .../kdebase-meta/kdebase-meta-15.08.3-r1.ebuild | 21 - .../kdebase-meta/kdebase-meta-15.08.3-r2.ebuild | 16 .../kdebase-meta/kdebase-meta-15.12.1-r1.ebuild | 21 - .../kdebase-meta/kdebase-meta-15.12.1-r2.ebuild | 16 .../kdebase-meta/kdebase-meta-15.12.49..ebuild | 9 ++--- kde-apps/kdebase-meta/kdebase-meta-.ebuild | 9 ++--- kde-apps/kdebase-meta/metadata.xml | 5 - 7 files changed, 36 insertions(+), 61 deletions(-) diff --git a/kde-apps/kdebase-meta/kdebase-meta-15.08.3-r1.ebuild b/kde-apps/kdebase-meta/kdebase-meta-15.08.3-r1.ebuild deleted file mode 100644 index ec21c6c..000 --- a/kde-apps/kdebase-meta/kdebase-meta-15.08.3-r1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit kde5-meta-pkg - -DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications" -KEYWORDS=" ~amd64 ~x86" -IUSE="+display-manager minimal +wallpapers" - -RDEPEND=" - $(add_kdeapps_dep dolphin) - $(add_kdeapps_dep konsole) - $(add_kdeapps_dep kwrite) - $(add_plasma_dep plasma-meta) - wallpapers? ( $(add_kdeapps_dep kde-wallpapers) ) - !minimal? ( $(add_kdeapps_dep kdebase-runtime-meta 'minimal') ) - !prefix? ( display-manager? ( || ( x11-misc/lightdm x11-misc/sddm ) ) ) -" diff --git a/kde-apps/kdebase-meta/kdebase-meta-15.08.3-r2.ebuild b/kde-apps/kdebase-meta/kdebase-meta-15.08.3-r2.ebuild new file mode 100644 index 000..96f2bad --- /dev/null +++ b/kde-apps/kdebase-meta/kdebase-meta-15.08.3-r2.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit kde5-meta-pkg + +DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications" +KEYWORDS=" ~amd64 ~x86" +IUSE="" + +RDEPEND=" + $(add_kdeapps_dep kdecore-meta) + $(add_plasma_dep plasma-meta) +" diff --git a/kde-apps/kdebase-meta/kdebase-meta-15.12.1-r1.ebuild b/kde-apps/kdebase-meta/kdebase-meta-15.12.1-r1.ebuild deleted file mode 100644 index 841f3dd..000 --- a/kde-apps/kdebase-meta/kdebase-meta-15.12.1-r1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit kde5-meta-pkg - -DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications" -KEYWORDS=" ~amd64 ~x86" -IUSE="+display-manager minimal +wallpapers" - -RDEPEND=" - $(add_kdeapps_dep dolphin) - $(add_kdeapps_dep konsole) - $(add_kdeapps_dep kwrite) - $(add_plasma_dep plasma-meta) - wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.3) ) - !minimal? ( $(add_kdeapps_dep kdebase-runtime-meta 'minimal') ) - !prefix? ( display-manager? ( || ( x11-misc/lightdm x11-misc/sddm ) ) ) -" diff --git a/kde-apps/kdebase-meta/kdebase-meta-15.12.1-r2.ebuild b/kde-apps/kdebase-meta/kdebase-meta-15.12.1-r2.ebuild new file mode 100644 index 000..96f2bad --- /dev/null +++ b/kde-apps/kdebase-meta/kdebase-meta-15.12.1-r2.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit kde5-meta-pkg + +DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications" +KEYWORDS=" ~amd64 ~x86" +IUSE="" + +RDEPEND=" + $(add_kdeapps_dep kdecore-meta) + $(add_plasma_dep plasma-meta) +" diff --git a/kde-apps/kdebase-meta/kdebase-meta-15.12.49..ebuild b/kde-apps/kdebase-meta/kdebase-meta-15.12.49..ebuild index 1d2b3bd..7b99080 100644 --- a/kde-apps/kdebase-meta/kdebase-meta-15.12.49..ebuild +++ b/kde-apps/kdebase-meta/kdebase-meta-15.12.49..ebuild @@ -8,14 +8,9 @@ inherit kde5-meta-pkg DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications" KEYWORDS="" -IUSE="+display-manager minimal +wallpapers" +IUSE="" RDEPEND=" - $(add_kdeapps_dep dolphin) - $(add_kdeapps_dep konsole) - $(add_kdeapps_dep kwrite) + $(add_kdeapps_dep kdecore-meta) $(add_plasma_dep plasma-meta) - wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.3) ) - !minimal? ( $(add_kdeapps_dep kdebase-runtime-meta 'minimal') ) - !prefix? (
[gentoo-commits] proj/kde:master commit in: profiles/package.mask/, kde-apps/kdecore-meta/
commit: bcde306d6b999b959c567f9f0e3cae6e34c2df7e Author: Andreas Sturmlechner gmail com> AuthorDate: Mon Jan 18 17:32:10 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Mon Jan 18 18:15:55 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=bcde306d kde-apps/kdecore-meta: New package Package-Manager: portage-2.2.26 kde-apps/kdecore-meta/kdecore-meta-15.08.3.ebuild | 19 +++ kde-apps/kdecore-meta/kdecore-meta-15.12.1.ebuild | 19 +++ .../kdecore-meta/kdecore-meta-15.12.49..ebuild| 19 +++ kde-apps/kdecore-meta/kdecore-meta-.ebuild| 19 +++ kde-apps/kdecore-meta/metadata.xml| 9 + profiles/package.mask/kde-apps-15.12.1| 1 + 6 files changed, 86 insertions(+) diff --git a/kde-apps/kdecore-meta/kdecore-meta-15.08.3.ebuild b/kde-apps/kdecore-meta/kdecore-meta-15.08.3.ebuild new file mode 100644 index 000..c407300 --- /dev/null +++ b/kde-apps/kdecore-meta/kdecore-meta-15.08.3.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit kde5-meta-pkg + +DESCRIPTION="kdecore - merge this to pull in the most basic applications" +KEYWORDS=" ~amd64 ~x86" +IUSE="minimal +wallpapers" + +RDEPEND=" + $(add_kdeapps_dep dolphin) + $(add_kdeapps_dep konsole) + $(add_kdeapps_dep kwrite) + wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.3) ) + !minimal? ( $(add_kdeapps_dep kdebase-runtime-meta 'minimal') ) +" diff --git a/kde-apps/kdecore-meta/kdecore-meta-15.12.1.ebuild b/kde-apps/kdecore-meta/kdecore-meta-15.12.1.ebuild new file mode 100644 index 000..c407300 --- /dev/null +++ b/kde-apps/kdecore-meta/kdecore-meta-15.12.1.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit kde5-meta-pkg + +DESCRIPTION="kdecore - merge this to pull in the most basic applications" +KEYWORDS=" ~amd64 ~x86" +IUSE="minimal +wallpapers" + +RDEPEND=" + $(add_kdeapps_dep dolphin) + $(add_kdeapps_dep konsole) + $(add_kdeapps_dep kwrite) + wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.3) ) + !minimal? ( $(add_kdeapps_dep kdebase-runtime-meta 'minimal') ) +" diff --git a/kde-apps/kdecore-meta/kdecore-meta-15.12.49..ebuild b/kde-apps/kdecore-meta/kdecore-meta-15.12.49..ebuild new file mode 100644 index 000..c72a9d7 --- /dev/null +++ b/kde-apps/kdecore-meta/kdecore-meta-15.12.49..ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit kde5-meta-pkg + +DESCRIPTION="kdecore - merge this to pull in the most basic applications" +KEYWORDS="" +IUSE="minimal +wallpapers" + +RDEPEND=" + $(add_kdeapps_dep dolphin) + $(add_kdeapps_dep konsole) + $(add_kdeapps_dep kwrite) + wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.3) ) + !minimal? ( $(add_kdeapps_dep kdebase-runtime-meta 'minimal') ) +" diff --git a/kde-apps/kdecore-meta/kdecore-meta-.ebuild b/kde-apps/kdecore-meta/kdecore-meta-.ebuild new file mode 100644 index 000..c72a9d7 --- /dev/null +++ b/kde-apps/kdecore-meta/kdecore-meta-.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit kde5-meta-pkg + +DESCRIPTION="kdecore - merge this to pull in the most basic applications" +KEYWORDS="" +IUSE="minimal +wallpapers" + +RDEPEND=" + $(add_kdeapps_dep dolphin) + $(add_kdeapps_dep konsole) + $(add_kdeapps_dep kwrite) + wallpapers? ( $(add_kdeapps_dep kde-wallpapers '' 15.08.3) ) + !minimal? ( $(add_kdeapps_dep kdebase-runtime-meta 'minimal') ) +" diff --git a/kde-apps/kdecore-meta/metadata.xml b/kde-apps/kdecore-meta/metadata.xml new file mode 100644 index 000..f572092 --- /dev/null +++ b/kde-apps/kdecore-meta/metadata.xml @@ -0,0 +1,9 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + kde + + Disable install of various KDE SC 4 based packages + Install the KDE wallpapers + + diff --git a/profiles/package.mask/kde-apps-15.12.1 b/profiles/package.mask/kde-apps-15.12.1 index ab29e84..e993f58df 100644 --- a/profiles/package.mask/kde-apps-15.12.1 +++ b/profiles/package.mask/kde-apps-15.12.1 @@ -75,6 +75,7 @@ ~kde-apps/kdebase-meta-15.12.1 ~kde-apps/kdebase-runtime-meta-15.12.1 ~kde-apps/kdebugdialog-15.12.1 +~kde-apps/kdecore-meta-15.12.1 ~kde-apps/kde-dev-scripts-15.12.1 ~kde-apps/kde-dev-utils-15.12.1 ~kde-apps/kdeedu-data-15.12.1
[gentoo-commits] proj/kde:master commit in: kde-apps/kde-apps-meta/
commit: 8ec0b775bc2bc49ec4bebd5c9c6a521d8e2e34fb
Author: Andreas Sturmlechner gmail com>
AuthorDate: Mon Jan 18 17:40:04 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Mon Jan 18 18:16:40 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8ec0b775
kde-apps/kde-apps-meta: Replace kdebase-meta with kdecore-meta
Package-Manager: portage-2.2.26
...{kde-apps-meta-15.08.3-r1.ebuild => kde-apps-meta-15.08.3-r2.ebuild} | 2 +-
...{kde-apps-meta-15.12.1-r1.ebuild => kde-apps-meta-15.12.1-r2.ebuild} | 2 +-
kde-apps/kde-apps-meta/kde-apps-meta-15.12.49..ebuild | 2 +-
kde-apps/kde-apps-meta/kde-apps-meta-.ebuild| 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-15.08.3-r1.ebuild
b/kde-apps/kde-apps-meta/kde-apps-meta-15.08.3-r2.ebuild
similarity index 97%
rename from kde-apps/kde-apps-meta/kde-apps-meta-15.08.3-r1.ebuild
rename to kde-apps/kde-apps-meta/kde-apps-meta-15.08.3-r2.ebuild
index 8ffe9dc..edc4bff 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-15.08.3-r1.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-15.08.3-r2.ebuild
@@ -18,7 +18,7 @@ IUSE="accessibility minimal nls pim sdk"
RDEPEND="
$(add_kdeapps_dep kate)
$(add_kdeapps_dep kdeadmin-meta)
- $(add_kdeapps_dep kdebase-meta)
+ $(add_kdeapps_dep kdecore-meta)
$(add_kdeapps_dep kdeedu-meta '' 4.14.3)
$(add_kdeapps_dep kdegames-meta)
$(add_kdeapps_dep kdegraphics-meta)
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-15.12.1-r1.ebuild
b/kde-apps/kde-apps-meta/kde-apps-meta-15.12.1-r2.ebuild
similarity index 96%
rename from kde-apps/kde-apps-meta/kde-apps-meta-15.12.1-r1.ebuild
rename to kde-apps/kde-apps-meta/kde-apps-meta-15.12.1-r2.ebuild
index 95eb85d..5e2dd61 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-15.12.1-r1.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-15.12.1-r2.ebuild
@@ -15,7 +15,7 @@ IUSE="accessibility minimal nls pim sdk"
RDEPEND="
$(add_kdeapps_dep kate)
$(add_kdeapps_dep kdeadmin-meta)
- $(add_kdeapps_dep kdebase-meta)
+ $(add_kdeapps_dep kdecore-meta)
$(add_kdeapps_dep kdeedu-meta)
$(add_kdeapps_dep kdegames-meta)
$(add_kdeapps_dep kdegraphics-meta)
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-15.12.49..ebuild
b/kde-apps/kde-apps-meta/kde-apps-meta-15.12.49..ebuild
index 6176450..61e0662 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-15.12.49..ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-15.12.49..ebuild
@@ -15,7 +15,7 @@ IUSE="accessibility minimal nls pim sdk"
RDEPEND="
$(add_kdeapps_dep kate)
$(add_kdeapps_dep kdeadmin-meta)
- $(add_kdeapps_dep kdebase-meta)
+ $(add_kdeapps_dep kdecore-meta)
$(add_kdeapps_dep kdeedu-meta)
$(add_kdeapps_dep kdegames-meta)
$(add_kdeapps_dep kdegraphics-meta)
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-.ebuild
b/kde-apps/kde-apps-meta/kde-apps-meta-.ebuild
index 6176450..61e0662 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-.ebuild
@@ -15,7 +15,7 @@ IUSE="accessibility minimal nls pim sdk"
RDEPEND="
$(add_kdeapps_dep kate)
$(add_kdeapps_dep kdeadmin-meta)
- $(add_kdeapps_dep kdebase-meta)
+ $(add_kdeapps_dep kdecore-meta)
$(add_kdeapps_dep kdeedu-meta)
$(add_kdeapps_dep kdegames-meta)
$(add_kdeapps_dep kdegraphics-meta)
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: e0300736d3360e1f14aec69670f654826480a16c Author: Fabian Groffen gentoo org> AuthorDate: Mon Jan 18 18:15:01 2016 + Commit: Fabian Groffen gentoo org> CommitDate: Mon Jan 18 18:15:15 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0300736 profiles/package.mask: mask Exim 4.87 RC3 profiles/package.mask | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/package.mask b/profiles/package.mask index 837847b..e547b2d 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -833,8 +833,8 @@ dev-perl/YAML-Parser-Syck # Fabian Groffen (11 Dec 2015) # Release candidates for Exim 4.87 -=mail-mta/exim-4.87_rc1 =mail-mta/exim-4.87_rc2 +=mail-mta/exim-4.87_rc3 # Pawel Hajdan, Jr. (07 Dec 2015) # Dev channel releases are only for people who are developers or want more
[gentoo-commits] repo/gentoo:master commit in: mail-mta/exim/
commit: 7e74b331eb4d076cf3597c306f8ee3920b9ca5b8
Author: Fabian Groffen gentoo org>
AuthorDate: Mon Jan 18 18:11:48 2016 +
Commit: Fabian Groffen gentoo org>
CommitDate: Mon Jan 18 18:15:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e74b331
mail-mta/exim: bump to Exim 4.87 RC3
Package-Manager: portage-2.2.26
mail-mta/exim/Manifest | 4 ++--
mail-mta/exim/{exim-4.87_rc1.ebuild => exim-4.87_rc3.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 1fc496f..20fb3d8 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,11 +1,11 @@
DIST exim-4.84.tar.bz2 1761790 SHA256
78ea22be87fb6df880e7fd482f3bec9ef6ceca0c9dedd50f8a26cae0b38b9e9c SHA512
3cd41af6d57e5f0377fc93367753eae6cb6bf835803e8608c44e1da5acefce1ed8886f4fe7536950de072bfed6e927afe1536c1e6466cf3121dd352b69a68039
WHIRLPOOL
9e840aa6afa0db68455b4ab458706eedd7ea57b084999c9e85eaaec0530ed93958731d934ff1d7830d9b5cd086e36cb56dc8a2f78dad85bdba9ae6573510e840
DIST exim-4.85.tar.bz2 1784150 SHA256
13211f2bbc5400d095a9b4be075eb1347e0d98676fdfe4be8a3b4d56281daaa4 SHA512
2c5846528ee98e4aff5dbabe49dfa5ba6753fa64154b9671a7849db8a17773917fe13bcb9e5f732c43d7479debfadd8012b8650823eb12504a6b1b28be456161
WHIRLPOOL
4057cd745f12ff62e956838406544060d3d2d7383027959f3c1ca12eff43bddb9be63e284767245b271e53bef92596c1241f5e90e9ed611d02e95b7a30adc7c8
DIST exim-4.86.tar.bz2 1804807 SHA256
f1ccf2ce2ea51b7fbbf160e7e0e41d24ca401cf44a185128ad99ea04635fc456 SHA512
0b90cd1b4d99bbb976336ccf9c2c3375f453a74bb306f1b0215f7ecca80fbda83cf5cc38c502516c2903c5d753f1f559c534fc4f4b1b32ee3300db86de6610ab
WHIRLPOOL
a7e938cfaeb92af1b81c8a113752914b61e49d7fd71c39460b944716725b1e98b50a7c9ef1699569cd031ee7cac210639d9ef9bd21280e5ce7682eb40db91726
-DIST exim-4.87_RC1.tar.bz2 1818628 SHA256
cec26ecd7879cd04ab30fc1c152c4967549c8499a4432754ec97c6ecbc712911 SHA512
a97eb31ea612fb19f5fe2da23a51e248beb4faa5a378939207d52207254f50c54b97047a83e6995214ec5e58b1540dc12fb4c865ba81b7013c923342d2e0
WHIRLPOOL
4a57f87c84b83853892c400042a221992d9d4a3049195059feb6735ddb848482eac00d1f429da0dbcca2ca3cf984b4ba23f5645ebd1eab5ea92b31ed7cc4aa0b
DIST exim-4.87_RC2.tar.bz2 1819354 SHA256
ac3a09464183ded893b590492eb1ed6d548a20c43f57ddd267ffa2fae9c8f032 SHA512
4cbf01f80f968c4ce2760c96f0e0c94f365f75526311fc68ee97698ce55440df1dc2aa50e670da34f2baa4dba1be0db8726c094a873beb54881252c4d78e1ac7
WHIRLPOOL
927caa9738e69aa4c5b7269a292cfce839189234510ae6208977d58f712e9128a63ba14e5b305d117028f101a7aaa626fa31e045940e951e9c38f7e0a540dc6e
+DIST exim-4.87_RC3.tar.bz2 1795572 SHA256
aa2627518782f9a0c00fc131143430b1ea05cc20a5175c217cdfcc18b09f562c SHA512
03fe161240934c08f95263496478894f83c303069ac9f7df9d2ac105685a59f8217ed11f1100904558a1b2784ea94b69f57ed2d0d9775752c00b3d5b7cbe53f6
WHIRLPOOL
67a87273a37814f83ff650228052ea123b0624675b5c17458118f2150f7f018cb414388bcd08dfa5d2540d8f15dd48de111ae388dd2882f3d03dd56bf426dee2
DIST exim-html-4.84.tar.bz2 465281 SHA256
7ee7e9015b853915604b7806be93d56e9ba1fb915b63f0d6828c47f2228fd45b SHA512
7de8513476b6abcdfd36b0121a2a9d6decf1ccf94ef51b8363e544066cc05670e6f2b4d03d5fbc49071b1431183dfd9badde5cbcc65f51d55ec6b25ebcb070b9
WHIRLPOOL
88c376fd399e17b2bc06d2d0fad19f8c6485807118a81e0c200f6c39defe7155fa920489481a8b82e629951766ce0222b85956f387d22d22549303bd3dff7f82
DIST exim-html-4.85.tar.bz2 467069 SHA256
fd91946369626e74842a0799b93d0d9e4a201fe640af84e1b5349fe6ff204167 SHA512
8214576300827f79c0880e2d2163f71d7f1b3fe2aff714b591a011e48816965de5a773c3509137b085fec3d4d2128931f8398768c24dad6c92b7df27cbcafe74
WHIRLPOOL
a7edffd7124c4920708616d3e59c0db5159dee5f7e4fd62ce29fdba769d39781a3826d4e3e39cdc97669941bb9a5c977defe280feb73cbe159b23df4cb6fe95f
DIST exim-html-4.86.tar.bz2 471159 SHA256
02226a9fbb6d5aaa9d35f3e2a3bd9077e2307463de6baf6e3e2e938c1fe39146 SHA512
0c15fbccaf9b744fb8b7990d2b2bd0555a04ef5ed82ffbf2e32372a539bae6d7cebad96960f5570a2f8f27d31ebdf2467c51cb053b059996bb9122bc02fa741b
WHIRLPOOL
d9fbaa73491ab1657afb6ba59da5adea26144b58b358aeb9829731d3f35d6c1d8c7021c5243cb989e7c704cc346cde2a330f9eedc5b357326c1d56d7caa4a6c5
-DIST exim-html-4.87_RC1.tar.bz2 475376 SHA256
37303fbca2282e86328e2b3bab84526b920ac54e0d4b96d3597639a495ef70db SHA512
1d338abda79aa49968ded992cfa60e4c791bd647783095991be9d7eaf144e4b20460915585af78b498def4a8d3f160937eef85f767adb4512f28384e9ab620db
WHIRLPOOL
e12e97e1cd0d9b6648377f298c478e5fa2f060ebd004b4726e100414c83f53e6b8e294a8b102357ac15a3868f34ae299edc4213a46851bb78c6e62415999a1ef
DIST exim-html-4.87_RC2.tar.bz2 477015 SHA256
119274228a85de90324a6004efb1049474e7f2ec7f575cb57809735ab1b48a9b SHA512
51966e3b64c41dd95fa19b42484fe2d48b99eb104945de4d18b82d54d5f5791137eb308a7e05f7bdec7663d4f2e73353c7853d27c6496b529671dcaed6faa202
WHIRLPOOL
86af06c293bb920572144b94628dc7bc1626bf6f9bfd5867589bfb16b5171d2bb4ddbd3d07b3164e04b1bfa822cf8e8378b4382abc54d94b9b5646ceeab9d24f
+DIST exim-html-4.87_RC3
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 0a6c2bc5d58f44139658a26fc515c70ada205ca4 Author: Dirkjan Ochtman gentoo org> AuthorDate: Mon Jan 18 18:13:26 2016 + Commit: Dirkjan Ochtman gentoo org> CommitDate: Mon Jan 18 18:13:26 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a6c2bc5 mail-filter/rspamd: specify slot on openssl dependency mail-filter/rspamd/rspamd-1.0.11.ebuild | 2 +- mail-filter/rspamd/rspamd-1.1.0.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mail-filter/rspamd/rspamd-1.0.11.ebuild b/mail-filter/rspamd/rspamd-1.0.11.ebuild index a2b7c7f..7993e7a 100644 --- a/mail-filter/rspamd/rspamd-1.0.11.ebuild +++ b/mail-filter/rspamd/rspamd-1.0.11.ebuild @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="dev-libs/openssl +DEPEND="dev-libs/openssl:0 dev-libs/libpcre dev-lang/luajit:2 dev-libs/libevent diff --git a/mail-filter/rspamd/rspamd-1.1.0.ebuild b/mail-filter/rspamd/rspamd-1.1.0.ebuild index a8581d1..ed352f4 100644 --- a/mail-filter/rspamd/rspamd-1.1.0.ebuild +++ b/mail-filter/rspamd/rspamd-1.1.0.ebuild @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="dev-libs/openssl +DEPEND="dev-libs/openssl:0 dev-libs/libpcre dev-lang/luajit:2 dev-libs/libevent
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 1e6e3a85f7dd1393ee8c1490b65856e41e4a58d3
Author: Dirkjan Ochtman gentoo org>
AuthorDate: Mon Jan 18 18:05:58 2016 +
Commit: Dirkjan Ochtman gentoo org>
CommitDate: Mon Jan 18 18:05:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e6e3a85
mail-filter/rspamd: version bump to 1.1.0
mail-filter/rspamd/Manifest| 1 +
mail-filter/rspamd/rspamd-1.1.0.ebuild | 55 ++
2 files changed, 56 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 034db93..a67bc5f 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1 +1,2 @@
DIST rspamd-1.0.11.tar.xz 1176160 SHA256
b914c77c30dcab863f6c685b4a83a1662ee1b4503654fbf3ee3ae2fbca1ed928 SHA512
79464e8c29bdf5b081744b79fb8eee944bf647abf334cd77686a8fa4d0a3ab7ff4293fc464606d298fb57c8d7fe909e333ae7e58768330e4d65464bf42f76f15
WHIRLPOOL
ca1f8338ef6f917622c8a93fa8bf230b2767d750e953d9f790649e660865caaa255c5a8eb35a14cb882acc193a237bf107d79c7c01f3d7ec6520301edc9f2629
+DIST rspamd-1.1.0.tar.xz 1291004 SHA256
69db05150b4ba8304d24dd0f96c79b5d3792478373f0d6be6c92b51b1cf60ead SHA512
41a8fb49a10082b1dc97397ebb8ac81dd3f4912e9140dcb7c57c9e15f1e49cf472aa94570a2f802b82e3db8ab8a87dd6a63f7db7249da4d99473700535045256
WHIRLPOOL
3781b7450e0f2cd780e2dac804871d52fed619c5e82faf54d8d9d4230b2baf531eeacea09b43ae36ec09fb7b659ba74116ab59fb86731de9bcfc471a2dbdd7ad
diff --git a/mail-filter/rspamd/rspamd-1.1.0.ebuild
b/mail-filter/rspamd/rspamd-1.1.0.ebuild
new file mode 100644
index 000..a8581d1
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-1.1.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils user
+
+DESCRIPTION="Rapid spam filtering system"
+SRC_URI="https://rspamd.com/downloads/${P}.tar.xz";
+HOMEPAGE="https://github.com/vstakhov/rspamd";
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/openssl
+ dev-libs/libpcre
+ dev-lang/luajit:2
+ dev-libs/libevent
+ dev-db/sqlite:3
+ dev-libs/glib:2
+ dev-libs/gmime
+ sys-apps/file
+ virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ enewgroup rspamd
+ enewuser rspamd -1 -1 /var/lib/rspamd rspamd
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCONFDIR=/etc/rspamd
+ -DRUNDIR=/var/run/rspamd
+ -DDBDIR=/var/lib/rspamd
+ -DLOGDIR=/var/log/rspamd
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ newinitd "${FILESDIR}/rspamd.init" rspamd
+
+ dodir /var/lib/rspamd
+ dodir /var/log/rspamd
+
+ fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/rspamd.logrotate" rspamd
+}
[gentoo-commits] repo/gentoo:master commit in: net-im/gajim/
commit: 857ab4ba29a58e9071e05ade98d06490923aef02 Author: Andreas Schuerch gentoo org> AuthorDate: Mon Jan 18 17:47:00 2016 + Commit: Andreas Schuerch gentoo org> CommitDate: Mon Jan 18 17:47:00 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=857ab4ba net-im/gajim: 0.16.5 stable on x86 as per bug 569936 Package-Manager: portage-2.2.26 net-im/gajim/gajim-0.16.5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/gajim/gajim-0.16.5.ebuild b/net-im/gajim/gajim-0.16.5.ebuild index 151c395..b65ba8e 100644 --- a/net-im/gajim/gajim-0.16.5.ebuild +++ b/net-im/gajim/gajim-0.16.5.ebuild @@ -22,7 +22,7 @@ SRC_URI=" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 ~x86 ~x86-fbsd" +KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd" IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml" REQUIRED_USE="
[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-desktop/files/
commit: 27c4032b49faacc4812030b9f4b131331cace988
Author: Michael Palimaka gentoo org>
AuthorDate: Mon Jan 18 17:04:12 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Mon Jan 18 17:25:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c4032b
kde-plasma/plasma-desktop: remove unused patch
Package-Manager: portage-2.2.26
...plasma-desktop-5.5.0-favourites-migration.patch | 26 --
1 file changed, 26 deletions(-)
diff --git
a/kde-plasma/plasma-desktop/files/plasma-desktop-5.5.0-favourites-migration.patch
b/kde-plasma/plasma-desktop/files/plasma-desktop-5.5.0-favourites-migration.patch
deleted file mode 100644
index 60dd237..000
---
a/kde-plasma/plasma-desktop/files/plasma-desktop-5.5.0-favourites-migration.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 97ced66da372737ae5d36d86c9bc0c6fe684d842 Mon Sep 17 00:00:00 2001
-From: Eike Hein
-Date: Tue, 8 Dec 2015 20:26:26 +0100
-Subject: [PATCH] Fix migration of multiple favorites.
-
-BUG:356398
- desktoppackage/contents/updates/obsolete_kickoffrc.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/desktoppackage/contents/updates/obsolete_kickoffrc.js
b/desktoppackage/contents/updates/obsolete_kickoffrc.js
-index aae077f..d92cae9 100644
a/desktoppackage/contents/updates/obsolete_kickoffrc.js
-+++ b/desktoppackage/contents/updates/obsolete_kickoffrc.js
-@@ -1,7 +1,7 @@
- var kickoffConfig = ConfigFile("kickoffrc");
-
- kickoffConfig.group = "Favorites";
--var favorites = kickoffConfig.readEntry("FavoriteURLs");
-+var favorites = kickoffConfig.readEntry("FavoriteURLs").split(',');
-
- kickoffConfig.group = "SystemApplications";
- var systemApplications = kickoffConfig.readEntry("DesktopFiles").split(',');
---
-2.4.10
-
[gentoo-commits] repo/gentoo:master commit in: kde-plasma/breeze/files/
commit: 515e23a1b1049a4ade0cbf9cc171634dbd3f8081
Author: Michael Palimaka gentoo org>
AuthorDate: Mon Jan 18 17:03:59 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Mon Jan 18 17:25:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=515e23a1
kde-plasma/breeze: remove unused patch
Package-Manager: portage-2.2.26
.../files/breeze-5.4.2-fix-breeze-dark.patch | 23 --
1 file changed, 23 deletions(-)
diff --git a/kde-plasma/breeze/files/breeze-5.4.2-fix-breeze-dark.patch
b/kde-plasma/breeze/files/breeze-5.4.2-fix-breeze-dark.patch
deleted file mode 100644
index b6e7eab..000
--- a/kde-plasma/breeze/files/breeze-5.4.2-fix-breeze-dark.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Harald Sitter
-Date: Mon, 05 Oct 2015 13:14:00 +
-Subject: Install emotes and mimtetypes directories of the dark icon theme
-X-Git-Url:
http://quickgit.kde.org/?p=breeze.git&a=commitdiff&h=12d8b9a9907b28ba1cbaffc380f4eeae4de9774d
-Install emotes and mimtetypes directories of the dark icon theme
-
-CCMAIL: kain...@gmail.com
-
-
a/icons-dark/CMakeLists.txt
-+++ b/icons-dark/CMakeLists.txt
-@@ -11,7 +11,7 @@
-
- ### install files ###
-
--set( breeze_icon_dark_dirs actions apps categories devices emblems places
status)
-+set( breeze_icon_dark_dirs actions apps categories devices emblems emotes
mimetypes places status)
-
-
- set(BREEZE_INSTALL_DIR ${ICON_INSTALL_DIR}/breeze-dark)
-
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rmilter/
commit: c905a718654511380e29c6cc010635362885c72a
Author: Dirkjan Ochtman gentoo org>
AuthorDate: Mon Jan 18 17:15:06 2016 +
Commit: Dirkjan Ochtman gentoo org>
CommitDate: Mon Jan 18 17:15:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c905a718
mail-filter/rmilter: version bump to 1.7.0
mail-filter/rmilter/Manifest | 1 +
mail-filter/rmilter/rmilter-1.7.0.ebuild | 37
2 files changed, 38 insertions(+)
diff --git a/mail-filter/rmilter/Manifest b/mail-filter/rmilter/Manifest
index 16b1407..68c108e 100644
--- a/mail-filter/rmilter/Manifest
+++ b/mail-filter/rmilter/Manifest
@@ -1 +1,2 @@
DIST rmilter-1.6.7.tar.gz 117993 SHA256
d8312be6ab79cf42fd28a85c4eda3868e20a4d182f06c1491ce8cdc8c2bed8df SHA512
015393e803603d2e6e95344c1b30f748e7d4460c4dc0cb2551639d25f9b4554963bc072c872608f94cd6e2110afd4623e9083eb82df8d23f47c36c84585052ca
WHIRLPOOL
e4913d46a57e370e57b64141a1f4247757f9a621db2f53a01f624ae3082bf693b87198c54a125eba7ce5853c452650b3e6621947d9ccf330c3f5df6ca6e677ec
+DIST rmilter-1.7.0.tar.gz 159459 SHA256
0337c1e643f1c9115ae9a53cb79d883ef857ca8457a94b37ef135ee89166ea3d SHA512
a5d458d1de085a6c92eaf9c3da90f285ac16572b9be999277b8f2d4f4a6d7976faa32cc51c933b4738c1f521db7fbeba3f19cf43dba1323915f996d77795d0b1
WHIRLPOOL
d80de10ff925d1695cd249f9d371da01f20df3259ff40a3cec4dcc03050e4fff17e7ac788251648097c957281574865c7e96fddfab582bb01bd9f2fb56e44bdd
diff --git a/mail-filter/rmilter/rmilter-1.7.0.ebuild
b/mail-filter/rmilter/rmilter-1.7.0.ebuild
new file mode 100644
index 000..132cab0
--- /dev/null
+++ b/mail-filter/rmilter/rmilter-1.7.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils user
+
+DESCRIPTION="Another sendmail milter for different mail checks"
+SRC_URI="https://github.com/vstakhov/rmilter/archive/${PV}.tar.gz ->
${P}.tar.gz"
+HOMEPAGE="https://github.com/vstakhov/rmilter";
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libpcre
+ dev-libs/openssl:0
+ mail-filter/libmilter
+ mail-filter/opendkim"
+DEPEND="sys-devel/flex
+ sys-devel/bison
+ ${RDEPEND}"
+
+pkg_setup() {
+ enewgroup rmilter
+ enewuser rmilter -1 -1 /var/run/rmilter rmilter
+}
+
+src_install() {
+ cmake-utils_src_install
+ newinitd "${FILESDIR}/rmilter.initd" rmilter
+ insinto /etc/rmilter
+ newins rmilter.conf.sample rmilter.conf.sample
+ newins rmilter-grey.conf rmilter-grey.conf
+}
[gentoo-commits] repo/gentoo:master commit in: /
commit: 2844e7126b270b930eb6de802c6619ee76c597d1 Author: Patrice Clement gentoo org> AuthorDate: Mon Jan 18 17:07:23 2016 + Commit: Patrice Clement gentoo org> CommitDate: Mon Jan 18 17:07:41 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2844e712 Merge remote-tracking branch 'github/pr/536'. app-crypt/yubikey-neo-manager/Manifest | 1 + ...ubikey-neo-manager-fix-pyside-requirement.patch | 17 app-crypt/yubikey-neo-manager/metadata.xml | 4 +- .../yubikey-neo-manager-1.4.0.ebuild | 49 ++ 4 files changed, 69 insertions(+), 2 deletions(-)
