[gentoo-commits] repo/gentoo:master commit in: dev-util/desktop-file-utils/

2020-11-28 Thread Mike Gilbert
commit: 856232121e36d2c73bc8a01d0518e69f345550e8
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Nov 28 17:14:29 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Nov 28 17:14:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85623212

dev-util/desktop-file-utils: move emacs to BDEPEND

Closes: https://bugs.gentoo.org/751775
Signed-off-by: Mike Gilbert  gentoo.org>

 ...sktop-file-utils-0.26.ebuild => desktop-file-utils-0.26-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.26.ebuild 
b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
similarity index 93%
rename from dev-util/desktop-file-utils/desktop-file-utils-0.26.ebuild
rename to dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
index c25251a74be..52a6baaa91b 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.26.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
@@ -13,12 +13,12 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="emacs"
 
-RDEPEND=">=dev-libs/glib-2.12:2
-   emacs? ( >=app-editors/emacs-23.1:* )"
+RDEPEND=">=dev-libs/glib-2.12:2"
 DEPEND="${RDEPEND}"
 BDEPEND="
app-arch/xz-utils
virtual/pkgconfig
+   emacs? ( >=app-editors/emacs-23.1:* )
 "
 
 SITEFILE="50${PN}-gentoo.el"



[gentoo-commits] repo/gentoo:master commit in: eclass/

2020-11-25 Thread Mike Gilbert
commit: db1630476083e7a09767e9bd96ecdb7ac3f7496c
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Mon Nov 23 23:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Nov 25 17:45:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db163047

multilib.eclass: Include /$(get_libdir) in PKG_CONFIG_SYSTEM_LIBRARY_PATH.

Set also PKG_CONFIG_SYSTEM_INCLUDE_PATH for consistency.

Bug: https://bugs.gentoo.org/756238
Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 eclass/multilib.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 9c7042fcd29..33ca9726131 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -498,6 +498,7 @@ multilib_toolchain_setup() {
STRIP
PKG_CONFIG_LIBDIR
PKG_CONFIG_PATH
+   PKG_CONFIG_SYSTEM_INCLUDE_PATH
PKG_CONFIG_SYSTEM_LIBRARY_PATH
)
 
@@ -547,7 +548,8 @@ multilib_toolchain_setup() {
export CHOST=$(get_abi_CHOST $1)
export PKG_CONFIG_LIBDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
export PKG_CONFIG_PATH=${EPREFIX}/usr/share/pkgconfig
-   export 
PKG_CONFIG_SYSTEM_LIBRARY_PATH=${EPREFIX}/usr/$(get_libdir)
+   export PKG_CONFIG_SYSTEM_INCLUDE_PATH=${EPREFIX}/usr/include
+   export 
PKG_CONFIG_SYSTEM_LIBRARY_PATH=${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)
fi
 }
 



[gentoo-commits] repo/gentoo:master commit in: dev-util/pkgconf/

2020-11-25 Thread Mike Gilbert
commit: 3a856ecbffcb29ad779ffb8dc0b895698c90b891
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Nov 24 15:42:35 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Nov 25 17:45:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a856ecb

dev-util/pkgconf: drop obsolete blockers

Signed-off-by: Mike Gilbert  gentoo.org>

 dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild | 6 +-
 dev-util/pkgconf/pkgconf-.ebuild | 6 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild 
b/dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild
index e1d94a66add..858af22520e 100644
--- a/dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild
@@ -30,11 +30,7 @@ BDEPEND="
)
 "
 RDEPEND="
-   pkg-config? (
-   !dev-util/pkgconfig
-   !dev-util/pkg-config-lite
-   !dev-util/pkgconfig-openbsd[pkg-config]
-   )
+   pkg-config? ( !dev-util/pkgconfig )
 "
 
 MULTILIB_CHOST_TOOLS=(

diff --git a/dev-util/pkgconf/pkgconf-.ebuild 
b/dev-util/pkgconf/pkgconf-.ebuild
index d592b7e54f1..a29e166995b 100644
--- a/dev-util/pkgconf/pkgconf-.ebuild
+++ b/dev-util/pkgconf/pkgconf-.ebuild
@@ -30,11 +30,7 @@ BDEPEND="
)
 "
 RDEPEND="
-   pkg-config? (
-   !dev-util/pkgconfig
-   !dev-util/pkg-config-lite
-   !dev-util/pkgconfig-openbsd[pkg-config]
-   )
+   pkg-config? ( !dev-util/pkgconfig )
 "
 
 MULTILIB_CHOST_TOOLS=(



[gentoo-commits] repo/gentoo:master commit in: eclass/

2020-11-25 Thread Mike Gilbert
commit: 31cbc5fcac6ddf0f5832f133d4a76f81168ca7df
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Nov 24 15:35:29 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Nov 25 17:45:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31cbc5fc

multilib.eclass: drop amd64 from maintainers

Signed-off-by: Mike Gilbert  gentoo.org>

 eclass/multilib.eclass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 33ca9726131..095e3a4f450 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -3,7 +3,6 @@
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
-# am...@gentoo.org
 # toolch...@gentoo.org
 # @BLURB: This eclass is for all functions pertaining to handling multilib 
configurations.
 # @DESCRIPTION:



[gentoo-commits] repo/gentoo:master commit in: dev-util/pkgconf/

2020-11-25 Thread Mike Gilbert
commit: f80c1bfe84e86a802ee892d9800225c978dca59d
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Mon Nov 23 23:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Nov 25 17:45:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f80c1bfe

dev-util/pkgconf: Include /$(get_libdir) in default system libdir.

Bug: https://bugs.gentoo.org/756238
Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-util/pkgconf/{pkgconf-1.7.3.ebuild => pkgconf-1.7.3-r1.ebuild} | 7 ++-
 dev-util/pkgconf/pkgconf-.ebuild   | 7 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/dev-util/pkgconf/pkgconf-1.7.3.ebuild 
b/dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild
similarity index 89%
rename from dev-util/pkgconf/pkgconf-1.7.3.ebuild
rename to dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild
index a801ef026bf..e1d94a66add 100644
--- a/dev-util/pkgconf/pkgconf-1.7.3.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild
@@ -54,7 +54,12 @@ src_prepare() {
 
 multilib_src_configure() {
local ECONF_SOURCE="${S}"
-   econf --disable-static
+   local args=(
+   --disable-static
+   --with-system-includedir="${EPREFIX}/usr/include"
+   
--with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)"
+   )
+   econf "${args[@]}"
 }
 
 multilib_src_test() {

diff --git a/dev-util/pkgconf/pkgconf-.ebuild 
b/dev-util/pkgconf/pkgconf-.ebuild
index 40e4e28319d..d592b7e54f1 100644
--- a/dev-util/pkgconf/pkgconf-.ebuild
+++ b/dev-util/pkgconf/pkgconf-.ebuild
@@ -54,7 +54,12 @@ src_prepare() {
 
 multilib_src_configure() {
local ECONF_SOURCE="${S}"
-   econf --disable-static
+   local args=(
+   --disable-static
+   --with-system-includedir="${EPREFIX}/usr/include"
+   
--with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)"
+   )
+   econf "${args[@]}"
 }
 
 multilib_src_test() {



[gentoo-commits] repo/gentoo:master commit in: dev-libs/dbus-glib/, dev-libs/dbus-glib/files/

2020-11-24 Thread Mike Gilbert
commit: 6b3c3df768a64c2783129cd14cdc3dc01a575eeb
Author: David Michael  gmail  com>
AuthorDate: Tue Nov 24 16:00:53 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Nov 24 16:03:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b3c3df7

dev-libs/dbus-glib: backport pkg-config fix for glib-genmarshal

Closes: https://bugs.gentoo.org/756355
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Michael  gmail.com>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-libs/dbus-glib/dbus-glib-0.110.ebuild  |  9 ++-
 .../dbus-glib-0.110-config-glib-genmarshal.conf| 76 ++
 2 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild 
b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
index 6e817d8bfe9..2d3b43af461 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit bash-completion-r1 multilib-minimal toolchain-funcs
+inherit autotools bash-completion-r1 multilib-minimal toolchain-funcs
 
 DESCRIPTION="D-Bus bindings for glib"
 HOMEPAGE="https://dbus.freedesktop.org/;
@@ -31,11 +31,18 @@ BDEPEND="
 
 DOCS=( AUTHORS ChangeLog HACKING NEWS README )
 
+PATCHES=( "${FILESDIR}"/${P}-config-glib-genmarshal.conf )
+
 set_TBD() {
# out of sources build dir for make check
export TBD="${BUILD_DIR}-tests"
 }
 
+src_prepare() {
+   default
+   eautoreconf
+}
+
 multilib_src_configure() {
local myconf=(
--localstatedir="${EPREFIX}"/var

diff --git 
a/dev-libs/dbus-glib/files/dbus-glib-0.110-config-glib-genmarshal.conf 
b/dev-libs/dbus-glib/files/dbus-glib-0.110-config-glib-genmarshal.conf
new file mode 100644
index 000..463638710ad
--- /dev/null
+++ b/dev-libs/dbus-glib/files/dbus-glib-0.110-config-glib-genmarshal.conf
@@ -0,0 +1,76 @@
+From 39f0ae6152acfb3d8ca086090a02e0aa8742f050 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" 
+Date: Sun, 2 Dec 2018 16:26:07 +0100
+Subject: [PATCH] buildsys: use variable for glib-genmarshal
+
+When doing cross-compilation, the path returned by pkg-config for
+glib-genmarshal can be incorrect (because it is the runtime path,
+not the build-time path).
+
+Change configure.ac to use pkg-config to get the variable.
+
+This allows overridig the path at configure time, by using the configure
+option GLIB_GENMARSHAL=/path/toglib-genmarshal
+
+Signed-off-by: "Yann E. MORIN" 
+[smcv: Fix typo in commit message]
+Reviewed-by: Simon McVittie 
+---
+ configure.ac   | 4 ++--
+ dbus/Makefile.am   | 4 ++--
+ dbus/examples/statemachine/Makefile.am | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e00bc38..8be3147 100644
+--- a/configure.ac
 b/configure.ac
+@@ -267,8 +267,8 @@ AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_32],
+   [Warn on use of APIs deprecated before GLib 2.32])
+ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.40, gobject-2.0 >= 2.40, gio-2.0 >= 
2.40])
+ 
+-GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+-AC_SUBST(GLIB_GENMARSHAL)
++PKG_CHECK_VAR([GLIB_GENMARSHAL], [glib-2.0], [glib_genmarshal],,
++[AC_MSG_ERROR([cannot find glib-genmarshal])])
+ 
+ dnl GLib flags
+ AC_SUBST(GLIB_CFLAGS)
+diff --git a/dbus/Makefile.am b/dbus/Makefile.am
+index 37c6334..2e8cb27 100644
+--- a/dbus/Makefile.am
 b/dbus/Makefile.am
+@@ -87,10 +87,10 @@ dbus_binding_tool_LDADD= $(builddir)/libdbus-gtool.la 
$(builddir)/libdbus-glib-1
+ ## we just rebuilt these manually and check them into cvs; easier than
+ ## convincing automake/make to do this properly
+ regenerate-built-sources:
+-  @GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --header 
> dbus-gmarshal.h && \
++  $(GLIB_GENMARSHAL) --prefix=_dbus_g_marshal dbus-gmarshal.list --header 
> dbus-gmarshal.h && \
+   echo '#include ' > dbus-gmarshal.c && 
\
+   echo '#include "dbus-gmarshal.h"' >> dbus-gmarshal.c && 
\
+-@GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --body 
>> dbus-gmarshal.c
++$(GLIB_GENMARSHAL) --prefix=_dbus_g_marshal dbus-gmarshal.list --body 
>> dbus-gmarshal.c
+ 
+ 
+ completiondir = $(sysconfdir)/bash_completion.d
+diff --git a/dbus/examples/statemachine/Makefile.am 
b/dbus/examples/statemachine/Makefile.am
+index 187b044..c8fe029 100644
+--- a/dbus/examples/statemachine/Makefile.am
 b/dbus/examples/statemachine/Makefile.am
+@@ -35,11 +35,11 @@ statemachine-glue.h: statemachine.xml
+ 
+ sm-marshal.c: Makefile sm-marshal.list
+   echo "#include &quo

[gentoo-commits] repo/gentoo:master commit in: dev-libs/dbus-glib/

2020-11-22 Thread Mike Gilbert
commit: b286b26ad58cf1815ec44f50693456fd484d5293
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Nov 23 02:08:32 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 23 02:09:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b286b26a

dev-libs/dbus-glib: inherit toolchain-funcs for tc-is-cross-compiler

Signed-off-by: Mike Gilbert  gentoo.org>

 dev-libs/dbus-glib/dbus-glib-0.110.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild 
b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
index fad3e34a6eb..6e817d8bfe9 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit bash-completion-r1 multilib-minimal
+inherit bash-completion-r1 multilib-minimal toolchain-funcs
 
 DESCRIPTION="D-Bus bindings for glib"
 HOMEPAGE="https://dbus.freedesktop.org/;



[gentoo-commits] repo/gentoo:master commit in: dev-libs/dbus-glib/

2020-11-22 Thread Mike Gilbert
commit: 12d36ad8ddbf9a7ac37feb4b7f51b48e93d3906c
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Nov 23 01:55:49 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 23 01:57:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12d36ad8

dev-libs/dbus-glib: fix cross-compiles

Thanks to David Michael for the ebuild changes

Closes: https://bugs.gentoo.org/346353
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-libs/dbus-glib/dbus-glib-0.110.ebuild | 28 +---
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild 
b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
index 9e47f93d6af..fad3e34a6eb 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit bash-completion-r1 eutils ltprune multilib-minimal
+EAPI=7
+inherit bash-completion-r1 multilib-minimal
 
 DESCRIPTION="D-Bus bindings for glib"
 HOMEPAGE="https://dbus.freedesktop.org/;
@@ -14,17 +14,20 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 
s390 sparc x86 ~amd6
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
-CDEPEND="
+DEPEND="
>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
>=sys-apps/dbus-1.8[${MULTILIB_USEDEP}]
 "
-DEPEND="${CDEPEND}
+RDEPEND="${DEPEND}"
+BDEPEND="
+   >=dev-libs/expat-2.1.0-r3
+   >=dev-libs/glib-2.40:2
+   >=sys-apps/dbus-1.8
>=dev-util/glib-utils-2.40
>=dev-util/gtk-doc-am-1.14
virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}"
+" # CBUILD dependencies are needed to make a native tool while cross-compiling.
 
 DOCS=( AUTHORS ChangeLog HACKING NEWS README )
 
@@ -42,6 +45,15 @@ multilib_src_configure() {
$(use_enable static-libs static)
)
 
+   # Configure a CBUILD directory to make a native build tool.
+   if tc-is-cross-compiler; then
+   mkdir "${BUILD_DIR}-build" || die
+   cd "${BUILD_DIR}-build" || die
+   ECONF_SOURCE="${S}" econf_build
+   myconf+=( 
--with-dbus-binding-tool="$PWD/dbus/dbus-binding-tool" )
+   cd - || die
+   fi
+
ECONF_SOURCE="${S}" econf "${myconf[@]}"
 
ln -s "${S}"/doc/reference/html doc/reference/html || die #460042
@@ -60,6 +72,8 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
+   tc-is-cross-compiler && emake -C "${BUILD_DIR}-build"
+
emake
 
if use test; then
@@ -82,5 +96,5 @@ multilib_src_install_all() {
newbashcomp "${ED}"/etc/bash_completion.d/dbus-bash-completion.sh 
dbus-send
rm -rf "${ED}"/etc/bash_completion.d || die
 
-   prune_libtool_files
+   find "${ED}" -type f -name '*.la' -delete || die
 }



[gentoo-commits] repo/gentoo:master commit in: dev-python/protobuf-python/

2020-11-22 Thread Mike Gilbert
commit: e86112de0e525e28c6ae9c0304c324303fd92601
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sun Nov 22 09:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 22 19:31:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e86112de

dev-python/protobuf-python: 3.13.0-r1 AMD64/X86 stabilization.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild 
b/dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild
index ecca6acde4b..bb2b74222cd 100644
--- a/dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild
@@ -24,7 +24,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/24"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 
~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}



[gentoo-commits] repo/gentoo:master commit in: dev-java/protobuf-java/

2020-11-22 Thread Mike Gilbert
commit: 4a3a34e9a538f6c10516e40bc630f2a904396bb3
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sun Nov 22 05:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 22 19:31:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a3a34e9

dev-java/protobuf-java: Version bump (3.14.0).

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-java/protobuf-java/Manifest|  1 +
 dev-java/protobuf-java/protobuf-java-3.14.0.ebuild | 56 ++
 2 files changed, 57 insertions(+)

diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 579b5e38b3f..517abfc7f26 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -2,3 +2,4 @@ DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 
97b450c0623593efe6a42b66582ff183344b
 DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 
6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f
 SHA512 
84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
 DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B 
2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b
 SHA512 
c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c
 DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 
168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2
 SHA512 
514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
+DIST protobuf-3.14.0.tar.gz 5319779 BLAKE2B 
cea083eea4d7fec441536effdfe2bf1811913154b0cc0da2f14f4edeb0efb200236da102c36700e24fab73fd9883aa90576ad64603a7f175ebf5cef0dc29aae5
 SHA512 
9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11

diff --git a/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild 
b/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild
new file mode 100644
index 000..3f0a2dec480
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.14.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2008-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+if [[ "${PV}" == "" ]]; then
+   inherit git-r3
+
+   EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf;
+   EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ 
https://github.com/protocolbuffers/protobuf;
+if [[ "${PV}" == "" ]]; then
+   SRC_URI=""
+else
+   
SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> 
protobuf-${PV}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/25"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos 
~x86-macos"
+IUSE=""
+
+BDEPEND="~dev-libs/protobuf-${PV}
+   >=virtual/jdk-1.7"
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7
+   ! /dev/null || die
+   eapply_user
+   popd > /dev/null || die
+
+   java-pkg-2_src_prepare
+}
+
+src_compile() {
+   "${BROOT}/usr/bin/protoc" --java_out=core/src/main/java -I../src 
../src/google/protobuf/descriptor.proto || die
+   JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" 
java-pkg-simple_src_compile
+}
+
+src_install() {
+   JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" 
java-pkg-simple_src_install
+}



[gentoo-commits] repo/gentoo:master commit in: dev-python/protobuf-python/

2020-11-22 Thread Mike Gilbert
commit: 43bf2ed6043fc7388c9417506578628180f63a6d
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sun Nov 22 06:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 22 19:31:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43bf2ed6

dev-python/protobuf-python: Version bump (3.14.0).

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-python/protobuf-python/Manifest|  1 +
 .../protobuf-python/protobuf-python-3.14.0.ebuild  | 66 ++
 2 files changed, 67 insertions(+)

diff --git a/dev-python/protobuf-python/Manifest 
b/dev-python/protobuf-python/Manifest
index 77fbd5bd334..f999d53e988 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1,3 +1,4 @@
 DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 
6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f
 SHA512 
84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
 DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B 
2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b
 SHA512 
c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c
 DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 
168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2
 SHA512 
514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
+DIST protobuf-3.14.0.tar.gz 5319779 BLAKE2B 
cea083eea4d7fec441536effdfe2bf1811913154b0cc0da2f14f4edeb0efb200236da102c36700e24fab73fd9883aa90576ad64603a7f175ebf5cef0dc29aae5
 SHA512 
9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11

diff --git a/dev-python/protobuf-python/protobuf-python-3.14.0.ebuild 
b/dev-python/protobuf-python/protobuf-python-3.14.0.ebuild
new file mode 100644
index 000..68484e4d06d
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.14.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2008-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+
+inherit distutils-r1
+
+if [[ "${PV}" == "" ]]; then
+   inherit git-r3
+
+   EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf;
+   EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ 
https://github.com/protocolbuffers/protobuf;
+if [[ "${PV}" == "" ]]; then
+   SRC_URI=""
+else
+   
SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> 
protobuf-${PV}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/25"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+BDEPEND="${PYTHON_DEPS}
+   ~dev-libs/protobuf-${PV}
+   dev-python/namespace-google[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${PYTHON_DEPS}
+   ~dev-libs/protobuf-${PV}"
+RDEPEND="${BDEPEND}
+   ! /dev/null || die
+   eapply 
"${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
+   eapply_user
+   popd > /dev/null || die
+
+   distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+   mydistutilsargs=(--cpp_implementation)
+}
+
+python_test() {
+   esetup.py test
+}
+
+python_install_all() {
+   distutils-r1_python_install_all
+
+   find "${D}" -name "*.pth" -type f -delete || die
+}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/

2020-11-22 Thread Mike Gilbert
commit: 86298de9cb9a8dd239fc9dae3e5470715f517a6f
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sun Nov 22 07:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 22 19:31:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86298de9

dev-libs/protobuf: 3.13.0 AMD64/X86 stabilization.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-libs/protobuf/protobuf-3.13.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/protobuf/protobuf-3.13.0.ebuild 
b/dev-libs/protobuf/protobuf-3.13.0.ebuild
index ae5381a0692..87c46cb84fa 100644
--- a/dev-libs/protobuf/protobuf-3.13.0.ebuild
+++ b/dev-libs/protobuf/protobuf-3.13.0.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/24"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/protobuf-java/

2020-11-22 Thread Mike Gilbert
commit: d38aa8c376786e0402e16ef8ded9cff3763b1dd0
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sun Nov 22 08:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 22 19:31:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d38aa8c3

dev-java/protobuf-java: 3.13.0 AMD64/X86 stabilization.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-java/protobuf-java/protobuf-java-3.13.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild 
b/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
index e26dfe9374b..9f6b38797fe 100644
--- a/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/24"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos 
~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos 
~x86-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/, dev-libs/protobuf/files/

2020-11-22 Thread Mike Gilbert
commit: 8674b9ae5d43cf28bf1acbb121036c3ac5071ec1
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sun Nov 22 04:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 22 19:31:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8674b9ae

dev-libs/protobuf: Version bump (3.14.0).

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-libs/protobuf/Manifest |   1 +
 ...protobuf-3.14.0-protoc_input_output_files.patch | 268 +
 ...protobuf-.ebuild => protobuf-3.14.0.ebuild} |  14 +-
 dev-libs/protobuf/protobuf-.ebuild |   2 +-
 4 files changed, 282 insertions(+), 3 deletions(-)

diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 579b5e38b3f..517abfc7f26 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -2,3 +2,4 @@ DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 
97b450c0623593efe6a42b66582ff183344b
 DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 
6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f
 SHA512 
84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
 DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B 
2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b
 SHA512 
c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c
 DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 
168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2
 SHA512 
514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
+DIST protobuf-3.14.0.tar.gz 5319779 BLAKE2B 
cea083eea4d7fec441536effdfe2bf1811913154b0cc0da2f14f4edeb0efb200236da102c36700e24fab73fd9883aa90576ad64603a7f175ebf5cef0dc29aae5
 SHA512 
9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11

diff --git 
a/dev-libs/protobuf/files/protobuf-3.14.0-protoc_input_output_files.patch 
b/dev-libs/protobuf/files/protobuf-3.14.0-protoc_input_output_files.patch
new file mode 100644
index 000..a36bdcb734a
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.14.0-protoc_input_output_files.patch
@@ -0,0 +1,268 @@
+https://github.com/protocolbuffers/protobuf/pull/235
+
+--- /src/google/protobuf/compiler/command_line_interface.cc
 /src/google/protobuf/compiler/command_line_interface.cc
+@@ -1109,6 +1109,28 @@
+   }
+ 
+   if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
++bool success = false;
++int in_fd = STDIN_FILENO;
++int out_fd = STDOUT_FILENO;
++
++if (!protobuf_in_path_.empty()) {
++  in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
++  if (in_fd == -1) {
++std::cerr << protobuf_in_path_ << ": error: failed to open file." << 
std::endl;
++return 1;
++  }
++}
++if (!protobuf_out_path_.empty()) {
++  out_fd = open(protobuf_out_path_.c_str(),
++O_WRONLY | O_CREAT | O_TRUNC,
++0644);
++  if (out_fd == -1) {
++std::cerr << protobuf_out_path_ << ": error: failed to open file." << 
std::endl;
++close(in_fd);
++return 1;
++  }
++}
++
+ if (codec_type_.empty()) {
+   // HACK:  Define an EmptyMessage type to use for decoding.
+   DescriptorPool pool;
+@@ -1117,13 +1139,20 @@
+   file.add_message_type()->set_name("EmptyMessage");
+   GOOGLE_CHECK(pool.BuildFile(file) != NULL);
+   codec_type_ = "EmptyMessage";
+-  if (!EncodeOrDecode()) {
+-return 1;
+-  }
++  success = EncodeOrDecode(, in_fd, out_fd);
+ } else {
+-  if (!EncodeOrDecode(descriptor_pool.get())) {
+-return 1;
+-  }
++  success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd);
++}
++
++if (in_fd != STDIN_FILENO) {
++  close(in_fd);
++}
++if (out_fd != STDOUT_FILENO) {
++  close(out_fd);
++}
++
++if (!success) {
++  return 1;
+ }
+   }
+ 
+@@ -1161,6 +1190,11 @@
+   for (int i = 0; i < proto_path_.size(); i++) {
+ source_tree->MapPath(proto_path_[i].first, proto_path_[i].second);
+   }
++  if (mode_ == MODE_COMPILE &&
++  (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) {
++std::cerr << "--protobuf_in and --protobuf_out are only valid with "
++ << "decode operations. Ignoring.";
++  }
+ 
+   // Map input files to virtual paths if possible.
+   

[gentoo-commits] repo/gentoo:master commit in: dev-python/protobuf-python/

2020-11-22 Thread Mike Gilbert
commit: 99a07a446564dc15976d472f8601a8ad27dad2ee
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sun Nov 22 02:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 22 19:31:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99a07a44

dev-python/protobuf-python: Update subslot.

https://github.com/protocolbuffers/protobuf/commit/27100b40fd45b384b690020d9306d7e501a65d16

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-python/protobuf-python/protobuf-python-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/protobuf-python/protobuf-python-.ebuild 
b/dev-python/protobuf-python/protobuf-python-.ebuild
index faaae29a1aa..8deb3225f65 100644
--- a/dev-python/protobuf-python/protobuf-python-.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-.ebuild
@@ -23,7 +23,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/24"
+SLOT="0/25"
 KEYWORDS=""
 IUSE=""
 



[gentoo-commits] repo/gentoo:master commit in: app-i18n/opencc/

2020-11-22 Thread Mike Gilbert
commit: 998cf7d913ef152cc0b21377727834a1063a4bfa
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Nov 19 07:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 22 19:31:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998cf7d9

app-i18n/opencc: Fix LICENSE.

deps directory contains bundled copies of dev-cpp/gtest (used by tests),
dev-cpp/tclap, dev-libs/darts, dev-libs/marisa, dev-libs/rapidjson and
dev-cpp/benchmark (used by benchmark tests, disabled by default).

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/opencc/opencc-1.0.5.ebuild | 7 ++-
 app-i18n/opencc/opencc-.ebuild  | 8 +++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app-i18n/opencc/opencc-1.0.5.ebuild 
b/app-i18n/opencc/opencc-1.0.5.ebuild
index 6e3c86035fd..791c79b1831 100644
--- a/app-i18n/opencc/opencc-1.0.5.ebuild
+++ b/app-i18n/opencc/opencc-1.0.5.ebuild
@@ -20,7 +20,12 @@ else
SRC_URI="https://github.com/BYVoid/OpenCC/archive/ver.${PV}.tar.gz -> 
${P}.tar.gz"
 fi
 
-LICENSE="Apache-2.0"
+# OpenCC: Apache-2.0
+# deps/darts-clone: BSD-2
+# deps/gtest-1.7.0: BSD
+# deps/rapidjson-0.11: MIT
+# deps/tclap-1.2.1: MIT
+LICENSE="Apache-2.0 BSD-2 MIT test? ( BSD )"
 SLOT="0/2"
 KEYWORDS="amd64 arm64 hppa ppc ppc64 sparc x86"
 IUSE="doc test"

diff --git a/app-i18n/opencc/opencc-.ebuild 
b/app-i18n/opencc/opencc-.ebuild
index bcf43765ab1..8a1dbc501c8 100644
--- a/app-i18n/opencc/opencc-.ebuild
+++ b/app-i18n/opencc/opencc-.ebuild
@@ -20,7 +20,13 @@ else
SRC_URI="https://github.com/BYVoid/OpenCC/archive/ver.${PV}.tar.gz -> 
${P}.tar.gz"
 fi
 
-LICENSE="Apache-2.0"
+# OpenCC: Apache-2.0
+# deps/darts-clone: BSD-2
+# deps/gtest-1.11.0: BSD
+# deps/marisa-0.2.5: || ( BSD-2 LGPL-2.1+ )
+# deps/rapidjson-1.1.0: MIT
+# deps/tclap-1.2.2: MIT
+LICENSE="Apache-2.0 BSD-2 MIT || ( BSD-2 LGPL-2.1+ ) test? ( BSD )"
 SLOT="0/2"
 KEYWORDS=""
 IUSE="doc test"



[gentoo-commits] repo/gentoo:master commit in: app-i18n/opencc/

2020-11-22 Thread Mike Gilbert
commit: 29df5e9a44a63f68ec79b58fcd8de3c7905fe2da
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Nov 19 08:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 22 19:31:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29df5e9a

app-i18n/opencc: Version bump (1.0.6).

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/opencc/Manifest|  1 +
 app-i18n/opencc/opencc-1.0.6.ebuild | 63 +
 2 files changed, 64 insertions(+)

diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest
index 1a7d5657573..a71aa95470f 100644
--- a/app-i18n/opencc/Manifest
+++ b/app-i18n/opencc/Manifest
@@ -1 +1,2 @@
 DIST opencc-1.0.5.tar.gz 1598354 BLAKE2B 
a66b32b96dab543d8401960ff0548a4e3f9414606513941426eacf105bca0755a7b364c68b7eb996ef82444e52f849d2f8151353a14fb97a358ad1463fbea2d3
 SHA512 
3fbefbafe5c3c2491032158577ab97b5a3edf6ea98a03a7250deba082b72c3112ad4a3396d1a469936ec32e1d141f0a2236001c2891ac9c793add2b082596cc1
+DIST opencc-1.0.6.tar.gz 1621561 BLAKE2B 
d58ee0e04e133fbf6a7632788bcaf0f7891bb74051a970075f6d94b048adfec7bbe4438913933d7dfdd4d58ec2c1a5ec47685415c26532ddd8c13e8abd52cab6
 SHA512 
67c7bb7432483c1781701dc64ff28e4d5750898ed3d2d41f97d3782918b5f9aa1a49baa1e3a58e4b24cfbd2adcf9ea166a05ad934221fb1cb7afb35e909749e7

diff --git a/app-i18n/opencc/opencc-1.0.6.ebuild 
b/app-i18n/opencc/opencc-1.0.6.ebuild
new file mode 100644
index 000..70b4f7a65c7
--- /dev/null
+++ b/app-i18n/opencc/opencc-1.0.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2010-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
+
+inherit cmake python-any-r1
+
+if [[ "${PV}" == "" ]]; then
+   inherit git-r3
+
+   EGIT_REPO_URI="https://github.com/BYVoid/OpenCC;
+fi
+
+DESCRIPTION="Library for conversion between Traditional and Simplified Chinese 
characters"
+HOMEPAGE="https://github.com/BYVoid/OpenCC;
+if [[ "${PV}" == "" ]]; then
+   SRC_URI=""
+else
+   SRC_URI="https://github.com/BYVoid/OpenCC/archive/ver.${PV}.tar.gz -> 
${P}.tar.gz"
+fi
+
+# OpenCC: Apache-2.0
+# deps/darts-clone: BSD-2
+# deps/gtest-1.7.0: BSD
+# deps/rapidjson-0.11: MIT
+# deps/tclap-1.2.1: MIT
+LICENSE="Apache-2.0 BSD-2 MIT test? ( BSD )"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+   doc? ( app-doc/doxygen )"
+DEPEND=""
+RDEPEND=""
+
+if [[ "${PV}" != "" ]]; then
+   S="${WORKDIR}/OpenCC-ver.${PV}"
+fi
+
+PATCHES=(
+   "${FILESDIR}/${PN}-stop-copy.patch"
+)
+
+DOCS=(AUTHORS NEWS.md README.md)
+
+src_prepare() {
+   cmake_src_prepare
+
+   sed -e "s:\${DIR_SHARE_OPENCC}/doc:share/doc/${PF}:" -i 
doc/CMakeLists.txt || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DBUILD_DOCUMENTATION=$(usex doc ON OFF)
+   -DBUILD_SHARED_LIBS=ON
+   -DENABLE_GTEST=$(usex test ON OFF)
+   )
+
+   cmake_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: dev-python/protobuf-python/

2020-11-22 Thread Mike Gilbert
commit: edebaa855eba8aad1429c48b7e3e8ee46d091114
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sun Nov 22 03:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 22 19:31:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edebaa85

dev-python/protobuf-python: Update dependencies.

https://github.com/protocolbuffers/protobuf/commit/3abbbd8870054a89c7c3d1005f49eead83c87ded
https://github.com/protocolbuffers/protobuf/commit/7daf0aa7b00261bc8e0a433c58e74083cd58ea43

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-python/protobuf-python/protobuf-python-.ebuild | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/dev-python/protobuf-python/protobuf-python-.ebuild 
b/dev-python/protobuf-python/protobuf-python-.ebuild
index 8deb3225f65..cf83c9cb0fb 100644
--- a/dev-python/protobuf-python/protobuf-python-.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+DISTUTILS_USE_SETUPTOOLS="bdepend"
 
 inherit distutils-r1
 
@@ -49,19 +49,12 @@ python_prepare_all() {
popd > /dev/null || die
 
distutils-r1_python_prepare_all
-
-   sed -e "/^[[:space:]]*setup_requires = \['wheel'\],$/d" -i setup.py || 
die
 }
 
 python_configure_all() {
mydistutilsargs=(--cpp_implementation)
 }
 
-python_compile() {
-   python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} 
-fno-strict-aliasing"
-   distutils-r1_python_compile
-}
-
 python_test() {
esetup.py test
 }



[gentoo-commits] repo/gentoo:master commit in: dev-libs/protobuf/

2020-11-22 Thread Mike Gilbert
commit: 63465ed7cfabef1a2ccf12c308f7b8ae54e58e3c
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sun Nov 22 00:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 22 19:31:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63465ed7

dev-libs/protobuf: Update subslot.

https://github.com/protocolbuffers/protobuf/commit/27100b40fd45b384b690020d9306d7e501a65d16

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-libs/protobuf/protobuf-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/protobuf/protobuf-.ebuild 
b/dev-libs/protobuf/protobuf-.ebuild
index c30e4aa6d46..f11f9015315 100644
--- a/dev-libs/protobuf/protobuf-.ebuild
+++ b/dev-libs/protobuf/protobuf-.ebuild
@@ -21,7 +21,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/24"
+SLOT="0/25"
 KEYWORDS=""
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: app-i18n/opencc/

2020-11-22 Thread Mike Gilbert
commit: 70bfa994cd7bd2fd4c637d7f2d536523c0ffbf62
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Nov 19 09:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 22 19:31:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70bfa994

app-i18n/opencc: Set maintainer Arfrever.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/opencc/metadata.xml | 26 +++---
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/app-i18n/opencc/metadata.xml b/app-i18n/opencc/metadata.xml
index 377bdc587a2..b53d22485f1 100644
--- a/app-i18n/opencc/metadata.xml
+++ b/app-i18n/opencc/metadata.xml
@@ -1,15 +1,19 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-c...@gentoo.org
-Cjk
-  
-  
-OpenCC is a library for converting characters and phrases between
-Traditional Chinese and Simplified Chinese.
-  
-  
-BYVoid/OpenCC
-  
+   
+   arfrever@gmail.com
+   Arfrever Frehtes Taifersar Arahesis
+   
+   
+   c...@gentoo.org
+   Cjk
+   
+   
+   OpenCC is a library for converting characters and phrases 
between
+   Traditional Chinese and Simplified Chinese.
+   
+   
+   BYVoid/OpenCC
+   
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/protobuf-java/

2020-11-22 Thread Mike Gilbert
commit: 77215afd29d86e72275d2167f91e7dd4b255a438
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sun Nov 22 01:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 22 19:31:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77215afd

dev-java/protobuf-java: Update subslot.

https://github.com/protocolbuffers/protobuf/commit/27100b40fd45b384b690020d9306d7e501a65d16

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-java/protobuf-java/protobuf-java-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/protobuf-java/protobuf-java-.ebuild 
b/dev-java/protobuf-java/protobuf-java-.ebuild
index 8f4365200b1..afc57322716 100644
--- a/dev-java/protobuf-java/protobuf-java-.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-.ebuild
@@ -22,7 +22,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/24"
+SLOT="0/25"
 KEYWORDS=""
 IUSE=""
 



[gentoo-commits] repo/gentoo:master commit in: app-i18n/opencc/

2020-11-22 Thread Mike Gilbert
commit: 823ec304979f656e88ceadcbc7f6160773edd0c9
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Nov 19 05:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 22 19:31:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=823ec304

app-i18n/opencc: Stop using no longer needed patch.

https://github.com/BYVoid/OpenCC/commit/ba4d20af2fb82858a1903d03696c1d955fdd0103

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/opencc/opencc-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-i18n/opencc/opencc-.ebuild 
b/app-i18n/opencc/opencc-.ebuild
index 39ac0059d23..9fb2129d45d 100644
--- a/app-i18n/opencc/opencc-.ebuild
+++ b/app-i18n/opencc/opencc-.ebuild
@@ -34,7 +34,6 @@ if [[ "${PV}" != "" ]]; then
 fi
 
 PATCHES=(
-   "${FILESDIR}/${PN}-test.patch"
"${FILESDIR}/${PN}-stop-copy.patch"
 )
 



[gentoo-commits] repo/gentoo:master commit in: app-i18n/opencc/

2020-11-22 Thread Mike Gilbert
commit: f11574b541454df7298b2188e8597442cd699710
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Nov 19 03:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 22 19:31:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f11574b5

app-i18n/opencc: Use EAPI="7".

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/opencc/opencc-1.0.5.ebuild | 39 +++--
 app-i18n/opencc/opencc-.ebuild  | 39 +++--
 2 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/app-i18n/opencc/opencc-1.0.5.ebuild 
b/app-i18n/opencc/opencc-1.0.5.ebuild
index 63d6cf51df7..f4f8860efa3 100644
--- a/app-i18n/opencc/opencc-1.0.5.ebuild
+++ b/app-i18n/opencc/opencc-1.0.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2010-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit cmake-utils
 
@@ -9,14 +9,15 @@ if [[ "${PV}" == "" ]]; then
inherit git-r3
 
EGIT_REPO_URI="https://github.com/BYVoid/OpenCC;
-else
-   inherit vcs-snapshot
-
-   SRC_URI="https://github.com/BYVoid/${PN^^[oc]}/archive/ver.${PV}.tar.gz 
-> ${P}.tar.gz"
 fi
 
-DESCRIPTION="Libraries for conversion between Traditional and Simplified 
Chinese"
+DESCRIPTION="Library for conversion between Traditional and Simplified Chinese 
characters"
 HOMEPAGE="https://github.com/BYVoid/OpenCC;
+if [[ "${PV}" == "" ]]; then
+   SRC_URI=""
+else
+   SRC_URI="https://github.com/BYVoid/OpenCC/archive/ver.${PV}.tar.gz -> 
${P}.tar.gz"
+fi
 
 LICENSE="Apache-2.0"
 SLOT="0/2"
@@ -24,25 +25,33 @@ KEYWORDS="amd64 arm64 hppa ppc ppc64 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-DEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="doc? ( app-doc/doxygen )"
+DEPEND=""
+RDEPEND=""
+
+if [[ "${PV}" != "" ]]; then
+   S="${WORKDIR}/OpenCC-ver.${PV}"
+fi
 
-DOCS="AUTHORS *.md"
 PATCHES=(
-   "${FILESDIR}"/${PN}-test.patch
-   "${FILESDIR}"/${PN}-stop-copy.patch
+   "${FILESDIR}/${PN}-test.patch"
+   "${FILESDIR}/${PN}-stop-copy.patch"
 )
 
-src_prepare() {
-   sed -i "s|\${DIR_SHARE_OPENCC}/doc|share/doc/${PF}|" doc/CMakeLists.txt
+DOCS=(AUTHORS NEWS.md README.md)
 
+src_prepare() {
cmake-utils_src_prepare
+
+   sed -e "s:\${DIR_SHARE_OPENCC}/doc:share/doc/${PF}:" -i 
doc/CMakeLists.txt || die
 }
 
 src_configure() {
local mycmakeargs=(
-   -DBUILD_DOCUMENTATION=$(usex doc)
+   -DBUILD_DOCUMENTATION=$(usex doc ON OFF)
-DBUILD_SHARED_LIBS=ON
-   -DENABLE_GTEST=$(usex test)
+   -DENABLE_GTEST=$(usex test ON OFF)
)
+
cmake-utils_src_configure
 }

diff --git a/app-i18n/opencc/opencc-.ebuild 
b/app-i18n/opencc/opencc-.ebuild
index 0b47d39a633..ea43829ed2f 100644
--- a/app-i18n/opencc/opencc-.ebuild
+++ b/app-i18n/opencc/opencc-.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2010-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit cmake-utils
 
@@ -9,14 +9,15 @@ if [[ "${PV}" == "" ]]; then
inherit git-r3
 
EGIT_REPO_URI="https://github.com/BYVoid/OpenCC;
-else
-   inherit vcs-snapshot
-
-   SRC_URI="https://github.com/BYVoid/${PN^^[oc]}/archive/ver.${PV}.tar.gz 
-> ${P}.tar.gz"
 fi
 
-DESCRIPTION="Libraries for conversion between Traditional and Simplified 
Chinese"
+DESCRIPTION="Library for conversion between Traditional and Simplified Chinese 
characters"
 HOMEPAGE="https://github.com/BYVoid/OpenCC;
+if [[ "${PV}" == "" ]]; then
+   SRC_URI=""
+else
+   SRC_URI="https://github.com/BYVoid/OpenCC/archive/ver.${PV}.tar.gz -> 
${P}.tar.gz"
+fi
 
 LICENSE="Apache-2.0"
 SLOT="0/2"
@@ -24,25 +25,33 @@ KEYWORDS=""
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-DEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="doc? ( app-doc/doxygen )"
+DEPEND=""
+RDEPEND=""
+
+if [[ "${PV}" != "" ]]; then
+   S="${WORKDIR}/OpenCC-ver.${PV}"
+fi
 
-DOCS="AUTHORS *.md"
 PATCHES=(
-   "${FILESDIR}"/${PN}-test.patch
-   "${FILESDIR}"/${PN}-stop-copy.patch
+   "${FILESDIR}/${PN}-t

[gentoo-commits] repo/gentoo:master commit in: app-i18n/opencc/

2020-11-22 Thread Mike Gilbert
commit: 8cfa126075f915b07cefa3b7730c3e30503c8f67
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Nov 19 06:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 22 19:31:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cfa1260

app-i18n/opencc: Add proper usage of python-any-r1.eclass.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/opencc/opencc-1.0.5.ebuild | 6 --
 app-i18n/opencc/opencc-.ebuild  | 6 --
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app-i18n/opencc/opencc-1.0.5.ebuild 
b/app-i18n/opencc/opencc-1.0.5.ebuild
index fea4bcd352c..6e3c86035fd 100644
--- a/app-i18n/opencc/opencc-1.0.5.ebuild
+++ b/app-i18n/opencc/opencc-1.0.5.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
 
-inherit cmake
+inherit cmake python-any-r1
 
 if [[ "${PV}" == "" ]]; then
inherit git-r3
@@ -25,7 +26,8 @@ KEYWORDS="amd64 arm64 hppa ppc ppc64 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="${PYTHON_DEPS}
+   doc? ( app-doc/doxygen )"
 DEPEND=""
 RDEPEND=""
 

diff --git a/app-i18n/opencc/opencc-.ebuild 
b/app-i18n/opencc/opencc-.ebuild
index 9fb2129d45d..bcf43765ab1 100644
--- a/app-i18n/opencc/opencc-.ebuild
+++ b/app-i18n/opencc/opencc-.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
 
-inherit cmake
+inherit cmake python-any-r1
 
 if [[ "${PV}" == "" ]]; then
inherit git-r3
@@ -25,7 +26,8 @@ KEYWORDS=""
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="${PYTHON_DEPS}
+   doc? ( app-doc/doxygen )"
 DEPEND=""
 RDEPEND=""
 



[gentoo-commits] repo/gentoo:master commit in: dev-libs/utfcpp/

2020-11-22 Thread Mike Gilbert
commit: aa960fbe02c30fc32590a9eb1aacbeda3395f07b
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Nov 19 02:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 22 19:31:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa960fbe

dev-libs/utfcpp: Version bump (3.1.2).

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-libs/utfcpp/Manifest|  1 +
 dev-libs/utfcpp/utfcpp-3.1.2.ebuild | 47 +
 2 files changed, 48 insertions(+)

diff --git a/dev-libs/utfcpp/Manifest b/dev-libs/utfcpp/Manifest
index a44e213e828..3055ba56693 100644
--- a/dev-libs/utfcpp/Manifest
+++ b/dev-libs/utfcpp/Manifest
@@ -1,2 +1,3 @@
 DIST utfcpp-3.1.1.tar.gz 26374 BLAKE2B 
93ad55c113c922e0105b509adf8dc1505e625bfeed0c60dabe7243ec288e3dd13b79b9382af2fff6daf780c5ebf9da32a492263d4998204222c1e446d16f4473
 SHA512 
720e2eba5c04f0bc4903a287138149a9cd432bc68bb163fe36b2e0d26d8bf616b4665f389b4a9c97af6ae7869e78973d97db976a4745512a241eebf774608997
+DIST utfcpp-3.1.2.tar.gz 26388 BLAKE2B 
f0ebf7f054c488259d2a409b2c5201b73e928901cf337cdc2a99a2f64deaf431ee60328b3b61e134d3cd49428eb0c921057ea248269029ef2838ed72dd8af7d7
 SHA512 
d43df19d9e8652291f1301a326ec0d592bad43d6ecf9086947037f0ae0c1e70c2d96082c48066639e2b7c57c0ea0e4782d6b215d017cf96a4c73ff3a15feec75
 DIST utfcpp-3.1.tar.gz 25871 BLAKE2B 
6bafb933b777e842375b3dc6b1b5bc41efb0e9f40bbd33ccbbaf07b57a28c4e485d596725297fc2de83c23fa3c66872519883727714d236f4a37e07ed4825fc9
 SHA512 
826ac7aa61215ac2144fa3f5edc7f291c3dd25dc69b0c82526840f4651f822515ec262915e1117d975e5c5dd729f6166806a5d397262f59a2b323eb7009671f5

diff --git a/dev-libs/utfcpp/utfcpp-3.1.2.ebuild 
b/dev-libs/utfcpp/utfcpp-3.1.2.ebuild
new file mode 100644
index 000..14032157c03
--- /dev/null
+++ b/dev-libs/utfcpp/utfcpp-3.1.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2015-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake
+
+if [[ "${PV}" == "" ]]; then
+   inherit git-r3
+
+   EGIT_REPO_URI="https://github.com/nemtrif/utfcpp;
+   EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="UTF-8 C++ library"
+HOMEPAGE="https://github.com/nemtrif/utfcpp;
+if [[ "${PV}" == "" ]]; then
+   SRC_URI=""
+else
+   SRC_URI="https://github.com/nemtrif/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+fi
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND=""
+DEPEND="test? ( dev-cpp/gtest )"
+RDEPEND=""
+
+src_prepare() {
+   sed -e "/add_subdirectory(extern\/gtest)/d" -i CMakeLists.txt || die
+   sed -e "s/gtest_main/gtest &/" -i tests/CMakeLists.txt || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DUTF8_SAMPLES=OFF
+   -DUTF8_TESTS=$(usex test ON OFF)
+   )
+
+   cmake_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/utfcpp/

2020-11-22 Thread Mike Gilbert
commit: 2fd03636fc46e1a070b0f2521ba79490524d73c8
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Nov 19 00:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 22 19:31:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fd03636

dev-libs/utfcpp: Use cmake.eclass.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-libs/utfcpp/utfcpp-3.1.ebuild  | 6 +++---
 dev-libs/utfcpp/utfcpp-.ebuild | 8 
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev-libs/utfcpp/utfcpp-3.1.ebuild 
b/dev-libs/utfcpp/utfcpp-3.1.ebuild
index 5afa6b05063..65c032f5f0a 100644
--- a/dev-libs/utfcpp/utfcpp-3.1.ebuild
+++ b/dev-libs/utfcpp/utfcpp-3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake-utils
+inherit cmake
 
 if [[ "${PV}" == "" ]]; then
inherit git-r3
@@ -34,7 +34,7 @@ src_prepare() {
sed -e "/add_subdirectory(extern\/gtest)/d" -i CMakeLists.txt || die
sed -e "s/gtest_main/gtest &/" -i tests/CMakeLists.txt || die
 
-   cmake-utils_src_prepare
+   cmake_src_prepare
 }
 
 src_configure() {
@@ -43,5 +43,5 @@ src_configure() {
-DUTF8_TESTS=$(usex test ON OFF)
)
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }

diff --git a/dev-libs/utfcpp/utfcpp-.ebuild 
b/dev-libs/utfcpp/utfcpp-.ebuild
index 2b6fa17b596..ca5002a6125 100644
--- a/dev-libs/utfcpp/utfcpp-.ebuild
+++ b/dev-libs/utfcpp/utfcpp-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2015-2019 Gentoo Authors
+# Copyright 2015-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit cmake-utils
+inherit cmake
 
 if [[ "${PV}" == "" ]]; then
inherit git-r3
@@ -34,7 +34,7 @@ src_prepare() {
sed -e "/add_subdirectory(extern\/gtest)/d" -i CMakeLists.txt || die
sed -e "s/gtest_main/gtest &/" -i tests/CMakeLists.txt || die
 
-   cmake-utils_src_prepare
+   cmake_src_prepare
 }
 
 src_configure() {
@@ -43,5 +43,5 @@ src_configure() {
-DUTF8_TESTS=$(usex test ON OFF)
)
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }



[gentoo-commits] repo/gentoo:master commit in: dev-libs/utfcpp/

2020-11-22 Thread Mike Gilbert
commit: bebb6b63662c3620fdf0e4bc4ae4464d9145dca5
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Nov 19 01:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 22 19:31:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bebb6b63

dev-libs/utfcpp: Version bump (3.1.1).

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-libs/utfcpp/Manifest|  1 +
 dev-libs/utfcpp/utfcpp-3.1.1.ebuild | 47 +
 2 files changed, 48 insertions(+)

diff --git a/dev-libs/utfcpp/Manifest b/dev-libs/utfcpp/Manifest
index eb0f6b3cda3..a44e213e828 100644
--- a/dev-libs/utfcpp/Manifest
+++ b/dev-libs/utfcpp/Manifest
@@ -1 +1,2 @@
+DIST utfcpp-3.1.1.tar.gz 26374 BLAKE2B 
93ad55c113c922e0105b509adf8dc1505e625bfeed0c60dabe7243ec288e3dd13b79b9382af2fff6daf780c5ebf9da32a492263d4998204222c1e446d16f4473
 SHA512 
720e2eba5c04f0bc4903a287138149a9cd432bc68bb163fe36b2e0d26d8bf616b4665f389b4a9c97af6ae7869e78973d97db976a4745512a241eebf774608997
 DIST utfcpp-3.1.tar.gz 25871 BLAKE2B 
6bafb933b777e842375b3dc6b1b5bc41efb0e9f40bbd33ccbbaf07b57a28c4e485d596725297fc2de83c23fa3c66872519883727714d236f4a37e07ed4825fc9
 SHA512 
826ac7aa61215ac2144fa3f5edc7f291c3dd25dc69b0c82526840f4651f822515ec262915e1117d975e5c5dd729f6166806a5d397262f59a2b323eb7009671f5

diff --git a/dev-libs/utfcpp/utfcpp-3.1.1.ebuild 
b/dev-libs/utfcpp/utfcpp-3.1.1.ebuild
new file mode 100644
index 000..14032157c03
--- /dev/null
+++ b/dev-libs/utfcpp/utfcpp-3.1.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2015-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake
+
+if [[ "${PV}" == "" ]]; then
+   inherit git-r3
+
+   EGIT_REPO_URI="https://github.com/nemtrif/utfcpp;
+   EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="UTF-8 C++ library"
+HOMEPAGE="https://github.com/nemtrif/utfcpp;
+if [[ "${PV}" == "" ]]; then
+   SRC_URI=""
+else
+   SRC_URI="https://github.com/nemtrif/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+fi
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND=""
+DEPEND="test? ( dev-cpp/gtest )"
+RDEPEND=""
+
+src_prepare() {
+   sed -e "/add_subdirectory(extern\/gtest)/d" -i CMakeLists.txt || die
+   sed -e "s/gtest_main/gtest &/" -i tests/CMakeLists.txt || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DUTF8_SAMPLES=OFF
+   -DUTF8_TESTS=$(usex test ON OFF)
+   )
+
+   cmake_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: app-i18n/opencc/

2020-11-22 Thread Mike Gilbert
commit: d41d7d9cae09bd022d655ba204e7f89678c26869
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Nov 19 04:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 22 19:31:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d41d7d9c

app-i18n/opencc: Use cmake.eclass.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/opencc/opencc-1.0.5.ebuild | 6 +++---
 app-i18n/opencc/opencc-.ebuild  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-i18n/opencc/opencc-1.0.5.ebuild 
b/app-i18n/opencc/opencc-1.0.5.ebuild
index f4f8860efa3..fea4bcd352c 100644
--- a/app-i18n/opencc/opencc-1.0.5.ebuild
+++ b/app-i18n/opencc/opencc-1.0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake-utils
+inherit cmake
 
 if [[ "${PV}" == "" ]]; then
inherit git-r3
@@ -41,7 +41,7 @@ PATCHES=(
 DOCS=(AUTHORS NEWS.md README.md)
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
 
sed -e "s:\${DIR_SHARE_OPENCC}/doc:share/doc/${PF}:" -i 
doc/CMakeLists.txt || die
 }
@@ -53,5 +53,5 @@ src_configure() {
-DENABLE_GTEST=$(usex test ON OFF)
)
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }

diff --git a/app-i18n/opencc/opencc-.ebuild 
b/app-i18n/opencc/opencc-.ebuild
index ea43829ed2f..39ac0059d23 100644
--- a/app-i18n/opencc/opencc-.ebuild
+++ b/app-i18n/opencc/opencc-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake-utils
+inherit cmake
 
 if [[ "${PV}" == "" ]]; then
inherit git-r3
@@ -41,7 +41,7 @@ PATCHES=(
 DOCS=(AUTHORS NEWS.md README.md)
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
 
sed -e "s:\${DIR_SHARE_OPENCC}/doc:share/doc/${PF}:" -i 
doc/CMakeLists.txt || die
 }
@@ -53,5 +53,5 @@ src_configure() {
-DENABLE_GTEST=$(usex test ON OFF)
)
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }



[gentoo-commits] data/api:master commit in: files/

2020-11-22 Thread Mike Gilbert
commit: f01279c538424abb18463a108a5ff7dca2062bf4
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Nov 22 17:52:52 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 22 17:53:38 2020 +
URL:https://gitweb.gentoo.org/data/api.git/commit/?id=f01279c5

Revert "uid-git.txt: request id 371 for sddm"

This reverts commit 59d28cfa975ed50dbf720782644f7fa074e85fb8.

Signed-off-by: Mike Gilbert  gentoo.org>

 files/uid-gid.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/files/uid-gid.txt b/files/uid-gid.txt
index eb89c55..087ec7a 100644
--- a/files/uid-gid.txt
+++ b/files/uid-gid.txt
@@ -267,7 +267,6 @@ nslcd   357 357 acct
 octoprint  368 368 historical
 ultimaker  369 369 acct
 sks370 370 acct
-sddm   371 371 requested
 upmpdcli   372 372 acct
 snapclient 373 -   acct
 snapserver 374 374 acct



[gentoo-commits] data/api:master commit in: files/

2020-11-22 Thread Mike Gilbert
commit: 59d28cfa975ed50dbf720782644f7fa074e85fb8
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Nov 22 17:45:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 22 17:46:14 2020 +
URL:https://gitweb.gentoo.org/data/api.git/commit/?id=59d28cfa

uid-git.txt: request id 371 for sddm

Signed-off-by: Mike Gilbert  gentoo.org>

 files/uid-gid.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/uid-gid.txt b/files/uid-gid.txt
index 087ec7a..eb89c55 100644
--- a/files/uid-gid.txt
+++ b/files/uid-gid.txt
@@ -267,6 +267,7 @@ nslcd   357 357 acct
 octoprint  368 368 historical
 ultimaker  369 369 acct
 sks370 370 acct
+sddm   371 371 requested
 upmpdcli   372 372 acct
 snapclient 373 -   acct
 snapserver 374 374 acct



[gentoo-commits] repo/gentoo:master commit in: net-vpn/ocserv/

2020-11-21 Thread Mike Gilbert
commit: 6dacaeb8ae3cd690c830b31c6f12e8eb0665d234
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Nov 21 18:55:15 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sat Nov 21 18:55:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dacaeb8

net-vpn/ocserv: bump to 1.1.1

Signed-off-by: Mike Gilbert  gentoo.org>

 net-vpn/ocserv/Manifest|  1 +
 net-vpn/ocserv/ocserv-1.1.1.ebuild | 81 ++
 2 files changed, 82 insertions(+)

diff --git a/net-vpn/ocserv/Manifest b/net-vpn/ocserv/Manifest
index 8bbe3efe2fa..66048da9281 100644
--- a/net-vpn/ocserv/Manifest
+++ b/net-vpn/ocserv/Manifest
@@ -1 +1,2 @@
 DIST ocserv-1.0.1.tar.xz 787800 BLAKE2B 
655a2a6e1434a5b31b157e0f73df3d6d04011c06fd5a1f39f1152752abdc837974c739bc0694a804a1e96b4e219c78c5cf1a58040bbcdcad3e326d0c9e584c7b
 SHA512 
953e1b6084f68f8627b5383e28b5fcde987881e66feac645a40fa37d895f0711b171c9029c3703773dfbd5432d747f92c71af9240c2df3381599902a7d5fe880
+DIST ocserv-1.1.1.tar.xz 818988 BLAKE2B 
06fdc47fcabea162ddd417f315c53e85f4ccdc1dc9b60b624c06ee4adae9d6f0ee96f94c15daafa0633b4925720519da7220914008c64c5771f61416208a570e
 SHA512 
1173416f0d32f9faf98e539c8e73316a50ac93b519d1ade19374a3df865d10d975e13ac53e0c5a5e77c80f3605d7a810287b18b85b798887d227389761b54220

diff --git a/net-vpn/ocserv/ocserv-1.1.1.ebuild 
b/net-vpn/ocserv/ocserv-1.1.1.ebuild
new file mode 100644
index 000..41a683070d5
--- /dev/null
+++ b/net-vpn/ocserv/ocserv-1.1.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Openconnect SSL VPN server"
+HOMEPAGE="https://ocserv.gitlab.io/www/index.html;
+SRC_URI="ftp://ftp.infradead.org/pub/ocserv/${P}.tar.xz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="geoip kerberos +lz4 otp pam radius +seccomp systemd tcpd test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+   virtual/pkgconfig
+   test? (
+   net-libs/gnutls[tools(+)]
+   net-libs/socket_wrapper
+   net-vpn/openconnect
+   sys-libs/nss_wrapper
+   sys-libs/uid_wrapper
+   )
+"
+DEPEND="
+   dev-libs/libnl:3=
+   dev-libs/libev:0=
+   >=dev-libs/nettle-2.7:0=
+   dev-libs/pcl:0=
+   dev-libs/protobuf-c:0=
+   >=net-libs/gnutls-3.3.0:0=
+   net-libs/http-parser:0=
+   sys-libs/readline:0=
+   sys-libs/talloc:0=
+   geoip? ( dev-libs/geoip:0= )
+   kerberos? ( virtual/krb5 )
+   lz4? ( app-arch/lz4:0= )
+   otp? ( sys-auth/oath-toolkit:0= )
+   pam? ( sys-libs/pam:0= )
+   radius? ( net-dialup/freeradius-client:0= )
+   seccomp? ( sys-libs/libseccomp:0= )
+   systemd? ( sys-apps/systemd:0= )
+   tcpd? ( sys-apps/tcp-wrappers:0= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+   local myconf=(
+   --without-root-tests
+   --without-nuttcp-tests
+
+   $(use_enable seccomp)
+   $(use_enable systemd)
+
+   $(use_with geoip)
+   $(use_with kerberos gssapi)
+   $(use_with lz4)
+   $(use_with otp liboath)
+   $(use_with radius)
+   $(use_with tcpd libwrap)
+   )
+   econf "${myconf[@]}"
+}
+
+src_install() {
+   default
+
+   dodoc doc/sample.{config,passwd}
+   use otp && dodoc doc/sample.otp
+
+   doinitd "${FILESDIR}"/ocserv
+
+   if use systemd; then
+   systemd_dounit 
doc/systemd/socket-activated/ocserv.{service,socket}
+   else
+   systemd_dounit doc/systemd/standalone/ocserv.service
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/files/, net-misc/dhcp/

2020-11-20 Thread Mike Gilbert
commit: 65f86cdce2f35d916c5f3c41fd41900f3bf6bedb
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Nov 20 19:29:17 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Fri Nov 20 19:29:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65f86cdc

net-misc/dhcp: backport build fix

Closes: https://bugs.gentoo.org/752402
Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/dhcp/dhcp-4.4.2-r3.ebuild |  1 +
 net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch | 25 ++
 2 files changed, 26 insertions(+)

diff --git a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild 
b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
index 0257824a08f..6cad24e7519 100644
--- a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
@@ -70,6 +70,7 @@ PATCHES=(
 
# Possible upstream candidates
"${FILESDIR}/${PN}-4.4.2-fno-common.patch" #710194
+   "${FILESDIR}/dhcp-4.4.2-variable-name.patch" #752402
 )
 
 src_prepare() {

diff --git a/net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch 
b/net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch
new file mode 100644
index 000..9f5085dd5e2
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch
@@ -0,0 +1,25 @@
+From 261c84d91d1b4581df9f7f0ec031908299de7726 Mon Sep 17 00:00:00 2001
+From: Mark Andrews 
+Date: Thu, 19 Dec 2019 09:27:44 +1100
+Subject: [PATCH] fix variable name in conditional block
+
+---
+ lib/isc/stats.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/isc/stats.c b/lib/isc/stats.c
+index 5bce3c1100..a7ab97ce53 100644
+--- a/bind/bind-9.11.14/lib/isc/stats.c
 b/bind/bind-9.11.14/lib/isc/stats.c
+@@ -297,7 +297,7 @@ setcounter(isc_stats_t *stats,
+   isc_atomic_store((int32_t *)>counters[counter].lo,
+(uint32_t)(value & 0x));
+ # else
+-  stats->counters[counter] = val;
++  stats->counters[counter] = value;
+ # endif
+ #endif
+ }
+-- 
+GitLab
+



[gentoo-commits] repo/gentoo:master commit in: app-emulation/open-vm-tools/files/

2020-11-20 Thread Mike Gilbert
commit: 7e51c6a6b2d0438b27e3a383c5878766bb5cce7e
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Nov 20 17:22:41 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Fri Nov 20 18:35:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e51c6a6

app-emulation/open-vm-tools: remove unused patch

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Mike Gilbert  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/18337

 .../files/11.0.1-udev-complaints.patch | 60 --
 1 file changed, 60 deletions(-)

diff --git a/app-emulation/open-vm-tools/files/11.0.1-udev-complaints.patch 
b/app-emulation/open-vm-tools/files/11.0.1-udev-complaints.patch
deleted file mode 100644
index b34e06d1a22..000
--- a/app-emulation/open-vm-tools/files/11.0.1-udev-complaints.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From f1dab8ded454b6993a4d96d0aefc700f1796 Mon Sep 17 00:00:00 2001
-From: Oliver Kurth 
-Date: Mon, 28 Oct 2019 16:12:42 -0700
-Subject: [PATCH] stop systemd-243 udev complaints #371
-
-Address issues from pull request #371 on github:
-- fix substiution variables for systemd-243
-- fix permissions of rules file
-See https://github.com/vmware/open-vm-tools/pull/371

- open-vm-tools/AUTHORS| 4 
- open-vm-tools/udev/99-vmware-scsi-udev.rules | 6 +++---
- open-vm-tools/udev/Makefile.am   | 4 ++--
- 3 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/open-vm-tools/AUTHORS b/open-vm-tools/AUTHORS
-index 08cc28ef2..026de07e6 100644
 a/open-vm-tools/AUTHORS
-+++ b/open-vm-tools/AUTHORS
-@@ -49,3 +49,7 @@ Josh PaetzelAdditional changes to vmmemctl.ko for 
FreeBSD 12.0 API changes.
- 
- Haruki TsurumotoFix Asianux identification
- - https://github.com/vmware/open-vm-tools/pull/325
-+
-+MilhouseVH  stop systemd-243 udev complaints
-+- https://github.com/vmware/open-vm-tools/pull/371
-+
-diff --git a/open-vm-tools/udev/99-vmware-scsi-udev.rules 
b/open-vm-tools/udev/99-vmware-scsi-udev.rules
-index 053b59706..fb4ed6844 100644
 a/open-vm-tools/udev/99-vmware-scsi-udev.rules
-+++ b/open-vm-tools/udev/99-vmware-scsi-udev.rules
-@@ -1,7 +1,7 @@
--# Copyright (C) 2016 VMware, Inc.  All rights reserved.
-+# Copyright (C) 2016,2019 VMware, Inc.  All rights reserved.
- #
- # This file is part of open-vm-tools
- 
--ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", 
ATTRS{model}=="Virtual disk*", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 
>/sys$DEVPATH/device/timeout'"
--ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", 
ATTRS{model}=="VMware Virtual S", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 
180 >/sys$DEVPATH/device/timeout'"
-+ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", 
ATTRS{model}=="Virtual disk*", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 
>/sys$env{DEVPATH}/device/timeout'"
-+ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", 
ATTRS{model}=="VMware Virtual S", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 
180 >/sys$env{DEVPATH}/device/timeout'"
- 
-diff --git a/open-vm-tools/udev/Makefile.am b/open-vm-tools/udev/Makefile.am
-index 68fbc3e27..c3baadf16 100644
 a/open-vm-tools/udev/Makefile.am
-+++ b/open-vm-tools/udev/Makefile.am
-@@ -1,5 +1,5 @@
- 

--### Copyright (C) 2016 VMware, Inc.  All rights reserved.
-+### Copyright (C) 2016,2019 VMware, Inc.  All rights reserved.
- ###
- ### This program is free software; you can redistribute it and/or modify
- ### it under the terms of version 2 of the GNU General Public License as
-@@ -17,5 +17,5 @@
- 
- install-data-local:
-   $(INSTALL) -d $(DESTDIR)$(UDEVRULESDIR)
--  $(INSTALL) $(srcdir)/99-vmware-scsi-udev.rules $(DESTDIR)$(UDEVRULESDIR)
-+  $(INSTALL) -m 644 $(srcdir)/99-vmware-scsi-udev.rules 
$(DESTDIR)$(UDEVRULESDIR)
- 



[gentoo-commits] repo/gentoo:master commit in: sys-apps/gentoo-functions/

2020-11-19 Thread Mike Gilbert
commit: b0809e838cef2f519482dddc0189774d33305914
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Nov 19 18:25:20 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Nov 19 18:26:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0809e83

sys-apps/gentoo-functions: bump to 0.14

Closes: https://bugs.gentoo.org/751511
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/gentoo-functions/Manifest |  1 +
 .../gentoo-functions/gentoo-functions-0.14.ebuild  | 28 ++
 2 files changed, 29 insertions(+)

diff --git a/sys-apps/gentoo-functions/Manifest 
b/sys-apps/gentoo-functions/Manifest
index 331a18a8dda..a5e043f7a00 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1 +1,2 @@
 DIST gentoo-functions-0.13.tar.gz 11334 BLAKE2B 
740e6d950b62b777e533d16b707cbf6f9ab0e9de4c92c5e755af186571539949017aadcd7d428b1e635f43052a575f89787b3e92087675b600a6b7350fda24a6
 SHA512 
61185197e1eb4155d0db9ba024dcb1b9eb0d272e3369f986668634012e35b57c3cdcd7beecd4714b9b48a0e44e8bb73472713949e16827aa05c055ec83d537dd
+DIST gentoo-functions-0.14.tar.gz 11330 BLAKE2B 
72543941f2954e35d3671c1c482eda44ae00cf0c636a1d706c5b90c56dfbb985d20c156b6de650e5d33ff9fac0abaf9fc50b1172832c2bd5276f6adfe5baf3b8
 SHA512 
e1e0fee9f3e8b79478aaf2b9a54c8623c858e62f72f2885ea88f7006631cf513bdfaac7122f2a5fc97379bde57851793bf7d6c63a1c63a6923a7f13a73d803fc

diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild 
b/sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild
new file mode 100644
index 000..04f1a329e9e
--- /dev/null
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2014-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git;
+else
+   
SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.gz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris ~x86-winnt"
+fi
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="base functions required by all Gentoo systems"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+src_configure() {
+   tc-export CC
+   append-lfs-flags
+   export ROOTPREFIX="${EPREFIX}"
+   export PREFIX="${EPREFIX}/usr"
+}



[gentoo-commits] proj/gentoo-functions: New tag: 0.14

2020-11-19 Thread Mike Gilbert
commit: 
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Nov 19 18:21:29 2020 +

New tag: 0.14




[gentoo-commits] proj/gentoo-functions:master commit in: /

2020-11-19 Thread Mike Gilbert
commit: f7c81e9c99a7b3ae1e9d96e25cfe97e52ca5115c
Author: Jacob Floyd  gmail  com>
AuthorDate: Thu Nov 19 17:33:56 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Nov 19 18:16:49 2020 +
URL:
https://gitweb.gentoo.org/proj/gentoo-functions.git/commit/?id=f7c81e9c

Update to version 0.14

Signed-off-by: Jacob Floyd  gmail.com>
Signed-off-by: Mike Gilbert  gentoo.org>

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 47f41ca..a5612a0 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # Copyright 2014-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-VERSION = 0.13
+VERSION = 0.14
 GITREF ?= $(VERSION)
 PKG ?= gentoo-functions-$(VERSION)
 



[gentoo-commits] proj/gentoo-functions:master commit in: /

2020-11-19 Thread Mike Gilbert
commit: f0ca05097fc2f454deae6eedc1bf94d6cd543013
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Nov 19 18:20:18 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Nov 19 18:20:18 2020 +
URL:
https://gitweb.gentoo.org/proj/gentoo-functions.git/commit/?id=f0ca0509

Update copyright notice

Signed-off-by: Mike Gilbert  gentoo.org>

 consoletype.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/consoletype.c b/consoletype.c
index b7bf4e6..4249504 100644
--- a/consoletype.c
+++ b/consoletype.c
@@ -3,7 +3,7 @@
  * simple app to figure out whether the current terminal
  * is serial, console (vt), or remote (pty).
  *
- * Copyright 1999-2007 Gentoo Foundation
+ * Copyright 1999-2020 Gentoo Authors
  * Distributed under the terms of the GNU General Public License v2
  */
 



[gentoo-commits] proj/gentoo-functions:master commit in: /

2020-11-19 Thread Mike Gilbert
commit: 9d503ef40a6d73eea14b6f5015cb2abd9eee292b
Author: Jacob Floyd  gmail  com>
AuthorDate: Thu Nov 19 17:20:01 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Nov 19 18:16:42 2020 +
URL:
https://gitweb.gentoo.org/proj/gentoo-functions.git/commit/?id=9d503ef4

Only include sysmacros.h on linux

sysmacros.h is only needed for major() which is only used within an
`#if defined(__linux__)` block. So, this header is only needed on linux.

Bug: https://bugs.gentoo.org/751511
Signed-off-by: Jacob Floyd  gmail.com>
Signed-off-by: Mike Gilbert  gentoo.org>

 consoletype.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/consoletype.c b/consoletype.c
index dfbda22..b7bf4e6 100644
--- a/consoletype.c
+++ b/consoletype.c
@@ -13,7 +13,9 @@
 #include 
 #include 
 #include 
+#if defined(__linux__)
 #include 
+#endif
 
 enum termtype {
IS_VT = 0,



[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/files/, net-misc/dhcp/

2020-11-18 Thread Mike Gilbert
commit: 9b7959a9776a912bdef36f4db14c3c7bb23ddf34
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Nov 18 17:08:22 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Nov 18 17:08:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b7959a9

net-misc/dhcp: pull in network-online.target in service units

dhcpd refuses to start if there are no configured broadcast interfaces.

Closes: https://bugs.gentoo.org/628920
Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/dhcp/{dhcp-4.4.2-r2.ebuild => dhcp-4.4.2-r3.ebuild} | 0
 net-misc/dhcp/files/dhcpd4.service   | 2 ++
 net-misc/dhcp/files/dhcpd6.service   | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild 
b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
similarity index 100%
rename from net-misc/dhcp/dhcp-4.4.2-r2.ebuild
rename to net-misc/dhcp/dhcp-4.4.2-r3.ebuild

diff --git a/net-misc/dhcp/files/dhcpd4.service 
b/net-misc/dhcp/files/dhcpd4.service
index b064bd9b57d..8197ace1210 100644
--- a/net-misc/dhcp/files/dhcpd4.service
+++ b/net-misc/dhcp/files/dhcpd4.service
@@ -3,6 +3,8 @@ Description=DHCPv4 Server Daemon
 Documentation=man:dhcpd(8) man:dhcpd.conf(5)
 After=network.target
 After=time-sync.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 ExecStart=/usr/sbin/dhcpd -f -cf /etc/dhcp/dhcpd.conf -user dhcp -group dhcp 
--no-pid

diff --git a/net-misc/dhcp/files/dhcpd6.service 
b/net-misc/dhcp/files/dhcpd6.service
index 603cacd8eb8..7f41db0a72b 100644
--- a/net-misc/dhcp/files/dhcpd6.service
+++ b/net-misc/dhcp/files/dhcpd6.service
@@ -3,6 +3,8 @@ Description=DHCPv6 Server Daemon
 Documentation=man:dhcpd(8) man:dhcpd.conf(5)
 After=network.target
 After=time-sync.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 ExecStart=/usr/sbin/dhcpd -f -s -6 -cf /etc/dhcp/dhcpd.conf -user dhcp -group 
dhcp --no-pid



[gentoo-commits] repo/gentoo:master commit in: app-i18n/libpinyin/

2020-11-16 Thread Mike Gilbert
commit: 36f7e7b0d4b4e3d2f653ab9f627642a831d3491b
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Mon Nov 16 03:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 16 19:51:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36f7e7b0

app-i18n/libpinyin: Set maintainer Arfrever.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/libpinyin/metadata.xml | 20 
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/app-i18n/libpinyin/metadata.xml b/app-i18n/libpinyin/metadata.xml
index a46185d494b..d0737be7e3d 100644
--- a/app-i18n/libpinyin/metadata.xml
+++ b/app-i18n/libpinyin/metadata.xml
@@ -1,12 +1,16 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-c...@gentoo.org
-Cjk
-  
-  
-libpinyin/libpinyin
-libpinyin
-  
+   
+   arfrever@gmail.com
+   Arfrever Frehtes Taifersar Arahesis
+   
+   
+   c...@gentoo.org
+   Cjk
+   
+   
+   libpinyin/libpinyin
+   libpinyin
+   
 



[gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/

2020-11-16 Thread Mike Gilbert
commit: b04d494d2350df698c584f86b2fd084b2ddbcece
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sat Nov 14 21:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 16 19:51:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b04d494d

app-i18n/fcitx: Fix dependency on app-text/enchant.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/fcitx/fcitx-4.2.9.8.ebuild | 2 +-
 app-i18n/fcitx/fcitx-4..ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/fcitx/fcitx-4.2.9.8.ebuild 
b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild
index 445151b051e..0b9336e8a57 100644
--- a/app-i18n/fcitx/fcitx-4.2.9.8.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild
@@ -59,7 +59,7 @@ DEPEND="dev-libs/glib:2
pango? ( x11-libs/pango )
!pango? ( media-libs/fontconfig )
)
-   enchant? ( app-text/enchant:0= )
+   enchant? ( app-text/enchant:= )
gtk2? ( x11-libs/gtk+:2 )
gtk3? ( x11-libs/gtk+:3 )
lua? ( dev-lang/lua:= )

diff --git a/app-i18n/fcitx/fcitx-4..ebuild 
b/app-i18n/fcitx/fcitx-4..ebuild
index 3cb6e63cdc7..295d5fa0886 100644
--- a/app-i18n/fcitx/fcitx-4..ebuild
+++ b/app-i18n/fcitx/fcitx-4..ebuild
@@ -59,7 +59,7 @@ DEPEND="dev-libs/glib:2
pango? ( x11-libs/pango )
!pango? ( media-libs/fontconfig )
)
-   enchant? ( app-text/enchant:0= )
+   enchant? ( app-text/enchant:= )
gtk2? ( x11-libs/gtk+:2 )
gtk3? ( x11-libs/gtk+:3 )
lua? ( dev-lang/lua:= )



[gentoo-commits] repo/gentoo:master commit in: app-i18n/kcm-fcitx/

2020-11-16 Thread Mike Gilbert
commit: 691df99598a45a565b11918e923879b23ae3
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Fri Nov 13 04:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 16 19:51:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=691df995

app-i18n/kcm-fcitx: Version bump (0.5.6).

Closes: https://bugs.gentoo.org/722382
Closes: https://bugs.gentoo.org/746260
Closes: https://bugs.gentoo.org/751730
Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/kcm-fcitx/Manifest   |  1 +
 app-i18n/kcm-fcitx/kcm-fcitx-0.5.6.ebuild | 58 +++
 2 files changed, 59 insertions(+)

diff --git a/app-i18n/kcm-fcitx/Manifest b/app-i18n/kcm-fcitx/Manifest
index 675a3e73aa4..39325dd4fb4 100644
--- a/app-i18n/kcm-fcitx/Manifest
+++ b/app-i18n/kcm-fcitx/Manifest
@@ -1 +1,2 @@
 DIST kcm-fcitx-0.5.5.tar.xz 63364 BLAKE2B 
e3b185468a4587c510e47bee4d7260d5d9ed27032174e3928ed3f008a68e8a4b9d124bda14a75348d65c41ddff2e39bb91d8a4f3663a81788850e5fb33740c8a
 SHA512 
e6a7bcad10003a956389ee266cf6d2f3730dafafcdd0bb43de328397749775e5cd305f16fdca2365e246c903677dba042da81a6dfd873aa1be74174e2b0b372e
+DIST kcm-fcitx-0.5.6.tar.xz 63556 BLAKE2B 
8518c454f15e5faeaab136c08eef9a7474537414485815e67ee26fcff815f6506769ec047158450a7a0f1843ac31616d34317e9de7bec8ee62fc81541134625a
 SHA512 
a3d378ecd9ea9fa5bcc42c75e5b0b0ac2ba6c94fda93b7213d821546bb83b5904c75c2fc9482cd7b47fbf5ad81a0641b7ec345aa2e630c8795bf8d5b89f9cd3b

diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.6.ebuild 
b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.6.ebuild
new file mode 100644
index 000..be86ae5b382
--- /dev/null
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2013-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake
+
+if [[ "${PV}" =~ (^|\.)$ ]]; then
+   inherit git-r3
+
+   EGIT_REPO_URI="https://github.com/fcitx/kcm-fcitx;
+fi
+
+DESCRIPTION="KDE configuration module for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/kcm-fcitx;
+if [[ "${PV}" =~ (^|\.)$ ]]; then
+   SRC_URI=""
+else
+   SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz;
+fi
+
+LICENSE="GPL-2+"
+SLOT="4-plasma5"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+   dev-qt/qtcore:5
+   dev-qt/qtwidgets:5
+   kde-frameworks/extra-cmake-modules:5
+   sys-devel/gettext
+   virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
+   >=app-i18n/fcitx-qt5-1.1:4
+   dev-qt/qtcore:5
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtx11extras:5
+   kde-frameworks/kconfigwidgets:5
+   kde-frameworks/kcoreaddons:5
+   kde-frameworks/ki18n:5
+   kde-frameworks/kio:5
+   kde-frameworks/kitemviews:5
+   kde-frameworks/kwidgetsaddons:5
+   virtual/libintl
+   x11-libs/libX11
+   x11-libs/libxkbfile"
+RDEPEND="${DEPEND}
+   !${CATEGORY}/${PN}:4-plasma4[-minimal(-)]"
+
+src_configure() {
+   local mycmakeargs=(
+   -DKDE_INSTALL_USE_QT_SYS_PATHS=yes
+   )
+
+   cmake_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/

2020-11-16 Thread Mike Gilbert
commit: 0a9ed3f8677492b58304b04b278e6542ebec45f9
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Fri Nov 13 06:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 16 19:51:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a9ed3f8

dev-libs/marisa: Inherit toolchain-funcs.eclass explicitly.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-libs/marisa/marisa-0.2.6.ebuild | 2 +-
 dev-libs/marisa/marisa-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild 
b/dev-libs/marisa/marisa-0.2.6.ebuild
index 00044d3bada..3f1328fe785 100644
--- a/dev-libs/marisa/marisa-0.2.6.ebuild
+++ b/dev-libs/marisa/marisa-0.2.6.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_USE_SETUPTOOLS="no"
 
-inherit autotools distutils-r1
+inherit autotools distutils-r1 toolchain-funcs
 
 if [[ "${PV}" == "" ]]; then
inherit git-r3

diff --git a/dev-libs/marisa/marisa-.ebuild 
b/dev-libs/marisa/marisa-.ebuild
index 2458eb10f41..ac80bc2f060 100644
--- a/dev-libs/marisa/marisa-.ebuild
+++ b/dev-libs/marisa/marisa-.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
 DISTUTILS_OPTIONAL="1"
 DISTUTILS_USE_SETUPTOOLS="no"
 
-inherit autotools distutils-r1
+inherit autotools distutils-r1 toolchain-funcs
 
 if [[ "${PV}" == "" ]]; then
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-i18n/libhangul/

2020-11-16 Thread Mike Gilbert
commit: b19f27e7ac756b96c59ac4fe04cdc406ba72c2fb
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Mon Nov 16 00:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 16 19:51:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b19f27e7

app-i18n/libhangul: Use EAPI="7".

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/libhangul/libhangul-0.1.0.ebuild | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-i18n/libhangul/libhangul-0.1.0.ebuild 
b/app-i18n/libhangul/libhangul-0.1.0.ebuild
index cb63ebcdd7f..2d05ccfaf08 100644
--- a/app-i18n/libhangul/libhangul-0.1.0.ebuild
+++ b/app-i18n/libhangul/libhangul-0.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2006-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 DESCRIPTION="Library for hangul input method logic, hanja dictionary"
 HOMEPAGE="https://github.com/libhangul/libhangul;
@@ -13,11 +13,11 @@ KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="nls static-libs test"
 RESTRICT="!test? ( test )"
 
+BDEPEND="virtual/pkgconfig
+   nls? ( sys-devel/gettext )"
 RDEPEND="virtual/libiconv
nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   nls? ( sys-devel/gettext )
test? ( dev-libs/check )"
 
 src_configure() {
@@ -32,5 +32,5 @@ src_test() {
 
 src_install() {
default
-   find "${ED}" -name '*.la' -delete || die
+   find "${ED}" -name "*.la" -delete || die
 }



[gentoo-commits] repo/gentoo:master commit in: www-client/w3m/

2020-11-16 Thread Mike Gilbert
commit: d8992c5c70df9183760943a4258e9fe55e1c9711
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sat Nov 14 20:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 16 19:51:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8992c5c

www-client/w3m: Accept using x11-libs/gdk-pixbuf-xlib instead of 
x11-libs/gdk-pixbuf[X].

Closes: https://bugs.gentoo.org/753917
Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 www-client/w3m/w3m-0.5.3_p20180125.ebuild | 10 +-
 www-client/w3m/w3m-0.5.3_p20190105.ebuild | 10 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/www-client/w3m/w3m-0.5.3_p20180125.ebuild 
b/www-client/w3m/w3m-0.5.3_p20180125.ebuild
index 037b2d70587..7753b49b518 100644
--- a/www-client/w3m/w3m-0.5.3_p20180125.ebuild
+++ b/www-client/w3m/w3m-0.5.3_p20180125.ebuild
@@ -26,7 +26,15 @@ RDEPEND="dev-libs/boehm-gc:=
x11-libs/libXdmcp
x11-libs/libXext
)
-   gdk-pixbuf? ( x11-libs/gdk-pixbuf[X?] )
+   gdk-pixbuf? (
+   x11-libs/gdk-pixbuf
+   X? (
+   || (
+   x11-libs/gdk-pixbuf-xlib
+   

[gentoo-commits] repo/gentoo:master commit in: app-i18n/libpinyin/

2020-11-16 Thread Mike Gilbert
commit: 71c9651ac604be1e1939602ceb24e7757a2aa703
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Mon Nov 16 02:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 16 19:51:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71c9651a

app-i18n/libpinyin: Update model version.

https://github.com/libpinyin/libpinyin/commit/932ff0514256570e75d049d2e5d0881b4421bb05
https://github.com/libpinyin/libpinyin/commit/b21bfdab7b32375239144899c1666b3ae41ed9c7

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/libpinyin/Manifest  | 1 +
 app-i18n/libpinyin/libpinyin-.ebuild | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app-i18n/libpinyin/Manifest b/app-i18n/libpinyin/Manifest
index b42b13067f7..a254d6b1f59 100644
--- a/app-i18n/libpinyin/Manifest
+++ b/app-i18n/libpinyin/Manifest
@@ -1,2 +1,3 @@
 DIST libpinyin-2.3.0.tar.gz 256549 BLAKE2B 
621176ab14dfe8fb3c32e3ae0b727b8070b5fdcc3a79f8f3c646538151601c7fefe0b2778a54c50faabaf3026d9c029eaa52a0e04144d37f347ca571fd532908
 SHA512 
5cfe2d70c15dc532fa970a28b70da403f2d848747501bdbdf43c481f8165d6290cb1de086d2ef7af653edfe3fb164d4e8d9cf655302e2aa759709e6031b117b2
 DIST libpinyin-model17.text.tar.gz 20278815 BLAKE2B 
d02a587ab29e1115843d8c2318ef70cf7c2318d5c60ef8135860c611935285fa0f061a21d7e85dd87f6efe957742e21e34a77a7b245b58945cdd478759b0e19f
 SHA512 
d0bf8d476a63e33e292046754161316f00bfea71ebd06fca85b3845fe535431f01458282f505380cae018050aa6a08b14a7bc0684ba372dc79ee14391f47e8a1
+DIST libpinyin-model19.text.tar.gz 20279012 BLAKE2B 
d8721d106235ef6fb99ad8dd4f4911bb23bf66f0259b01c39fd8ee829f0a63f326894802d62e51531a10f453dff1f4bb6e3e1648cf4aeac8213dccd10fc8ca4d
 SHA512 
93c70423ba14faa3402bce775f82769dd4ee3a49083beddc540825f88facbd847328e9d01d99473adb7cf26de0f853e2b2e14fe849b1c49531134d1ca4ed2ef2

diff --git a/app-i18n/libpinyin/libpinyin-.ebuild 
b/app-i18n/libpinyin/libpinyin-.ebuild
index 531fc1ba3f5..5c0606058de 100644
--- a/app-i18n/libpinyin/libpinyin-.ebuild
+++ b/app-i18n/libpinyin/libpinyin-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2019 Gentoo Authors
+# Copyright 2012-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ if [[ "${PV}" == "" ]]; then
EGIT_REPO_URI="https://github.com/libpinyin/libpinyin;
 fi
 
-LIBPINYIN_MODEL_VERSION="17"
+LIBPINYIN_MODEL_VERSION="19"
 
 DESCRIPTION="Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao"
 HOMEPAGE="https://github.com/libpinyin/libpinyin 
https://sourceforge.net/projects/libpinyin/;
@@ -57,5 +57,5 @@ src_configure() {
 
 src_install() {
default
-   find "${D}" -name "*.la" -delete || die
+   find "${ED}" -name "*.la" -delete || die
 }



[gentoo-commits] repo/gentoo:master commit in: app-i18n/sunpinyin/

2020-11-16 Thread Mike Gilbert
commit: ab619c4e4f0a135882d576ce6c3c360ad9d155ea
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Fri Nov 13 08:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 16 19:51:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab619c4e

app-i18n/sunpinyin: Add support for Python 3.9.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild 
b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
index 5879b20f0c2..8944cebe91d 100644
--- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
 
 inherit python-any-r1 scons-utils toolchain-funcs
 



[gentoo-commits] repo/gentoo:master commit in: app-i18n/xsunpinyin/

2020-11-16 Thread Mike Gilbert
commit: c0a09ef6aac91554bf47138818d2244e052c108f
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Fri Nov 13 10:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 16 19:51:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0a09ef6

app-i18n/xsunpinyin: Avoid unused dependency on virtual/libiconv.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild 
b/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild
index f27c56b3803..06ccf1ef63b 100644
--- a/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild
+++ b/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild
@@ -57,6 +57,9 @@ src_prepare() {
 
# https://github.com/sunpinyin/sunpinyin/issues/110
sed -e "s/^\( *\)('CXX', 'CXX'),/&\n\1('AR', 'AR'),\n\1('RANLIB', 
'RANLIB'),/" -i wrapper/xim/SConstruct || die
+
+   # https://github.com/sunpinyin/sunpinyin/issues/114
+   sed -e "/^#include $/d" -i wrapper/xim/xim.c || die
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: app-i18n/libchewing/

2020-11-16 Thread Mike Gilbert
commit: b9b21f0b5d39a6e85b18b9f187881cdc7e3e4bad
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Mon Nov 16 04:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 16 19:51:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9b21f0b

app-i18n/libchewing: Set maintainer Arfrever.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/libchewing/metadata.xml | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/app-i18n/libchewing/metadata.xml b/app-i18n/libchewing/metadata.xml
index baa53a1242c..e2a2046c180 100644
--- a/app-i18n/libchewing/metadata.xml
+++ b/app-i18n/libchewing/metadata.xml
@@ -1,11 +1,15 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-c...@gentoo.org
-Cjk
-  
-  
-chewing/libchewing
-  
+   
+   arfrever@gmail.com
+   Arfrever Frehtes Taifersar Arahesis
+   
+   
+   c...@gentoo.org
+   Cjk
+   
+   
+   chewing/libchewing
+   
 



[gentoo-commits] repo/gentoo:master commit in: app-i18n/libhangul/

2020-11-16 Thread Mike Gilbert
commit: eef186a026fe8ffbd3962d929edd920fc35a2c26
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Mon Nov 16 01:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 16 19:51:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eef186a0

app-i18n/libhangul: Set maintainer Arfrever.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/libhangul/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/app-i18n/libhangul/metadata.xml b/app-i18n/libhangul/metadata.xml
index 81d97de41a3..16a56495231 100644
--- a/app-i18n/libhangul/metadata.xml
+++ b/app-i18n/libhangul/metadata.xml
@@ -1,6 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
+   
+   arfrever@gmail.com
+   Arfrever Frehtes Taifersar Arahesis
+   

c...@gentoo.org
Cjk



[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-sunpinyin/

2020-11-16 Thread Mike Gilbert
commit: 4b19250ddaefc41b782a154d015c17a63786f832
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sat Nov 14 23:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 16 19:51:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b19250d

app-i18n/ibus-sunpinyin: Add support for Python 3.9.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild 
b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild
index a73dd516a5c..faabcbdc375 100644
--- a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild
+++ b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
 
 inherit python-single-r1 scons-utils toolchain-funcs
 



[gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx-qt5/files/, app-i18n/fcitx-qt5/

2020-11-16 Thread Mike Gilbert
commit: 9252387f1bd980a247dfb0cc4ecb61eb101f0879
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Fri Nov 13 02:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 16 19:51:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9252387f

app-i18n/fcitx-qt5: Fix potential recursion.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild  |  4 
 2.5-QFcitxPlatformInputContext_recursion.patch | 27 ++
 2 files changed, 31 insertions(+)

diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild 
b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild
index 610eb112d60..729c6f77088 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild
@@ -41,4 +41,8 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4
 DEPEND="${RDEPEND}
dev-qt/qtconcurrent:5"
 
+PATCHES=(
+   "${FILESDIR}/${P}-QFcitxPlatformInputContext_recursion.patch"
+)
+
 DOCS=()

diff --git 
a/app-i18n/fcitx-qt5/files/fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch
 
b/app-i18n/fcitx-qt5/files/fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch
new file mode 100644
index 000..f3e31991b53
--- /dev/null
+++ 
b/app-i18n/fcitx-qt5/files/fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch
@@ -0,0 +1,27 @@
+https://github.com/fcitx/fcitx-qt5/commit/6f2033c497fe0da1fd197bc3be35695b11eafd93
+
+--- /platforminputcontext/qfcitxplatforminputcontext.cpp
 /platforminputcontext/qfcitxplatforminputcontext.cpp
+@@ -291,8 +291,21 @@
+ return;
+ }
+ if (proxy) {
+-cursorRectChanged();
+ proxy->focusIn();
++// We need to delegate this otherwise it may cause self-recursion in
++// certain application like libreoffice.
++auto window = m_lastWindow;
++QMetaObject::invokeMethod(
++this,
++[this, window]() {
++if (window != m_lastWindow) {
++return;
++}
++if (auto *proxy = validICByWindow(window.data())) {
++cursorRectChanged();
++}
++},
++Qt::QueuedConnection);
+ }
+ }
+ 



[gentoo-commits] repo/gentoo:master commit in: app-i18n/sunpinyin/

2020-11-16 Thread Mike Gilbert
commit: 195a363a58ede2b451d357640b40cd6fd2fcc566
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Fri Nov 13 07:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 16 19:51:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=195a363a

app-i18n/sunpinyin: Add dependency on virtual/libiconv.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild 
b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
index d5ea9fe82f6..5879b20f0c2 100644
--- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
@@ -31,7 +31,8 @@ IUSE=""
 
 BDEPEND="dev-lang/perl
virtual/pkgconfig"
-DEPEND="dev-db/sqlite:3"
+DEPEND="dev-db/sqlite:3
+   virtual/libiconv"
 RDEPEND="${DEPEND}"
 
 if [[ "${PV}" == *_pre* ]]; then



[gentoo-commits] repo/gentoo:master commit in: net-misc/cadaver/

2020-11-16 Thread Mike Gilbert
commit: 4c4b194a7b45f44aee3f4dbae055168d36b30dc5
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Fri Nov 13 05:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 16 19:51:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c4b194a

net-misc/cadaver: Fix building with Neon >=0.31.

Closes: https://bugs.gentoo.org/715512
Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/cadaver/cadaver-0.23.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/cadaver/cadaver-0.23.3.ebuild 
b/net-misc/cadaver/cadaver-0.23.3.ebuild
index e6b4ec10f0a..3c957659343 100644
--- a/net-misc/cadaver/cadaver-0.23.3.ebuild
+++ b/net-misc/cadaver/cadaver-0.23.3.ebuild
@@ -26,7 +26,7 @@ src_prepare() {
 
rm -r lib/{expat,intl,neon} || die "rm failed"
sed \
-   -e "/NE_REQUIRE_VERSIONS/s:29:& 30:" \
+   -e "/NE_REQUIRE_VERSIONS/s:29:& 30 31:" \
-e "/AM_GNU_GETTEXT/s:no-libtool:external:" \
-e "/AC_CONFIG_FILES/s: lib/neon/Makefile lib/intl/Makefile::" \
-i configure.ac || die "sed configure.ac failed"



[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/

2020-11-16 Thread Mike Gilbert
commit: e573b8825130944a83d73fb81cc4c3442a6f6c53
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sat Nov 14 22:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 16 19:51:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e573b882

app-i18n/ibus: Add support for Python 3.9.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/ibus/ibus-1.5.23.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/ibus/ibus-1.5.23.ebuild b/app-i18n/ibus/ibus-1.5.23.ebuild
index da88b79ed40..f3ee3b6f8a7 100644
--- a/app-i18n/ibus/ibus-1.5.23.ebuild
+++ b/app-i18n/ibus/ibus-1.5.23.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
 VALA_MIN_API_VERSION="0.34"
 VALA_MAX_API_VERSION="0.50"
 VALA_USE_DEPEND="vapigen"



[gentoo-commits] repo/gentoo:master commit in: app-i18n/xsunpinyin/

2020-11-16 Thread Mike Gilbert
commit: c65216cf7387b605423a8faa35409c1b300c3853
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Fri Nov 13 09:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 16 19:51:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c65216cf

app-i18n/xsunpinyin: Add support for Python 3.9.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild 
b/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild
index 410b2300943..f27c56b3803 100644
--- a/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild
+++ b/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
 
 inherit python-any-r1 scons-utils toolchain-funcs
 



[gentoo-commits] repo/gentoo:master commit in: app-i18n/kcm-fcitx/

2020-11-16 Thread Mike Gilbert
commit: e7150d90868abaf9083644241ac0d62497f3c2ce
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Fri Nov 13 03:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 16 19:51:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7150d90

app-i18n/kcm-fcitx: Delete dependency on kde-frameworks/knewstuff:5.

https://github.com/fcitx/kcm-fcitx/commit/ac28b39c021f4d0c47e03dc4f5122f13e136a311

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/kcm-fcitx/kcm-fcitx-4.5..ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-4.5..ebuild 
b/app-i18n/kcm-fcitx/kcm-fcitx-4.5..ebuild
index 9d7e431899a..753485c9379 100644
--- a/app-i18n/kcm-fcitx/kcm-fcitx-4.5..ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-4.5..ebuild
@@ -42,7 +42,6 @@ DEPEND=">=app-i18n/fcitx-4.2.9:4
kde-frameworks/ki18n:5
kde-frameworks/kio:5
kde-frameworks/kitemviews:5
-   kde-frameworks/knewstuff:5
kde-frameworks/kwidgetsaddons:5
virtual/libintl
x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx-qt5/

2020-11-16 Thread Mike Gilbert
commit: d7251582d113573ccf4bb97006acc8ac14009f95
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Fri Nov 13 01:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 16 19:51:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7251582

app-i18n/fcitx-qt5: Version bump (1.2.5).

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/fcitx-qt5/Manifest   |  1 +
 app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild | 44 +++
 2 files changed, 45 insertions(+)

diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest
index bd24cbd21be..2578793cb6b 100644
--- a/app-i18n/fcitx-qt5/Manifest
+++ b/app-i18n/fcitx-qt5/Manifest
@@ -1,2 +1,3 @@
 DIST fcitx-qt5-1.2.3.tar.xz 134124 BLAKE2B 
0c17f9c3b9d9878fe228881c7287375d3b73a8c27f806590747e56b8644a86300e243d62efcb6589d197edd352e2a79d49be704718ff53381e2fb5e2a5a2b1af
 SHA512 
e3e9a76419caca4eeebf3c149a72ee939a25f463d03dd8461caf44cace310278b08e83d460112f240cd54ed05dba3c5e9732198f0c3d0b9d81c3a444c33ab8d3
 DIST fcitx-qt5-1.2.4.tar.xz 107620 BLAKE2B 
3577555192d2eda9e48fbd31149100f0d21fd1b0b7d162d14cef89818f86d5e32e2bb835f4f47acf150cfd0b0fc506031454e4ffe1315424314fc7512d391f8f
 SHA512 
c9ceaaedeb26ac4c7fa1e0bf34096725afc14642b795d9c624f4fc7fbf56c04acad12d8d3ffb60c164281b6373554c0524e56209a2d1d123fbf348d15dcc282a
+DIST fcitx-qt5-1.2.5.tar.xz 98604 BLAKE2B 
07f3d62c3c47e5ce0805a087cc4819dec44d8038cc428a3f9b39d640e409372eeaf0f8326a00be8b4af1ef6ec21870dd5ebdabfe39a2cf92ab9cec8c32be059f
 SHA512 
238ebd02e4b07a1bffcbf2d1534492589bce206c3bce0197e075e8cd3f1b16a2867b5e9beb3bc2a0a5e9391acbf20c07d4d5a35f1550b4e71ee663712a8d56c6

diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild 
b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild
new file mode 100644
index 000..610eb112d60
--- /dev/null
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2014-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake
+
+if [[ "${PV}" =~ (^|\.)$ ]]; then
+   inherit git-r3
+
+   EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5;
+fi
+
+DESCRIPTION="Fcitx input method module for Qt 5"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5;
+if [[ "${PV}" =~ (^|\.)$ ]]; then
+   SRC_URI=""
+else
+   SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz;
+fi
+
+LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+"
+SLOT="4"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+   dev-qt/qtcore:5
+   dev-qt/qtdbus:5
+   dev-qt/qtwidgets:5
+   kde-frameworks/extra-cmake-modules:5
+   virtual/pkgconfig"
+# Private headers of dev-qt/qtgui:5 used.
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+   dev-qt/qtcore:5
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5=
+   dev-qt/qtwidgets:5
+   virtual/libintl
+   x11-libs/libxkbcommon"
+DEPEND="${RDEPEND}
+   dev-qt/qtconcurrent:5"
+
+DOCS=()



[gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx-qt5/

2020-11-16 Thread Mike Gilbert
commit: 6f46ae625bdaa20c3adc2e429c1b35a3aa680132
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Fri Nov 13 00:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 16 19:51:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f46ae62

app-i18n/fcitx-qt5: Version bump (1.2.4).

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/fcitx-qt5/Manifest   |  1 +
 app-i18n/fcitx-qt5/fcitx-qt5-1.2.4.ebuild | 44 +++
 2 files changed, 45 insertions(+)

diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest
index 5959966f61d..bd24cbd21be 100644
--- a/app-i18n/fcitx-qt5/Manifest
+++ b/app-i18n/fcitx-qt5/Manifest
@@ -1 +1,2 @@
 DIST fcitx-qt5-1.2.3.tar.xz 134124 BLAKE2B 
0c17f9c3b9d9878fe228881c7287375d3b73a8c27f806590747e56b8644a86300e243d62efcb6589d197edd352e2a79d49be704718ff53381e2fb5e2a5a2b1af
 SHA512 
e3e9a76419caca4eeebf3c149a72ee939a25f463d03dd8461caf44cace310278b08e83d460112f240cd54ed05dba3c5e9732198f0c3d0b9d81c3a444c33ab8d3
+DIST fcitx-qt5-1.2.4.tar.xz 107620 BLAKE2B 
3577555192d2eda9e48fbd31149100f0d21fd1b0b7d162d14cef89818f86d5e32e2bb835f4f47acf150cfd0b0fc506031454e4ffe1315424314fc7512d391f8f
 SHA512 
c9ceaaedeb26ac4c7fa1e0bf34096725afc14642b795d9c624f4fc7fbf56c04acad12d8d3ffb60c164281b6373554c0524e56209a2d1d123fbf348d15dcc282a

diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.4.ebuild 
b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.4.ebuild
new file mode 100644
index 000..610eb112d60
--- /dev/null
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2014-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake
+
+if [[ "${PV}" =~ (^|\.)$ ]]; then
+   inherit git-r3
+
+   EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5;
+fi
+
+DESCRIPTION="Fcitx input method module for Qt 5"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5;
+if [[ "${PV}" =~ (^|\.)$ ]]; then
+   SRC_URI=""
+else
+   SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz;
+fi
+
+LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+"
+SLOT="4"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+   dev-qt/qtcore:5
+   dev-qt/qtdbus:5
+   dev-qt/qtwidgets:5
+   kde-frameworks/extra-cmake-modules:5
+   virtual/pkgconfig"
+# Private headers of dev-qt/qtgui:5 used.
+RDEPEND=">=app-i18n/fcitx-4.2.9:4
+   dev-qt/qtcore:5
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5=
+   dev-qt/qtwidgets:5
+   virtual/libintl
+   x11-libs/libxkbcommon"
+DEPEND="${RDEPEND}
+   dev-qt/qtconcurrent:5"
+
+DOCS=()



[gentoo-commits] repo/gentoo:master commit in: app-emulation/open-vm-tools/

2020-11-16 Thread Mike Gilbert
commit: 30759443ff9727b6cba7ec7c2066c4721f99
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Nov 16 19:24:28 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Mon Nov 16 19:24:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30759443

app-emulation/open-vm-tools: bump to 11.2.0

Closes: https://bugs.gentoo.org/744154
Signed-off-by: Mike Gilbert  gentoo.org>

 app-emulation/open-vm-tools/Manifest   |   3 +-
 .../open-vm-tools/open-vm-tools-11.0.1-r1.ebuild   | 142 -
 ...build => open-vm-tools-11.2.0_p16938113.ebuild} |   4 +-
 3 files changed, 3 insertions(+), 146 deletions(-)

diff --git a/app-emulation/open-vm-tools/Manifest 
b/app-emulation/open-vm-tools/Manifest
index 3860659e62e..9b7153cf2a2 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -1,2 +1 @@
-DIST open-vm-tools-11.0.1-14773994.tar.gz 3972888 BLAKE2B 
8ead9b37e9fa861386087d50af4e20274a9ee9fafd929da3ca0652ea2c4eecff4c203cadf02d38401bfd7ff0129ebcc7895d2819785cf2d818aac91a46f8d163
 SHA512 
3f500b3f0daaed01f787cf271d094b693baa18304491c3b58c79b64ab7db41b1b4a4747440e0039b2d9f9cc7e1474ee15f0ee7413544a34c2c9402443c145276
-DIST open-vm-tools-11.1.0-16036546.tar.gz 3986835 BLAKE2B 
f02e9426fb324ec0f4f78f43554a55ce0b615f609f888c008e8ecaf59332b9e25b0c865730cd263be1936d223c9cd5e078d304d1ddd8903cec88512cd63c258b
 SHA512 
cd1f8399b9660ecac8222cfdc0d6331dce67db2f3a1788f21b18b201066dbcd059f429130f1fb5b416bb9a06b4882ec462a134aa8ca595f17dc48af0b7f59e8e
+DIST open-vm-tools-11.2.0-16938113.tar.gz 4050857 BLAKE2B 
b0e5e1e985d9f3d50dbbb8a4a7939d37d8968f0aa15e6d7200b7ec8511bd059d3a78a4ddd763d22965dc6da614d156e6b7ee23af73490f8bbf8e1dc2664041d3
 SHA512 
c950d6e8ba5218dd40e845f3c2b09eeb640ef0d33c7ea1671164027927e062dcf0b4745f6e4515a7495ec20a6d06a8fbf700819f6211073194b5ef97d7be441d

diff --git a/app-emulation/open-vm-tools/open-vm-tools-11.0.1-r1.ebuild 
b/app-emulation/open-vm-tools/open-vm-tools-11.0.1-r1.ebuild
deleted file mode 100644
index 3fb3beb6d1d..000
--- a/app-emulation/open-vm-tools/open-vm-tools-11.0.1-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 2007-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info pam systemd toolchain-funcs
-
-DESCRIPTION="Opensourced tools for VMware guests"
-HOMEPAGE="https://github.com/vmware/open-vm-tools;
-MY_P="${P}-14773994"
-SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV}/${MY_P}.tar.gz;
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl 
static-libs +vgauth"
-REQUIRED_USE="
-   multimon? ( X )
-   vgauth? ( ssl )
-"
-
-RDEPEND="
-   dev-libs/glib
-   net-libs/libtirpc
-   deploypkg? ( dev-libs/libmspack )
-   fuse? ( sys-fs/fuse:0 )
-   pam? ( sys-libs/pam )
-   ssl? ( dev-libs/openssl:0 )
-   vgauth? (
-   dev-libs/libxml2
-   dev-libs/xmlsec
-   )
-   X? (
-   x11-libs/libXext
-   multimon? ( x11-libs/libXinerama )
-   x11-libs/libXi
-   x11-libs/libXrender
-   x11-libs/libXrandr
-   x11-libs/libXtst
-   x11-libs/libSM
-   x11-libs/libXcomposite
-   x11-libs/gdk-pixbuf:2
-   x11-libs/gtk+:3
-   gtkmm? (
-   dev-cpp/gtkmm:3.0
-   dev-libs/libsigc++:2
-   )
-   )
-   dnet? ( dev-libs/libdnet )
-   icu? ( dev-libs/icu:= )
-   resolutionkms? (
-   x11-libs/libdrm[video_cards_vmware]
-   virtual/libudev
-   )
-"
-
-DEPEND="${RDEPEND}
-   net-libs/rpcsvc-proto
-"
-
-BDEPEND="
-   dev-util/glib-utils
-   virtual/pkgconfig
-   doc? ( app-doc/doxygen )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}/10.1.0-mount.vmhgfs.patch"
-   "${FILESDIR}/10.1.0-Werror.patch"
-   "${FILESDIR}/11.0.1-udev-complaints.patch"
-)
-
-pkg_setup() {
-   local CONFIG_CHECK="~VMWARE_BALLOON ~VMWARE_PVSCSI ~VMXNET3"
-   use X && CONFIG_CHECK+=" ~DRM_VMWGFX"
-   kernel_is -lt 3 9 || CONFIG_CHECK+=" ~VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS"
-   kernel_is -lt 3 || CONFIG_CHECK+=" ~FUSE_FS"
-   linux-info_pkg_setup
-}
-
-src_prepare() {
-   eapply -p2 "${PATCHES[@]}"
-   eapply_user
-   eautoreconf
-}
-
-src_configure() {
-   local myeconfargs=(
-   --without-root-privileges
-   $(use_enable multimon)
-   $(use_with X x)
-   $(use_with X gtk3)
-   $(use_with gtkmm gtkmm3)
- 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/

2020-11-12 Thread Mike Gilbert
commit: 32a2403c867a29ab463214e3faf0f16234c6
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Nov 12 04:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Nov 12 21:54:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32a2403c

dev-libs/marisa: Set maintainer Arfrever.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-libs/marisa/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/dev-libs/marisa/metadata.xml b/dev-libs/marisa/metadata.xml
index 4aa8461d2b5..f8feae5e9c2 100644
--- a/dev-libs/marisa/metadata.xml
+++ b/dev-libs/marisa/metadata.xml
@@ -1,6 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
+   
+   arfrever@gmail.com
+   Arfrever Frehtes Taifersar Arahesis
+   

c...@gentoo.org
Cjk



[gentoo-commits] repo/gentoo:master commit in: app-i18n/libkkc/

2020-11-12 Thread Mike Gilbert
commit: ff6b4b3975d32e2592bb82ac5da709929e07c375
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Nov 12 06:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Nov 12 21:54:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff6b4b39

app-i18n/libkkc: Set maintainer Arfrever.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/libkkc/metadata.xml | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/app-i18n/libkkc/metadata.xml b/app-i18n/libkkc/metadata.xml
index 4d9edd9a3b5..da21de5a348 100644
--- a/app-i18n/libkkc/metadata.xml
+++ b/app-i18n/libkkc/metadata.xml
@@ -1,11 +1,15 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-c...@gentoo.org
-Cjk
-  
-  
-ueno/libkkc
-  
+   
+   arfrever@gmail.com
+   Arfrever Frehtes Taifersar Arahesis
+   
+   
+   c...@gentoo.org
+   Cjk
+   
+   
+   ueno/libkkc
+   
 



[gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/

2020-11-12 Thread Mike Gilbert
commit: c3f8224ec74ed46fdb47e97ccfa737261f2d4fe4
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Nov 12 01:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Nov 12 21:54:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3f8224e

dev-libs/marisa: Set DISTUTILS_USE_SETUPTOOLS="no".

Closes: https://bugs.gentoo.org/746287

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-libs/marisa/marisa-0.2.5.ebuild | 1 +
 dev-libs/marisa/marisa-.ebuild  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild 
b/dev-libs/marisa/marisa-0.2.5.ebuild
index d01438d3317..11ab370eff6 100644
--- a/dev-libs/marisa/marisa-0.2.5.ebuild
+++ b/dev-libs/marisa/marisa-0.2.5.ebuild
@@ -4,6 +4,7 @@
 EAPI="7"
 PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
 DISTUTILS_OPTIONAL="1"
+DISTUTILS_USE_SETUPTOOLS="no"
 
 inherit autotools distutils-r1
 

diff --git a/dev-libs/marisa/marisa-.ebuild 
b/dev-libs/marisa/marisa-.ebuild
index fd55f427647..0450f64682a 100644
--- a/dev-libs/marisa/marisa-.ebuild
+++ b/dev-libs/marisa/marisa-.ebuild
@@ -4,6 +4,7 @@
 EAPI="7"
 PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
 DISTUTILS_OPTIONAL="1"
+DISTUTILS_USE_SETUPTOOLS="no"
 
 inherit autotools distutils-r1
 



[gentoo-commits] repo/gentoo:master commit in: dev-libs/oniguruma/

2020-11-12 Thread Mike Gilbert
commit: 3ac4952dada67205aff293fc8f6d140b47353809
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Nov 12 07:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Nov 12 21:54:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ac4952d

dev-libs/oniguruma: Re-enable POSIX API.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild | 51 
 1 file changed, 51 insertions(+)

diff --git a/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild 
b/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
new file mode 100644
index 000..52a40b3d158
--- /dev/null
+++ b/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2003-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib-minimal
+
+if [[ "${PV}" == "" ]]; then
+   inherit autotools git-r3
+
+   EGIT_REPO_URI="https://github.com/kkos/oniguruma;
+fi
+
+DESCRIPTION="Regular expression library for different character encodings"
+HOMEPAGE="https://github.com/kkos/oniguruma;
+if [[ "${PV}" == "" ]]; then
+   SRC_URI=""
+else
+   
SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz;
+fi
+
+LICENSE="BSD-2"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="crnl-as-line-terminator static-libs"
+
+if [[ "${PV}" != "" ]]; then
+   S="${WORKDIR}/onig-${PV}"
+fi
+
+DOCS=(AUTHORS HISTORY README{,_japanese} 
doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} 
doc/{SYNTAX.md,UNICODE_PROPERTIES})
+
+src_prepare() {
+   default
+
+   if [[ "${PV}" == "" ]]; then
+   eautoreconf
+   fi
+}
+
+multilib_src_configure() {
+   ECONF_SOURCE="${S}" econf \
+   --enable-posix-api \
+   $(use_enable crnl-as-line-terminator) \
+   $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+   einstalldocs
+   find "${ED}" -name "*.la" -delete || die
+}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/

2020-11-12 Thread Mike Gilbert
commit: 7c40ca160c208b9685d32c1bf812b59152772474
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Nov 12 00:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Nov 12 21:54:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c40ca16

dev-libs/marisa: Add support for Python 3.8 and 3.9.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-libs/marisa/marisa-0.2.5.ebuild | 2 +-
 dev-libs/marisa/marisa-.ebuild  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild 
b/dev-libs/marisa/marisa-0.2.5.ebuild
index 4289f375ea6..d01438d3317 100644
--- a/dev-libs/marisa/marisa-0.2.5.ebuild
+++ b/dev-libs/marisa/marisa-0.2.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
 DISTUTILS_OPTIONAL="1"
 
 inherit autotools distutils-r1

diff --git a/dev-libs/marisa/marisa-.ebuild 
b/dev-libs/marisa/marisa-.ebuild
index 6942f85b198..fd55f427647 100644
--- a/dev-libs/marisa/marisa-.ebuild
+++ b/dev-libs/marisa/marisa-.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2014-2019 Gentoo Authors
+# Copyright 2014-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
 DISTUTILS_OPTIONAL="1"
 
 inherit autotools distutils-r1



[gentoo-commits] repo/gentoo:master commit in: dev-libs/oniguruma/

2020-11-12 Thread Mike Gilbert
commit: 39c4810d09793ce03a696a381b3d3d74c0c0f1d2
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Nov 12 08:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Nov 12 21:54:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39c4810d

dev-libs/oniguruma: Fix building with linker LLD.

Closes: https://bugs.gentoo.org/737194

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild 
b/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
index 52a40b3d158..e0a1c8d371c 100644
--- a/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
@@ -31,6 +31,10 @@ fi
 DOCS=(AUTHORS HISTORY README{,_japanese} 
doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} 
doc/{SYNTAX.md,UNICODE_PROPERTIES})
 
 src_prepare() {
+   # https://github.com/kkos/oniguruma/issues/223
+   # 
https://github.com/kkos/oniguruma/commit/d177786282a618c76cdf2e993e3d0d9a684e9666
+   sed -e "/^AM_LDFLAGS[[:space:]]*=/s:-L\$(prefix)/lib:-L\$(libdir):" -i 
{sample,test}/Makefile.{am,in} || die
+
default
 
if [[ "${PV}" == "" ]]; then



[gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/

2020-11-12 Thread Mike Gilbert
commit: 16a4c00c233ba738b080d27cedd0fa2aaf5eba0f
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Nov 12 03:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Nov 12 21:54:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16a4c00c

dev-libs/marisa: Version bump (0.2.6).

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-libs/marisa/Manifest|   1 +
 dev-libs/marisa/marisa-0.2.6.ebuild | 119 
 2 files changed, 120 insertions(+)

diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest
index 1a55c59ef89..7b524798645 100644
--- a/dev-libs/marisa/Manifest
+++ b/dev-libs/marisa/Manifest
@@ -1 +1,2 @@
 DIST marisa-0.2.5.tar.gz 167434 BLAKE2B 
2b88e9f0060529c2180400290bb975a94f58f77f7604cf3ea8ae0ad7e44e0d95e18c8911d9630561b9593eb2ec123b5c67d6d195dab480d86fe431ce2531
 SHA512 
62975a2dacd2a1072c990cd490f866cd5483c069c94a4706baf3ffc21ec43991583a8ef8721c3b841617b0654cbb894698c19759ff12b8887b6fd28939dfb547
+DIST marisa-0.2.6.tar.gz 168332 BLAKE2B 
3b8a89a9a0b344d9de96edb5bf17c50db07da373e75eba098f48c9064321d579ac104db622608119377084c79165bf558c804eaff591903b67330b13bc8acf55
 SHA512 
c094e4b22e1457efdd20f2b978ee421b53e36ed94e4fdbd8944136c0ba23da4f6ba9fe3a2c64729c1426aee4dbe8098bfa5eebb943ae7fdaa4eec760485c564d

diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild 
b/dev-libs/marisa/marisa-0.2.6.ebuild
new file mode 100644
index 000..00044d3bada
--- /dev/null
+++ b/dev-libs/marisa/marisa-0.2.6.ebuild
@@ -0,0 +1,119 @@
+# Copyright 2014-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
+DISTUTILS_OPTIONAL="1"
+DISTUTILS_USE_SETUPTOOLS="no"
+
+inherit autotools distutils-r1
+
+if [[ "${PV}" == "" ]]; then
+   inherit git-r3
+
+   EGIT_REPO_URI="https://github.com/s-yata/marisa-trie;
+fi
+
+DESCRIPTION="Matching Algorithm with Recursively Implemented StorAge"
+HOMEPAGE="https://github.com/s-yata/marisa-trie 
https://code.google.com/archive/p/marisa-trie/;
+if [[ "${PV}" == "" ]]; then
+   SRC_URI=""
+else
+   SRC_URI="https://github.com/s-yata/marisa-trie/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+fi
+
+LICENSE="|| ( BSD-2 LGPL-2.1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="python? (
+   ${PYTHON_DEPS}
+   dev-lang/swig
+   )"
+DEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+
+if [[ "${PV}" != "" ]]; then
+   S="${WORKDIR}/marisa-trie-${PV}"
+fi
+
+src_prepare() {
+   default
+   eautoreconf
+
+   sed -e 
"s:^\([[:space:]]*\)libraries=:\1include_dirs=[\"../../include\"],\n\1library_dirs=[\"../../lib/marisa/.libs\"],\n&:"
 -i bindings/python/setup.py || die
+
+   if use python; then
+   pushd bindings/python > /dev/null || die
+   distutils-r1_src_prepare
+   popd > /dev/null || die
+   fi
+}
+
+src_configure() {
+   local -x CPPFLAGS="${CPPFLAGS} ${CXXFLAGS}"
+
+   cpu_instructions_option() {
+   local option="${1}"
+   local macros="${2}"
+   local result="--enable-${option}"
+   local macro
+   for macro in ${macros}; do
+   if ! $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < 
/dev/null 2> /dev/null | grep -Eq "^#define ${macro}([[:space:]]|$)"; then
+   result="--disable-${option}"
+   fi
+   done
+   echo "${result}"
+   }
+
+   local options=(
+   $(cpu_instructions_option sse2 __SSE2__)
+   $(cpu_instructions_option sse3 __SSE3__)
+   $(cpu_instructions_option ssse3 __SSSE3__)
+   $(cpu_instructions_option sse4.1 __SSE4_1__)
+   $(cpu_instructions_option sse4.2 __SSE4_2__)
+   $(cpu_instructions_option sse4 __POPCNT__ __SSE4_2__)
+   $(cpu_instructions_option sse4a __SSE4A__)
+   $(cpu_instructions_option popcnt __POPCNT__)
+   $(cpu_instructions_option bmi __BMI__)
+   $(cpu_instructions_option bmi2 __BMI2__)
+   $(use_enable static-libs static)
+   )
+
+   econf "${options[@]}"
+
+   if use python; then
+   pushd bindings/python > /dev/null || die
+   distutils-r1_src_configure
+   popd

[gentoo-commits] repo/gentoo:master commit in: app-i18n/libkkc/

2020-11-12 Thread Mike Gilbert
commit: 0477a64b44c4d763185c2f27ecbfba27072de108
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Nov 12 05:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Nov 12 21:54:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0477a64b

app-i18n/libkkc: Add support for Python 3.8 and 3.9.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild | 6 +++---
 app-i18n/libkkc/libkkc-.ebuild| 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild 
b/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild
index 3f920501d61..8ac08a9cb2b 100644
--- a/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild
+++ b/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2013-2019 Gentoo Authors
+# Copyright 2013-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
 
 inherit autotools python-any-r1 vala
 
@@ -63,5 +63,5 @@ src_configure() {
 
 src_install() {
default
-   find "${D}" -name "*.la" -type f -delete || die
+   find "${ED}" -name "*.la" -delete || die
 }

diff --git a/app-i18n/libkkc/libkkc-.ebuild 
b/app-i18n/libkkc/libkkc-.ebuild
index 971d75ef2cb..199f77aa98b 100644
--- a/app-i18n/libkkc/libkkc-.ebuild
+++ b/app-i18n/libkkc/libkkc-.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2013-2019 Gentoo Authors
+# Copyright 2013-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
 
 inherit autotools python-any-r1 vala
 
@@ -63,5 +63,5 @@ src_configure() {
 
 src_install() {
default
-   find "${D}" -name "*.la" -type f -delete || die
+   find "${ED}" -name "*.la" -delete || die
 }



[gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/

2020-11-12 Thread Mike Gilbert
commit: 3901a6f4b767074586f5f2cc4583285296ff1b25
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Nov 12 02:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Nov 12 21:54:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3901a6f4

dev-libs/marisa: Update code for selection of CPU instructions.

https://github.com/s-yata/marisa-trie/commit/bbcff46114eaf306ed26ec9e55ee3f3e1dc54f16

Unconditionally passing --enable-sse2, --enable-sse3 etc. no longer works.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-libs/marisa/marisa-.ebuild | 34 --
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/dev-libs/marisa/marisa-.ebuild 
b/dev-libs/marisa/marisa-.ebuild
index 0450f64682a..2458eb10f41 100644
--- a/dev-libs/marisa/marisa-.ebuild
+++ b/dev-libs/marisa/marisa-.ebuild
@@ -55,16 +55,30 @@ src_prepare() {
 src_configure() {
local -x CPPFLAGS="${CPPFLAGS} ${CXXFLAGS}"
 
+   cpu_instructions_option() {
+   local option="${1}"
+   local macros="${2}"
+   local result="--enable-${option}"
+   local macro
+   for macro in ${macros}; do
+   if ! $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < 
/dev/null 2> /dev/null | grep -Eq "^#define ${macro}([[:space:]]|$)"; then
+   result="--disable-${option}"
+   fi
+   done
+   echo "${result}"
+   }
+
local options=(
-   # Preprocessor macros dependent on CPPFLAGS are checked.
-   --enable-sse2
-   --enable-sse3
-   --enable-ssse3
-   --enable-sse4.1
-   --enable-sse4.2
-   --enable-sse4
-   --enable-sse4a
-   --enable-popcnt
+   $(cpu_instructions_option sse2 __SSE2__)
+   $(cpu_instructions_option sse3 __SSE3__)
+   $(cpu_instructions_option ssse3 __SSSE3__)
+   $(cpu_instructions_option sse4.1 __SSE4_1__)
+   $(cpu_instructions_option sse4.2 __SSE4_2__)
+   $(cpu_instructions_option sse4 __POPCNT__ __SSE4_2__)
+   $(cpu_instructions_option sse4a __SSE4A__)
+   $(cpu_instructions_option popcnt __POPCNT__)
+   $(cpu_instructions_option bmi __BMI__)
+   $(cpu_instructions_option bmi2 __BMI2__)
$(use_enable static-libs static)
)
 
@@ -90,7 +104,7 @@ src_compile() {
 
 src_install() {
default
-   find "${D}" -name "*.la" -type f -delete || die
+   find "${ED}" -name "*.la" -delete || die
 
(
docinto html



[gentoo-commits] repo/gentoo:master commit in: dev-libs/oniguruma/

2020-11-12 Thread Mike Gilbert
commit: b0f747081af1f1b7093e618a9b71fae1ab813834
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Nov 12 09:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Nov 12 21:54:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0f74708

dev-libs/oniguruma: Set maintainer Arfrever.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-libs/oniguruma/metadata.xml | 44 +
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/dev-libs/oniguruma/metadata.xml b/dev-libs/oniguruma/metadata.xml
index 2dc293268b6..597c459467b 100644
--- a/dev-libs/oniguruma/metadata.xml
+++ b/dev-libs/oniguruma/metadata.xml
@@ -1,25 +1,27 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-c...@gentoo.org
-Cjk
-  
-  
-Oniguruma is a regular expression library.  The characteristics of
-this library is that different character encoding for every regular
-expression object can be specified.  (Supported character encodings:
-ASCII, UTF-8, EUC-JP, Shift_JIS)
-  
-  
-Reflect ABI of libonig.so.
-  
-  
-
-  enable CR+NL as line terminator
-
-  
-  
-kkos/oniguruma
-  
+   
+   arfrever@gmail.com
+   Arfrever Frehtes Taifersar Arahesis
+   
+   
+   c...@gentoo.org
+   Cjk
+   
+   
+   Oniguruma is a regular expression library.  The characteristics 
of
+   this library is that different character encoding for every 
regular
+   expression object can be specified.  (Supported character 
encodings:
+   ASCII, UTF-8, EUC-JP, Shift_JIS)
+   
+   
+   libonig.so soname version number
+   
+   
+   Enable CR+NL as line 
terminator
+   
+   
+   kkos/oniguruma
+   
 



[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/

2020-11-12 Thread Mike Gilbert
commit: 57abedd3a309f29f65fda1a1c0dada1ecff4dd47
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Nov 12 18:45:21 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Nov 12 18:45:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57abedd3

sys-apps/systemd: support python3.9

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/systemd/systemd-247_rc2.ebuild | 2 +-
 sys-apps/systemd/systemd-.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/systemd/systemd-247_rc2.ebuild 
b/sys-apps/systemd/systemd-247_rc2.ebuild
index 016f308320d..cb5298ddc67 100644
--- a/sys-apps/systemd/systemd-247_rc2.ebuild
+++ b/sys-apps/systemd/systemd-247_rc2.ebuild
@@ -19,7 +19,7 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam 
python-any-r1 systemd toolchain-funcs udev usr-ldscript
 

diff --git a/sys-apps/systemd/systemd-.ebuild 
b/sys-apps/systemd/systemd-.ebuild
index 016f308320d..cb5298ddc67 100644
--- a/sys-apps/systemd/systemd-.ebuild
+++ b/sys-apps/systemd/systemd-.ebuild
@@ -19,7 +19,7 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam 
python-any-r1 systemd toolchain-funcs udev usr-ldscript
 



[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/

2020-11-12 Thread Mike Gilbert
commit: 7ec6712be7913f92e7ee7ca2f7c4e9fc1bf54fa6
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Nov 12 15:44:03 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Nov 12 15:44:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ec6712b

sys-apps/systemd: bump to 247-rc2

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/systemd/Manifest   | 2 +-
 sys-apps/systemd/{systemd-247_rc1.ebuild => systemd-247_rc2.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 530182fc3ff..15a4d13e663 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,3 +1,3 @@
 DIST systemd-246.tar.gz 9534036 BLAKE2B 
71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0
 SHA512 
7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
-DIST systemd-247-rc1.tar.gz 9838448 BLAKE2B 
99eeafb9ef35d7786f39e8089820ea7b838e06b7ad74271a193c27e716275cb96e0cfe213fa546abc304978fdf95be37e23f31c2059aa6aff28739979a1a036d
 SHA512 
5c04b013ceebbf466c917d093189a60a2a77c57a844eed840c911669855d4d9d783dcaec1ba6b488c5e96e7f9a9f3d4e39cff240c46c013ec2fcce5a5b7c4aee
+DIST systemd-247-rc2.tar.gz 9865122 BLAKE2B 
ddc12d733fa81cedcea974d05980e3b6731c48229c6ba30dbdeab1a17f32ab7f17f140b6609a542482cf972dc447d797a400a4b7dc30961c1dfdb9d79f0973e2
 SHA512 
01fb347f3edb08efdf97b54339b381e4747377af08528f7267e6de6e85215025f81da13f822fcd9b449891b925aa163c6755dea86e6727b626ea27c19e5f391b
 DIST systemd-stable-246.6.tar.gz 9545237 BLAKE2B 
5290736b30ca1a3188335a74d49b4f3e8b48007d9563efac1985ea6428a8b8fd6cad7ae87c35e13a32f851ebd27821829738274d35cfbff9340750bd3b086621
 SHA512 
1936b291d9831cf61f800fe718a4c2c2fe9b2a11fd817fe32bd48da2087a675dfc91013209a3478ea52e8ada593300ed906e248b8081dcf9141bf1cc17483ea9

diff --git a/sys-apps/systemd/systemd-247_rc1.ebuild 
b/sys-apps/systemd/systemd-247_rc2.ebuild
similarity index 100%
rename from sys-apps/systemd/systemd-247_rc1.ebuild
rename to sys-apps/systemd/systemd-247_rc2.ebuild



[gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/, app-i18n/fcitx/files/

2020-11-11 Thread Mike Gilbert
commit: 87e5eed5e2cf8ac1c53fab1e87ef2ed502b4ea7d
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Wed Nov 11 05:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Nov 11 20:20:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87e5eed5

app-i18n/fcitx: Fix detection of Enchant >=2.1.3.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/fcitx/fcitx-4.2.9.8.ebuild  |  1 +
 app-i18n/fcitx/fcitx-4..ebuild   |  1 +
 app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch | 32 
 3 files changed, 34 insertions(+)

diff --git a/app-i18n/fcitx/fcitx-4.2.9.8.ebuild 
b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild
index 6c50695a891..445151b051e 100644
--- a/app-i18n/fcitx/fcitx-4.2.9.8.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild
@@ -72,6 +72,7 @@ DEPEND="dev-libs/glib:2
 RDEPEND="${DEPEND}"
 
 PATCHES=(
+   "${FILESDIR}/${PN}-4.2.9.8-enchant.patch"
"${FILESDIR}/${PN}-4.2.9.8-xkb.patch"
 )
 

diff --git a/app-i18n/fcitx/fcitx-4..ebuild 
b/app-i18n/fcitx/fcitx-4..ebuild
index bd7bc5be794..3cb6e63cdc7 100644
--- a/app-i18n/fcitx/fcitx-4..ebuild
+++ b/app-i18n/fcitx/fcitx-4..ebuild
@@ -72,6 +72,7 @@ DEPEND="dev-libs/glib:2
 RDEPEND="${DEPEND}"
 
 PATCHES=(
+   "${FILESDIR}/${PN}-4.2.9.8-enchant.patch"
"${FILESDIR}/${PN}-4.2.9.8-xkb.patch"
 )
 

diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch 
b/app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch
new file mode 100644
index 000..f152f1dc6e5
--- /dev/null
+++ b/app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch
@@ -0,0 +1,32 @@
+https://github.com/fcitx/fcitx/issues/475
+
+--- /cmake/FindEnchant.cmake
 /cmake/FindEnchant.cmake
+@@ -16,15 +16,15 @@
+ endif(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
+ 
+ find_package(PkgConfig)
+-pkg_check_modules(PC_ENCHANT enchant)
++pkg_check_modules(PC_ENCHANT enchant-2 enchant)
+ 
+ find_path(ENCHANT_INCLUDE_DIR
+   NAMES enchant.h
+   HINTS ${PC_ENCHANT_INCLUDE_DIRS}
+-  PATH_SUFFIXES "enchant")
++  PATH_SUFFIXES enchant-2 enchant)
+ 
+ find_library(ENCHANT_LIBRARIES
+-  NAMES enchant
++  NAMES enchant-2 enchant
+   HINTS ${PC_ENCHANT_LIBRARY_DIRS})
+ 
+ if(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
+@@ -39,7 +39,7 @@
+   #include 
+   #include 
+   #include 
+-  #include 
++  #include 
+ 
+   EnchantBroker *enchant_broker_init();
+   char **enchant_dict_suggest(EnchantDict *dict, const char *str,



[gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx-qt5/

2020-11-11 Thread Mike Gilbert
commit: 2c3a4f868daa164ecd1275af516eda7163b3c285
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Wed Nov 11 00:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Nov 11 20:20:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c3a4f86

app-i18n/fcitx-qt5: Add app-i18n/fcitx and dev-qt/{qtcore,qtdbus,qtwidgets}:5 
to BDEPEND.

fcitx-cmake-helper.sh (app-i18n/fcitx:4) called by build system.
moc (dev-qt/qtcore:5) called by build system.
qdbusxml2cpp (dev-qt/qtdbus:5) called by build system.
uic (dev-qt/qtwidgets:5) called by build system.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild  | 6 +-
 app-i18n/fcitx-qt5/fcitx-qt5-4..ebuild | 6 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild 
b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
index 406a2119dda..1699cf4ea4a 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
@@ -24,7 +24,11 @@ SLOT="4"
 KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 IUSE=""
 
-BDEPEND="kde-frameworks/extra-cmake-modules:5
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+   dev-qt/qtcore:5
+   dev-qt/qtdbus:5
+   dev-qt/qtwidgets:5
+   kde-frameworks/extra-cmake-modules:5
virtual/pkgconfig"
 # Private headers of dev-qt/qtgui:5 used.
 RDEPEND=">=app-i18n/fcitx-4.2.9:4

diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-4..ebuild 
b/app-i18n/fcitx-qt5/fcitx-qt5-4..ebuild
index 4b6a0c84a68..25daf4bb523 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-4..ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-4..ebuild
@@ -24,7 +24,11 @@ SLOT="4"
 KEYWORDS=""
 IUSE=""
 
-BDEPEND="kde-frameworks/extra-cmake-modules:5
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+   dev-qt/qtcore:5
+   dev-qt/qtdbus:5
+   dev-qt/qtwidgets:5
+   kde-frameworks/extra-cmake-modules:5
virtual/pkgconfig"
 # Private headers of dev-qt/qtgui:5 used.
 RDEPEND=">=app-i18n/fcitx-4.2.9:4



[gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/

2020-11-11 Thread Mike Gilbert
commit: 44dbc2894238443af62d46b029bc99f530ff15ff
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Wed Nov 11 02:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Nov 11 20:20:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44dbc289

app-i18n/fcitx: Version bump (4.2.9.7).

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/fcitx/Manifest |   1 +
 app-i18n/fcitx/fcitx-4.2.9.7.ebuild | 144 
 2 files changed, 145 insertions(+)

diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index cfcbad155f7..da15628688d 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,4 +1,5 @@
 DIST fcitx-4.2.9.6_dict.tar.xz 8738408 BLAKE2B 
812256657ef8f6648a8a3de4bef4e423288ee3d91d493783eae2cb55b5b5964a791f3317af1aea0d877e01ea06491c34f6c594038d27713be3a6b35c93bc5545
 SHA512 
dc8308d1a4e9b7595da285ca6521f33027f5b8e6968bc28f751bd4f40116166cabbe1c05e29072afbe88473d2a9d6999124476260785e07f62a243df6e896bb0
+DIST fcitx-4.2.9.7_dict.tar.xz 8734508 BLAKE2B 
e8770a3afe902fab11325f345a128156a9e6e8c4f5e712c68a03a12282c0bc6a279968bacdb2129a243967c8fdfc6b7145f5ad13daea5bf0c5fb28332e79437e
 SHA512 
b940478c648e30b2ea55903465ed02c8a0c3ae3539e4bd5b77be46a9e4d0c13ceff074ddd7532f86893111eb96308e1740db621a83fb809e4fd02256d75ebe7b
 DIST fcitx-data-en_dict-20121020.tar.gz 630491 BLAKE2B 
2df897b1c9fb3a2ce186ee590e5f3ccbc7930f047218bf0fefa317f74b3287fc0be9c393d3310fe07208379118ec4c46608a1c703ef37b3aee65b2d790cb7f0d
 SHA512 
8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
 DIST fcitx-data-pinyin.tar.gz 1608886 BLAKE2B 
3b7e72559bb838b4f2245e6faf2d627df17e9383ef8fe382e10333c1a95d79409ec042caa7d77c9bcd956b1c5d5456dab9d82208cd89d90e2be759c76f56f3d1
 SHA512 
1ee19eed3ee58be6cd6562ec363fe3bf630fff5e8820b3bfdd6d4618fceb082695e888dec5366a3685d58706f720e19319d891c223227237aed12674ea982131
 DIST fcitx-data-py_stroke-20121124.tar.gz 445601 BLAKE2B 
43b29b30da11b18196918e4df847406871eff75595b62608ad86b0ef6de83ec5e1b722645cabb809281075b393b5970e4d9580594caa73060c866c2d3cd988e7
 SHA512 
d80ff9a3549e07c7a6935e686785f9a076c58f1a782a832ae28ee65e2a213d67f089f450ce09bed87ec2a141c32b9c1fcb83c221ddcab436858fa9009f161fb3

diff --git a/app-i18n/fcitx/fcitx-4.2.9.7.ebuild 
b/app-i18n/fcitx/fcitx-4.2.9.7.ebuild
new file mode 100644
index 000..373283fec00
--- /dev/null
+++ b/app-i18n/fcitx/fcitx-4.2.9.7.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2003-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake gnome2-utils xdg-utils
+
+if [[ "${PV}" =~ (^|\.)$ ]]; then
+   inherit git-r3
+
+   EGIT_REPO_URI="https://github.com/fcitx/fcitx;
+fi
+
+DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input 
method framework"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx;
+if [[ "${PV}" =~ (^|\.)$ ]]; then
+   SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> 
fcitx-data-pinyin.tar.gz
+   https://download.fcitx-im.org/data/table.tar.gz -> 
fcitx-data-table.tar.gz
+   https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> 
fcitx-data-py_stroke-20121124.tar.gz
+   https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> 
fcitx-data-py_table-20121124.tar.gz
+   https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> 
fcitx-data-en_dict-20121020.tar.gz"
+else
+   SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz;
+fi
+
+LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls 
opencc +pango static-libs +table test +xkb"
+REQUIRED_USE="cairo? ( X ) pango? ( cairo )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="dev-util/glib-utils
+   kde-frameworks/extra-cmake-modules:5
+   virtual/pkgconfig
+   introspection? ( dev-libs/gobject-introspection )
+   nls? ( sys-devel/gettext )"
+DEPEND="dev-libs/glib:2
+   sys-apps/dbus
+   sys-apps/util-linux
+   virtual/libiconv
+   virtual/libintl
+   x11-libs/libxkbcommon
+   X? (
+   x11-libs/libX11
+   x11-libs/libXfixes
+   x11-libs/libXinerama
+   x11-libs/libXrender
+   xkb? (
+   dev-libs/libxml2
+   x11-libs/libxkbfile
+   x11-misc/xkeyboard-config
+   )
+   )
+   cairo? (
+   x11-libs/cairo[X]
+   x11-libs/libXext
+   pango? ( x11-libs/pango )

[gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/

2020-11-11 Thread Mike Gilbert
commit: b3825fe469f3a008aa6cb4cfe9d2f812658e5600
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Wed Nov 11 03:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Nov 11 20:20:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3825fe4

app-i18n/fcitx: Drop "static-libs" USE flag.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/fcitx/fcitx-4.2.9.7.ebuild | 3 +--
 app-i18n/fcitx/fcitx-4..ebuild  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app-i18n/fcitx/fcitx-4.2.9.7.ebuild 
b/app-i18n/fcitx/fcitx-4.2.9.7.ebuild
index 373283fec00..5a6d41ac6a9 100644
--- a/app-i18n/fcitx/fcitx-4.2.9.7.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.7.ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
 SLOT="4"
 KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls 
opencc +pango static-libs +table test +xkb"
+IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls 
opencc +pango +table test +xkb"
 REQUIRED_USE="cairo? ( X ) pango? ( cairo )"
 RESTRICT="!test? ( test )"
 
@@ -106,7 +106,6 @@ src_configure() {
-DENABLE_QT_GUI=OFF
-DENABLE_QT_IM_MODULE=OFF
-DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo ON; else 
echo OFF; fi)
-   -DENABLE_STATIC=$(usex static-libs ON OFF)
-DENABLE_TABLE=$(usex table ON OFF)
-DENABLE_TEST=$(usex test ON OFF)
-DENABLE_X11=$(usex X ON OFF)

diff --git a/app-i18n/fcitx/fcitx-4..ebuild 
b/app-i18n/fcitx/fcitx-4..ebuild
index d337081465e..3e8af8159f5 100644
--- a/app-i18n/fcitx/fcitx-4..ebuild
+++ b/app-i18n/fcitx/fcitx-4..ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
 SLOT="4"
 KEYWORDS=""
-IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls 
opencc +pango static-libs +table test +xkb"
+IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls 
opencc +pango +table test +xkb"
 REQUIRED_USE="cairo? ( X ) pango? ( cairo )"
 RESTRICT="!test? ( test )"
 
@@ -106,7 +106,6 @@ src_configure() {
-DENABLE_QT_GUI=OFF
-DENABLE_QT_IM_MODULE=OFF
-DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo ON; else 
echo OFF; fi)
-   -DENABLE_STATIC=$(usex static-libs ON OFF)
-DENABLE_TABLE=$(usex table ON OFF)
-DENABLE_TEST=$(usex test ON OFF)
-DENABLE_X11=$(usex X ON OFF)



[gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/

2020-11-11 Thread Mike Gilbert
commit: a5c8ff71f0629cbf428cbccf5070ee4b8c6c0159
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Wed Nov 11 04:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Nov 11 20:20:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5c8ff71

app-i18n/fcitx: Version bump (4.2.9.8).

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/fcitx/Manifest  | 1 +
 app-i18n/fcitx/{fcitx-4..ebuild => fcitx-4.2.9.8.ebuild} | 3 ++-
 app-i18n/fcitx/fcitx-4..ebuild   | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index da15628688d..c4a7352eed0 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,5 +1,6 @@
 DIST fcitx-4.2.9.6_dict.tar.xz 8738408 BLAKE2B 
812256657ef8f6648a8a3de4bef4e423288ee3d91d493783eae2cb55b5b5964a791f3317af1aea0d877e01ea06491c34f6c594038d27713be3a6b35c93bc5545
 SHA512 
dc8308d1a4e9b7595da285ca6521f33027f5b8e6968bc28f751bd4f40116166cabbe1c05e29072afbe88473d2a9d6999124476260785e07f62a243df6e896bb0
 DIST fcitx-4.2.9.7_dict.tar.xz 8734508 BLAKE2B 
e8770a3afe902fab11325f345a128156a9e6e8c4f5e712c68a03a12282c0bc6a279968bacdb2129a243967c8fdfc6b7145f5ad13daea5bf0c5fb28332e79437e
 SHA512 
b940478c648e30b2ea55903465ed02c8a0c3ae3539e4bd5b77be46a9e4d0c13ceff074ddd7532f86893111eb96308e1740db621a83fb809e4fd02256d75ebe7b
+DIST fcitx-4.2.9.8_dict.tar.xz 8737888 BLAKE2B 
2de3ccbf1b37a9bcf1a3cb257d7837669e946765722c3d6f442ad071d7d81a6e8178e47051fc3aa53b9b4771d3aca602c2e22fa7a3d117a9e1f2779497e02c52
 SHA512 
50a954c3178f53fd2d441cdaf81fb44a7fe8dfb263fa6d8dd4ee4884fc7ae8321880c726c9366d11e2a4ac8da2233268d06e5d0800d4527ba0bdb1a1430248ed
 DIST fcitx-data-en_dict-20121020.tar.gz 630491 BLAKE2B 
2df897b1c9fb3a2ce186ee590e5f3ccbc7930f047218bf0fefa317f74b3287fc0be9c393d3310fe07208379118ec4c46608a1c703ef37b3aee65b2d790cb7f0d
 SHA512 
8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
 DIST fcitx-data-pinyin.tar.gz 1608886 BLAKE2B 
3b7e72559bb838b4f2245e6faf2d627df17e9383ef8fe382e10333c1a95d79409ec042caa7d77c9bcd956b1c5d5456dab9d82208cd89d90e2be759c76f56f3d1
 SHA512 
1ee19eed3ee58be6cd6562ec363fe3bf630fff5e8820b3bfdd6d4618fceb082695e888dec5366a3685d58706f720e19319d891c223227237aed12674ea982131
 DIST fcitx-data-py_stroke-20121124.tar.gz 445601 BLAKE2B 
43b29b30da11b18196918e4df847406871eff75595b62608ad86b0ef6de83ec5e1b722645cabb809281075b393b5970e4d9580594caa73060c866c2d3cd988e7
 SHA512 
d80ff9a3549e07c7a6935e686785f9a076c58f1a782a832ae28ee65e2a213d67f089f450ce09bed87ec2a141c32b9c1fcb83c221ddcab436858fa9009f161fb3

diff --git a/app-i18n/fcitx/fcitx-4..ebuild 
b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild
similarity index 97%
copy from app-i18n/fcitx/fcitx-4..ebuild
copy to app-i18n/fcitx/fcitx-4.2.9.8.ebuild
index 3e8af8159f5..6c50695a891 100644
--- a/app-i18n/fcitx/fcitx-4..ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild
@@ -23,9 +23,10 @@ else
SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz;
 fi
 
+# LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT qt4? ( BSD )"
 LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
 SLOT="4"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls 
opencc +pango +table test +xkb"
 REQUIRED_USE="cairo? ( X ) pango? ( cairo )"
 RESTRICT="!test? ( test )"

diff --git a/app-i18n/fcitx/fcitx-4..ebuild 
b/app-i18n/fcitx/fcitx-4..ebuild
index 3e8af8159f5..bd7bc5be794 100644
--- a/app-i18n/fcitx/fcitx-4..ebuild
+++ b/app-i18n/fcitx/fcitx-4..ebuild
@@ -23,6 +23,7 @@ else
SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz;
 fi
 
+# LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT qt4? ( BSD )"
 LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
 SLOT="4"
 KEYWORDS=""



[gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/files/, app-i18n/fcitx-anthy/, app-i18n/fcitx/

2020-11-11 Thread Mike Gilbert
commit: 2d4aa3a4c3af23a6fbfc2b7550527e015c73a302
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Wed Nov 11 01:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Nov 11 20:20:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d4aa3a4

app-i18n/fcitx: Rename "xml" USE flag to "xkb".

https://github.com/fcitx/fcitx/commit/00a6bb364c3c24e6361faab8a6b31025e55067fa

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild  |  2 +-
 app-i18n/fcitx-anthy/fcitx-anthy-4..ebuild |  2 +-
 app-i18n/fcitx/fcitx-4.2.9.6.ebuild|  8 +++
 app-i18n/fcitx/fcitx-4..ebuild | 23 --
 app-i18n/fcitx/files/fcitx-4.2.9.8-xkb.patch   | 32 ++
 app-i18n/fcitx/metadata.xml|  1 +
 6 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild 
b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
index 9149d9e377b..fc844ebde29 100644
--- a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
+++ b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
@@ -25,7 +25,7 @@ KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 BDEPEND="virtual/pkgconfig"
-DEPEND=">=app-i18n/fcitx-4.2.9:4[X,xml]
+DEPEND=">=app-i18n/fcitx-4.2.9:4[X,xkb]
app-i18n/anthy:=
virtual/libintl"
 RDEPEND="${DEPEND}"

diff --git a/app-i18n/fcitx-anthy/fcitx-anthy-4..ebuild 
b/app-i18n/fcitx-anthy/fcitx-anthy-4..ebuild
index c28c3f4bd68..229e8d76dc4 100644
--- a/app-i18n/fcitx-anthy/fcitx-anthy-4..ebuild
+++ b/app-i18n/fcitx-anthy/fcitx-anthy-4..ebuild
@@ -25,7 +25,7 @@ KEYWORDS=""
 IUSE=""
 
 BDEPEND="virtual/pkgconfig"
-DEPEND=">=app-i18n/fcitx-4.2.9:4[X,xml]
+DEPEND=">=app-i18n/fcitx-4.2.9:4[X,xkb]
app-i18n/anthy:=
virtual/libintl"
 RDEPEND="${DEPEND}"

diff --git a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild 
b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
index abf4e1cbdb6..43274c9346b 100644
--- a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
 SLOT="4"
 KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 x86"
-IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls 
opencc +pango static-libs +table test +xml"
+IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls 
opencc +pango static-libs +table test +xkb"
 REQUIRED_USE="cairo? ( X ) pango? ( cairo )"
 RESTRICT="!test? ( test )"
 
@@ -46,7 +46,7 @@ DEPEND="dev-libs/glib:2
x11-libs/libXfixes
x11-libs/libXinerama
x11-libs/libXrender
-   xml? (
+   xkb? (
x11-libs/libxkbfile
x11-misc/xkeyboard-config
)
@@ -63,7 +63,7 @@ DEPEND="dev-libs/glib:2
lua? ( dev-lang/lua:= )
nls? ( sys-devel/gettext )
opencc? ( app-i18n/opencc:0= )
-   xml? (
+   xkb? (
app-text/iso-codes
dev-libs/libxml2
)"
@@ -102,7 +102,7 @@ src_configure() {
-DENABLE_GIR=$(usex introspection ON OFF)
-DENABLE_GTK2_IM_MODULE=$(usex gtk2 ON OFF)
-DENABLE_GTK3_IM_MODULE=$(usex gtk3 ON OFF)
-   -DENABLE_LIBXML2=$(usex xml ON OFF)
+   -DENABLE_LIBXML2=$(usex xkb ON OFF)
-DENABLE_LUA=$(usex lua ON OFF)
-DENABLE_OPENCC=$(usex opencc ON OFF)
-DENABLE_PANGO=$(usex pango ON OFF)

diff --git a/app-i18n/fcitx/fcitx-4..ebuild 
b/app-i18n/fcitx/fcitx-4..ebuild
index 53d5b963fa2..d337081465e 100644
--- a/app-i18n/fcitx/fcitx-4..ebuild
+++ b/app-i18n/fcitx/fcitx-4..ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
 SLOT="4"
 KEYWORDS=""
-IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls 
opencc +pango static-libs +table test +xml"
+IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls 
opencc +pango static-libs +table test +xkb"
 REQUIRED_USE="cairo? ( X ) pango? ( cairo )"
 RESTRICT="!test? ( test )"
 
@@ -46,7 +46,8 @@ DEPEND="dev-libs/glib:2
x11-libs/libXfixes
x11-libs/libXinerama
x11-libs/libXrender
-   xml? (
+   xkb? (
+   dev-libs/libxml2
x11-libs/libxkbfile
x11-misc/xkeyboard-config
)
@@ -63,12 +64,16 @@ DEPEND="dev-libs/glib:2
lua? ( dev-lang/lua:= )

[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/

2020-11-11 Thread Mike Gilbert
commit: 3a1b3f9e7a7bd8756cbdc23f72c8fa3a58164a2a
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Nov 11 16:43:39 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Nov 11 16:44:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a1b3f9e

net-vpn/openconnect: restore ~arm keyword

Closes: https://bugs.gentoo.org/754054
Signed-off-by: Mike Gilbert  gentoo.org>

 net-vpn/openconnect/openconnect-8.09-r3.ebuild | 2 +-
 net-vpn/openconnect/openconnect-8.10.ebuild| 2 +-
 net-vpn/openconnect/openconnect-.ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-vpn/openconnect/openconnect-8.09-r3.ebuild 
b/net-vpn/openconnect/openconnect-8.09-r3.ebuild
index 7464150026a..3c176005f79 100644
--- a/net-vpn/openconnect/openconnect-8.09-r3.ebuild
+++ b/net-vpn/openconnect/openconnect-8.09-r3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} ==  ]]; then
inherit git-r3 autotools
 else
ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz;
-   KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 VPNC_VER=20200226
 SRC_URI="${ARCHIVE_URI}

diff --git a/net-vpn/openconnect/openconnect-8.10.ebuild 
b/net-vpn/openconnect/openconnect-8.10.ebuild
index 65991f594ed..0b5bc45bd93 100644
--- a/net-vpn/openconnect/openconnect-8.10.ebuild
+++ b/net-vpn/openconnect/openconnect-8.10.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} ==  ]]; then
inherit git-r3 autotools
 else
ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz;
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 VPNC_VER=20200930
 SRC_URI="${ARCHIVE_URI}

diff --git a/net-vpn/openconnect/openconnect-.ebuild 
b/net-vpn/openconnect/openconnect-.ebuild
index fbf9771f48a..3932a14244b 100644
--- a/net-vpn/openconnect/openconnect-.ebuild
+++ b/net-vpn/openconnect/openconnect-.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} ==  ]]; then
inherit git-r3 autotools
 else
ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz;
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 VPNC_VER=20200226
 SRC_URI="${ARCHIVE_URI}



[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/

2020-11-11 Thread Mike Gilbert
commit: 2817623cb1cb8cbdf15e5a2af817643b6c62bccf
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Nov 11 16:21:15 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Nov 11 16:33:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2817623c

net-vpn/openconnect: update live ebuild

Signed-off-by: Mike Gilbert  gentoo.org>

 net-vpn/openconnect/openconnect-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-vpn/openconnect/openconnect-.ebuild 
b/net-vpn/openconnect/openconnect-.ebuild
index d341fc87dca..bfa4550fcf4 100644
--- a/net-vpn/openconnect/openconnect-.ebuild
+++ b/net-vpn/openconnect/openconnect-.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} ==  ]]; then
inherit git-r3 autotools
 else
ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz;
-   KEYWORDS="~amd64 ~ppc64"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 VPNC_VER=20200226
 SRC_URI="${ARCHIVE_URI}



[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/

2020-11-11 Thread Mike Gilbert
commit: 3be73268640d330e224c1474a9fdc0c805037bc7
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Nov 11 16:13:14 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Nov 11 16:33:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3be73268

net-vpn/openconnect: add deps on libtasn1 and tpm2-tss

Closes: https://bugs.gentoo.org/753997
Signed-off-by: Mike Gilbert  gentoo.org>

 .../{openconnect-.ebuild => openconnect-8.09-r2.ebuild}| 7 ++-
 net-vpn/openconnect/openconnect-.ebuild| 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/net-vpn/openconnect/openconnect-.ebuild 
b/net-vpn/openconnect/openconnect-8.09-r2.ebuild
similarity index 95%
copy from net-vpn/openconnect/openconnect-.ebuild
copy to net-vpn/openconnect/openconnect-8.09-r2.ebuild
index bfa4550fcf4..985cc817bf1 100644
--- a/net-vpn/openconnect/openconnect-.ebuild
+++ b/net-vpn/openconnect/openconnect-8.09-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} ==  ]]; then
inherit git-r3 autotools
 else
ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz;
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+   KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
 VPNC_VER=20200226
 SRC_URI="${ARCHIVE_URI}
@@ -38,6 +38,8 @@ DEPEND="
app-misc/ca-certificates
dev-libs/nettle
>=net-libs/gnutls-3.6.13:0=[static-libs?]
+   dev-libs/libtasn1:0=
+   app-crypt/tpm2-tss
)
gssapi? ( virtual/krb5 )
libproxy? ( net-libs/libproxy )
@@ -78,6 +80,9 @@ src_unpack() {
 }
 
 src_prepare() {
+   local PATCHES=(
+   "${FILESDIR}"/8.09-gnutls-buffer-overflow.patch
+   )
default
if [[ ${PV} ==  ]]; then
eautoreconf

diff --git a/net-vpn/openconnect/openconnect-.ebuild 
b/net-vpn/openconnect/openconnect-.ebuild
index bfa4550fcf4..7832aecdb02 100644
--- a/net-vpn/openconnect/openconnect-.ebuild
+++ b/net-vpn/openconnect/openconnect-.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} ==  ]]; then
inherit git-r3 autotools
 else
ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz;
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 VPNC_VER=20200226
 SRC_URI="${ARCHIVE_URI}
@@ -38,6 +38,8 @@ DEPEND="
app-misc/ca-certificates
dev-libs/nettle
>=net-libs/gnutls-3.6.13:0=[static-libs?]
+   dev-libs/libtasn1:0=
+   app-crypt/tpm2-tss
)
gssapi? ( virtual/krb5 )
libproxy? ( net-libs/libproxy )



[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/

2020-11-11 Thread Mike Gilbert
commit: ed3d939d22c927d0903394d810e308bf7ae9493f
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Nov 11 16:27:52 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Nov 11 16:33:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed3d939d

net-vpn/openconnect: bump to 8.10

Signed-off-by: Mike Gilbert  gentoo.org>

 net-vpn/openconnect/Manifest|   2 +
 net-vpn/openconnect/openconnect-8.10.ebuild | 149 
 2 files changed, 151 insertions(+)

diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest
index 1f8eb6c02ab..59221ffa774 100644
--- a/net-vpn/openconnect/Manifest
+++ b/net-vpn/openconnect/Manifest
@@ -1,2 +1,4 @@
 DIST openconnect-8.09.tar.gz 2083279 BLAKE2B 
4588c693a7a641faad271b034e8713f00fda04a872641e45a8ce3e1a236b8d2f4e1b8d973d20e7a9fc656f9460a0e990cbaada008d4ecf9a46353f20c25ac87a
 SHA512 
f6890f5bce4b36b162e4590bce8a61d65fc0ae803d62a3dd408fbb13e96ce41b6443740132808491093032545aea919f9076e34bc11160c503c5e3c46457e7bd
+DIST openconnect-8.10.tar.gz 2084534 BLAKE2B 
98ad0e24e09bc565f359139540f60eb9b6b5ed2239a9c46c56889b8554fc3de3605c10f1bb4fa0b0b206ba35404ae90a389ab8dcee54cf05a24d984529d24c2a
 SHA512 
a36a106cf5c637602fc5bd3cd12df8f6dfe55217c1aae93c66ca33208507f3f8cda15e3a46d75615c7fcea1859d1a04017a07674ad0246876154467305477356
 DIST vpnc-scripts-20200226.tar.gz 21460 BLAKE2B 
8f00ce3dc49725758abce27f3688946df1bbd4e92769ef02aa9ee66db8b9f41bef3442eaa5405ab1467476899c6d364dfea898ed924ca83497823a85515d48e5
 SHA512 
3a1eac4ccfaefb0f837189c8cef696b33ab8b8a68cb50a3ad29206b708d0aa479e8eed0c09bef6f60d056cd98d63cc898a1609d734030a63df3be2cfa6c00f9a
+DIST vpnc-scripts-20200930.tar.gz 22305 BLAKE2B 
5db809ef674cb3cb8f1c775adc1e83debbda28fdcf47e0b0527efe6d1cea09781ef02b2827d9704140b884a85e7ec51fba497f47f6793520b471a7bba0dde6b6
 SHA512 
5f42bc7b168b5fdfc3ebd4bae52a42a654f102982852cc74240972e16e77fe0b54d82175e2a067e1d7e408bd14c3f465f7eb82b23b41885cb25a813d9587fd3d

diff --git a/net-vpn/openconnect/openconnect-8.10.ebuild 
b/net-vpn/openconnect/openconnect-8.10.ebuild
new file mode 100644
index 000..65991f594ed
--- /dev/null
+++ b/net-vpn/openconnect/openconnect-8.10.ebuild
@@ -0,0 +1,149 @@
+# Copyright 2011-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
+PYTHON_REQ_USE="xml"
+
+inherit linux-info python-any-r1
+
+if [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git;
+   inherit git-r3 autotools
+else
+   ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz;
+   KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+VPNC_VER=20200930
+SRC_URI="${ARCHIVE_URI}
+   
ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz;
+
+DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
+HOMEPAGE="http://www.infradead.org/openconnect.html;
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5"
+IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard stoken test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   dev-libs/libxml2
+   sys-libs/zlib
+   !gnutls? (
+   >=dev-libs/openssl-1.0.1h:0=
+   )
+   gnutls? (
+   app-crypt/trousers
+   app-misc/ca-certificates
+   dev-libs/nettle
+   >=net-libs/gnutls-3.6.13:0=
+   dev-libs/libtasn1:0=
+   app-crypt/tpm2-tss
+   )
+   gssapi? ( virtual/krb5 )
+   libproxy? ( net-libs/libproxy )
+   lz4? ( app-arch/lz4:= )
+   nls? ( virtual/libintl )
+   smartcard? ( sys-apps/pcsc-lite:0= )
+   stoken? ( app-crypt/stoken )
+"
+RDEPEND="${DEPEND}
+   sys-apps/iproute2
+"
+BDEPEND="
+   virtual/pkgconfig
+   doc? ( ${PYTHON_DEPS} sys-apps/groff )
+   nls? ( sys-devel/gettext )
+   test? (
+   net-libs/socket_wrapper
+   net-vpn/ocserv
+   sys-libs/uid_wrapper
+   )
+"
+
+CONFIG_CHECK="~TUN"
+
+pkg_pretend() {
+   check_extra_config
+}
+
+pkg_setup() {
+   :
+}
+
+src_unpack() {
+   if [[ ${PV} ==  ]]; then
+   git-r3_src_unpack
+   fi
+   default
+}
+
+src_prepare() {
+   default
+   if [[ ${PV} ==  ]]; then
+   eautoreconf
+   fi
+}
+
+src_configure() {
+   if use doc; then
+   python_setup
+   else
+   export ac_cv_path_PYTHON=
+   fi
+
+   # Used by tests if userpriv is disabled
+   addwrite /run/netns
+
+   local myconf=(
+   --disable-dsa-tests
+   $(use_enable nls)
+   --disable-static
+   $(use_with !gnutls openssl)
+   $(use_with gnutls)
+   $(use_with libproxy)
+   $(use_with lz4)
+

[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/

2020-11-11 Thread Mike Gilbert
commit: fb2c5eceda966c9ec3c7d8ea035df2c82edc4b0d
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Nov 11 16:15:31 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Nov 11 16:33:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb2c5ece

net-vpn/openconnect: drop static-libs

Signed-off-by: Mike Gilbert  gentoo.org>

 .../{openconnect-8.09-r2.ebuild => openconnect-8.09-r3.ebuild}| 8 
 net-vpn/openconnect/openconnect-.ebuild   | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net-vpn/openconnect/openconnect-8.09-r2.ebuild 
b/net-vpn/openconnect/openconnect-8.09-r3.ebuild
similarity index 93%
rename from net-vpn/openconnect/openconnect-8.09-r2.ebuild
rename to net-vpn/openconnect/openconnect-8.09-r3.ebuild
index 985cc817bf1..7464150026a 100644
--- a/net-vpn/openconnect/openconnect-8.09-r2.ebuild
+++ b/net-vpn/openconnect/openconnect-8.09-r3.ebuild
@@ -24,20 +24,20 @@ HOMEPAGE="http://www.infradead.org/openconnect.html;
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5"
-IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken test"
+IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard stoken test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
dev-libs/libxml2
sys-libs/zlib
!gnutls? (
-   >=dev-libs/openssl-1.0.1h:0=[static-libs?]
+   >=dev-libs/openssl-1.0.1h:0=
)
gnutls? (
app-crypt/trousers
app-misc/ca-certificates
dev-libs/nettle
-   >=net-libs/gnutls-3.6.13:0=[static-libs?]
+   >=net-libs/gnutls-3.6.13:0=
dev-libs/libtasn1:0=
app-crypt/tpm2-tss
)
@@ -102,7 +102,7 @@ src_configure() {
local myconf=(
--disable-dsa-tests
$(use_enable nls)
-   $(use_enable static-libs static)
+   --disable-static
$(use_with !gnutls openssl)
$(use_with gnutls)
$(use_with libproxy)

diff --git a/net-vpn/openconnect/openconnect-.ebuild 
b/net-vpn/openconnect/openconnect-.ebuild
index 7832aecdb02..fbf9771f48a 100644
--- a/net-vpn/openconnect/openconnect-.ebuild
+++ b/net-vpn/openconnect/openconnect-.ebuild
@@ -24,20 +24,20 @@ HOMEPAGE="http://www.infradead.org/openconnect.html;
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5"
-IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken test"
+IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard stoken test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
dev-libs/libxml2
sys-libs/zlib
!gnutls? (
-   >=dev-libs/openssl-1.0.1h:0=[static-libs?]
+   >=dev-libs/openssl-1.0.1h:0=
)
gnutls? (
app-crypt/trousers
app-misc/ca-certificates
dev-libs/nettle
-   >=net-libs/gnutls-3.6.13:0=[static-libs?]
+   >=net-libs/gnutls-3.6.13:0=
dev-libs/libtasn1:0=
app-crypt/tpm2-tss
)
@@ -99,7 +99,7 @@ src_configure() {
local myconf=(
--disable-dsa-tests
$(use_enable nls)
-   $(use_enable static-libs static)
+   --disable-static
$(use_with !gnutls openssl)
$(use_with gnutls)
$(use_with libproxy)



[gentoo-commits] repo/gentoo:master commit in: media-gfx/fontforge/

2020-11-10 Thread Mike Gilbert
commit: ef20d41edfc8fb484e1d791318496e7b3abb4697
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Nov 10 20:42:27 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Nov 10 20:42:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef20d41e

media-gfx/fontforge: remove myself from maintainers

Signed-off-by: Mike Gilbert  gentoo.org>

 media-gfx/fontforge/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/media-gfx/fontforge/metadata.xml b/media-gfx/fontforge/metadata.xml
index b37524e7333..c14fd11b9ea 100644
--- a/media-gfx/fontforge/metadata.xml
+++ b/media-gfx/fontforge/metadata.xml
@@ -1,10 +1,6 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   flop...@gentoo.org
-       Mike Gilbert
-   

fo...@gentoo.org
Fonts



[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/

2020-11-10 Thread Mike Gilbert
commit: f0d5c947f4d53e8e2ec1762ff20c23328362a943
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Nov  9 20:13:29 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Nov 10 19:15:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0d5c947

sys-libs/glibc: move local-archive to /usr/lib/locale

Closes: https://bugs.gentoo.org/753740
Signed-off-by: Mike Gilbert  gentoo.org>

 .../{glibc-.ebuild => glibc-2.32-r3.ebuild}| 59 --
 sys-libs/glibc/glibc-.ebuild   | 32 +---
 2 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/sys-libs/glibc/glibc-.ebuild 
b/sys-libs/glibc/glibc-2.32-r3.ebuild
similarity index 97%
copy from sys-libs/glibc/glibc-.ebuild
copy to sys-libs/glibc/glibc-2.32-r3.ebuild
index ade64de2bd4..bbb7b0dfa30 100644
--- a/sys-libs/glibc/glibc-.ebuild
+++ b/sys-libs/glibc/glibc-2.32-r3.ebuild
@@ -16,16 +16,16 @@ SLOT="2.2"
 EMULTILIB_PKG="true"
 
 # Gentoo patchset (ignored for live ebuilds)
-PATCH_VER=16
-PATCH_DEV=slyfox
+PATCH_VER=2
+PATCH_DEV=dilfridge
 
 if [[ ${PV} == * ]]; then
inherit git-r3
 else
-   #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
-   KEYWORDS=""
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
SRC_URI+=" 
https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz;
+   SRC_URI+=" riscv? ( 
https://dev.gentoo.org/~dilfridge/distfiles/backport-rv32.txz )"
 fi
 
 RELEASE_VER=${PV}
@@ -133,13 +133,13 @@ RESTRICT="!test? ( test )"
 
 if [[ ${CATEGORY} == cross-* ]] ; then
BDEPEND+=" !headers-only? (
-   >=${CATEGORY}/binutils-2.27
+   >=${CATEGORY}/binutils-2.24
>=${CATEGORY}/gcc-6
)"
[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
 else
BDEPEND+="
-   >=sys-devel/binutils-2.27
+   >=sys-devel/binutils-2.24
>=sys-devel/gcc-6
"
DEPEND+=" virtual/os-headers "
@@ -765,6 +765,7 @@ src_unpack() {
 
cd "${WORKDIR}" || die
unpack locale-gen-${LOCALE_GEN_VER}.tar.gz
+   use riscv && unpack backport-rv32.txz
 }
 
 src_prepare() {
@@ -778,6 +779,12 @@ src_prepare() {
elog "Applying Gentoo Glibc Patchset ${patchsetname}"
eapply "${WORKDIR}"/patches
einfo "Done."
+
+   if use riscv ; then
+   elog "Adding rv32 backport patchset for glibc-2.32 
(experimental)"
+   eapply "${WORKDIR}"/backport-rv32
+   einfo "Done."
+   fi
fi
 
default
@@ -863,6 +870,14 @@ glibc_do_configure() {
# https://sourceware.org/PR24202
myconf+=( --enable-stack-protector=no )
;;
+   powerpc-*)
+   # Currently gcc on powerpc32 generates invalid code for
+   # __builtin_return_address(0) calls. Normally programs
+   # don't do that but malloc hooks in glibc do:
+   # https://gcc.gnu.org/PR81996
+   # https://bugs.gentoo.org/629054
+   myconf+=( --enable-stack-protector=no )
+   ;;
*)
# Use '=strong' instead of '=all' to protect only 
functions
# worth protecting from stack smashes.
@@ -943,6 +958,11 @@ glibc_do_configure() {
$(use_enable static-pie)
$(use_enable systemtap)
$(use_enable nscd)
+
+   # locale data is arch-independent
+   # https://bugs.gentoo.org/753740
+   libc_cv_complocaledir='${exec_prefix}/lib/locale'
+
${EXTRA_ECONF}
)
 
@@ -1328,26 +1348,7 @@ glibc_do_src_install() {
insinto /etc
doins locale.gen
 
-   # Make sure all the ABI's can find the locales and so we only
-   # have to generate one set
-   local a
-   keepdir /usr/$(get_libdir)/locale
-   for a in $(get_install_abis) ; do
-   if [[ ! -e ${ED}/usr/$(get_abi_LIBDIR ${a})/locale ]] ; then
-   dosym ../$(get_libdir)/locale /usr/$(get_abi_LIBDIR 
${a})/locale
-   fi
-   done
-
-   # HACK: If we're building for riscv, we need to additionally make sure 
that
-   # we can find the locale archive afterwards
-   case ${CTARGET} in
-   riscv*)
-  

[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/, sys-apps/systemd/files/

2020-11-08 Thread Mike Gilbert
commit: e25dac18a28a39570cbd3bc258be1b573c8fa9dc
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Nov  8 17:50:35 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Sun Nov  8 17:50:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e25dac18

sys-apps/systemd: bump to 247-rc1

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/systemd/Manifest  |  1 +
 .../gentoo-systemctl-disable-sysv-sync-r1.patch| 25 ++
 ...{systemd-.ebuild => systemd-247_rc1.ebuild} |  2 +-
 sys-apps/systemd/systemd-.ebuild   |  2 +-
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 470a6c699a3..530182fc3ff 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,2 +1,3 @@
 DIST systemd-246.tar.gz 9534036 BLAKE2B 
71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0
 SHA512 
7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
+DIST systemd-247-rc1.tar.gz 9838448 BLAKE2B 
99eeafb9ef35d7786f39e8089820ea7b838e06b7ad74271a193c27e716275cb96e0cfe213fa546abc304978fdf95be37e23f31c2059aa6aff28739979a1a036d
 SHA512 
5c04b013ceebbf466c917d093189a60a2a77c57a844eed840c911669855d4d9d783dcaec1ba6b488c5e96e7f9a9f3d4e39cff240c46c013ec2fcce5a5b7c4aee
 DIST systemd-stable-246.6.tar.gz 9545237 BLAKE2B 
5290736b30ca1a3188335a74d49b4f3e8b48007d9563efac1985ea6428a8b8fd6cad7ae87c35e13a32f851ebd27821829738274d35cfbff9340750bd3b086621
 SHA512 
1936b291d9831cf61f800fe718a4c2c2fe9b2a11fd817fe32bd48da2087a675dfc91013209a3478ea52e8ada593300ed906e248b8081dcf9141bf1cc17483ea9

diff --git a/sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync-r1.patch 
b/sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync-r1.patch
new file mode 100644
index 000..a9d40be4ab7
--- /dev/null
+++ b/sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync-r1.patch
@@ -0,0 +1,25 @@
+From d9059d2ef1b0d6034267cc8ff44871d0f82f840f Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Sun, 8 Nov 2020 12:34:11 -0500
+Subject: [PATCH] systemctl: disable synchronizaion of sysv init scripts
+
+---
+ src/systemctl/systemctl-sysv-compat.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/systemctl/systemctl-sysv-compat.c 
b/src/systemctl/systemctl-sysv-compat.c
+index 2dca9e480f..5dcf13ba17 100644
+--- a/src/systemctl/systemctl-sysv-compat.c
 b/src/systemctl/systemctl-sysv-compat.c
+@@ -111,7 +111,7 @@ int parse_shutdown_time_spec(const char *t, usec_t *ret) {
+ int enable_sysv_units(const char *verb, char **args) {
+ int r = 0;
+ 
+-#if HAVE_SYSV_COMPAT
++#if 0
+ _cleanup_(lookup_paths_free) LookupPaths paths = {};
+ unsigned f = 0;
+ 
+-- 
+2.29.0
+

diff --git a/sys-apps/systemd/systemd-.ebuild 
b/sys-apps/systemd/systemd-247_rc1.ebuild
similarity index 99%
copy from sys-apps/systemd/systemd-.ebuild
copy to sys-apps/systemd/systemd-247_rc1.ebuild
index 4c0c3699148..016f308320d 100644
--- a/sys-apps/systemd/systemd-.ebuild
+++ b/sys-apps/systemd/systemd-247_rc1.ebuild
@@ -208,7 +208,7 @@ src_prepare() {
if ! use vanilla; then
PATCHES+=(
"${FILESDIR}/gentoo-generator-path-r2.patch"
-   "${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch"
+   
"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
"${FILESDIR}/gentoo-journald-audit.patch"
"${FILESDIR}/gentoo-pam.patch"
)

diff --git a/sys-apps/systemd/systemd-.ebuild 
b/sys-apps/systemd/systemd-.ebuild
index 4c0c3699148..016f308320d 100644
--- a/sys-apps/systemd/systemd-.ebuild
+++ b/sys-apps/systemd/systemd-.ebuild
@@ -208,7 +208,7 @@ src_prepare() {
if ! use vanilla; then
PATCHES+=(
"${FILESDIR}/gentoo-generator-path-r2.patch"
-   "${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch"
+   
"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
"${FILESDIR}/gentoo-journald-audit.patch"
"${FILESDIR}/gentoo-pam.patch"
)



[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/

2020-11-06 Thread Mike Gilbert
commit: b1d47ca57faef307d738f83004fc27b32e252b93
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Nov  6 16:13:14 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Fri Nov  6 16:13:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1d47ca5

sys-boot/grub: apply libzfs slot-operator to all ebuilds

Bug: https://bugs.gentoo.org/753245
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-boot/grub/{grub-2.04-r1.ebuild => grub-2.04-r2.ebuild}  | 2 +-
 ...grub-2.05_alpha20200310.ebuild => grub-2.05_alpha20200310-r1.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-boot/grub/grub-2.04-r1.ebuild 
b/sys-boot/grub/grub-2.04-r2.ebuild
similarity index 99%
rename from sys-boot/grub/grub-2.04-r1.ebuild
rename to sys-boot/grub/grub-2.04-r2.ebuild
index d0feaf3be6a..e68f15c3a27 100644
--- a/sys-boot/grub/grub-2.04-r1.ebuild
+++ b/sys-boot/grub/grub-2.04-r2.ebuild
@@ -100,7 +100,7 @@ DEPEND="
sdl? ( media-libs/libsdl )
)
device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-   libzfs? ( sys-fs/zfs )
+   libzfs? ( sys-fs/zfs:= )
mount? ( sys-fs/fuse:0 )
truetype? ( media-libs/freetype:2= )
ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )

diff --git a/sys-boot/grub/grub-2.05_alpha20200310.ebuild 
b/sys-boot/grub/grub-2.05_alpha20200310-r1.ebuild
similarity index 99%
rename from sys-boot/grub/grub-2.05_alpha20200310.ebuild
rename to sys-boot/grub/grub-2.05_alpha20200310-r1.ebuild
index 89d3dd60234..c10aa3ca032 100644
--- a/sys-boot/grub/grub-2.05_alpha20200310.ebuild
+++ b/sys-boot/grub/grub-2.05_alpha20200310-r1.ebuild
@@ -91,7 +91,7 @@ DEPEND="
sdl? ( media-libs/libsdl )
)
device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-   libzfs? ( sys-fs/zfs )
+   libzfs? ( sys-fs/zfs:= )
mount? ( sys-fs/fuse:0 )
truetype? ( media-libs/freetype:2= )
ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )



[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/

2020-11-05 Thread Mike Gilbert
commit: 466c34fd3e7836a9b180dcf320023596a1df0567
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Nov  5 18:38:01 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Thu Nov  5 18:38:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=466c34fd

net-misc/openssh: disable utmp and wtmp on musl

Closes: https://bugs.gentoo.org/753230
Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/openssh/openssh-8.4_p1-r2.ebuild | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/net-misc/openssh/openssh-8.4_p1-r2.ebuild 
b/net-misc/openssh/openssh-8.4_p1-r2.ebuild
index 09691782910..4122763052b 100644
--- a/net-misc/openssh/openssh-8.4_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-8.4_p1-r2.ebuild
@@ -320,8 +320,16 @@ src_configure() {
$(use_with !elibc_Cygwin hardening) #659210
)
 
-   # stackprotect is broken on musl x86 and ppc
-   use elibc_musl && ( use x86 || use ppc ) && myconf+=( 
--without-stackprotect )
+   if use elibc_musl; then
+   # stackprotect is broken on musl x86 and ppc
+   if use x86 || use ppc; then
+   myconf+=( --without-stackprotect )
+   fi
+
+   # musl defines bogus values for UTMP_FILE and WTMP_FILE
+   # https://bugs.gentoo.org/753230
+   myconf+=( --disable-utmp --disable-wtmp )
+   fi
 
# The seccomp sandbox is broken on x32, so use the older method for 
now. #553748
use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )



[gentoo-commits] repo/gentoo:master commit in: dev-lua/lutok/

2020-11-04 Thread Mike Gilbert
commit: cfb59fec099f9a978c736939932e9431756b4b35
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Nov  4 17:00:29 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Nov  4 17:00:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfb59fec

dev-lua/lutok: rework LUA_CFLAGS and LUA_LIBS

Signed-off-by: Mike Gilbert  gentoo.org>

 dev-lua/lutok/lutok-0.4-r10.ebuild | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/dev-lua/lutok/lutok-0.4-r10.ebuild 
b/dev-lua/lutok/lutok-0.4-r10.ebuild
index a88f7f0ef0c..378ed963caf 100644
--- a/dev-lua/lutok/lutok-0.4-r10.ebuild
+++ b/dev-lua/lutok/lutok-0.4-r10.ebuild
@@ -33,9 +33,13 @@ pkg_setup() {
 
 src_configure() {
lua_setup
-   lua_get_CFLAGS >/dev/null
-   lua_get_LIBS >/dev/null
-   econf --enable-shared --disable-static
+   local myconf=(
+   --enable-shared
+   --disable-static
+   LUA_CFLAGS="$(lua_get_CFLAGS)"
+   LUA_LIBS="$(lua_get_LIBS)"
+   )
+   econf "${myconf[@]}"
 }
 
 src_install() {



[gentoo-commits] repo/gentoo:master commit in: app-admin/sudo/

2020-11-04 Thread Mike Gilbert
commit: 4781f2f800f253622b5c30bd3bc3b79564ff40b8
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Nov  4 14:01:49 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Nov  4 14:01:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4781f2f8

app-admin/sudo: sync live ebuild

Signed-off-by: Mike Gilbert  gentoo.org>

 app-admin/sudo/sudo-.ebuild | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app-admin/sudo/sudo-.ebuild b/app-admin/sudo/sudo-.ebuild
index 7d0daa6f350..84770ae1b43 100644
--- a/app-admin/sudo/sudo-.ebuild
+++ b/app-admin/sudo/sudo-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit pam multilib libtool tmpfiles
+inherit pam multilib libtool systemd tmpfiles
 
 MY_P="${P/_/}"
 MY_P="${MY_P/beta/b}"
@@ -49,7 +49,7 @@ DEPEND="
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
)
-   sssd? ( sys-auth/sssd[sudo(+)] )
+   sssd? ( sys-auth/sssd[sudo] )
 "
 RDEPEND="
${DEPEND}
@@ -62,13 +62,14 @@ RDEPEND="
 "
 BDEPEND="
sys-devel/bison
+   virtual/pkgconfig
 "
 
 S="${WORKDIR}/${MY_P}"
 
 REQUIRED_USE="
-   pam? ( !skey )
-   skey? ( !pam )
+   ?? ( pam skey )
+   ?? ( gcrypt ssl )
 "
 
 MAKEOPTS+=" SAMPLES="
@@ -198,6 +199,7 @@ src_install() {
fi
 
pamd_mimic system-auth sudo auth account session
+   pamd_mimic system-auth sudo-i auth account session
 
keepdir /var/db/sudo/lectured
fperms 0700 /var/db/sudo/lectured



[gentoo-commits] repo/gentoo:master commit in: app-admin/sudo/

2020-11-04 Thread Mike Gilbert
commit: 2d11a6e55328d3e4fafcf20f949f38d651a83810
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Nov  4 14:00:43 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Wed Nov  4 14:00:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d11a6e5

app-admin/sudo: fix REQUIRED_USE

Consolidate duplicate assignments.
Simplify pam/skey conflict.

Signed-off-by: Mike Gilbert  gentoo.org>

 app-admin/sudo/sudo-1.9.3_p1.ebuild | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app-admin/sudo/sudo-1.9.3_p1.ebuild 
b/app-admin/sudo/sudo-1.9.3_p1.ebuild
index fba1a9ec786..dfa040469e3 100644
--- a/app-admin/sudo/sudo-1.9.3_p1.ebuild
+++ b/app-admin/sudo/sudo-1.9.3_p1.ebuild
@@ -68,12 +68,10 @@ BDEPEND="
 S="${WORKDIR}/${MY_P}"
 
 REQUIRED_USE="
-   pam? ( !skey )
-   skey? ( !pam )
+   ?? ( pam skey )
+   ?? ( gcrypt ssl )
 "
 
-REQUIRED_USE="?? ( gcrypt ssl )"
-
 MAKEOPTS+=" SAMPLES="
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: dev-libs/re2/

2020-11-03 Thread Mike Gilbert
commit: 0714d0e354319b924c14e95fd7db0780bf09550a
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Tue Nov  3 00:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Nov  3 20:19:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0714d0e3

dev-libs/re2: Version bump (0.2020.11.01).

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-libs/re2/Manifest|  1 +
 dev-libs/re2/re2-0.2020.11.01.ebuild | 52 
 2 files changed, 53 insertions(+)

diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index bd7e0b0e7ad..e3dd8f55a17 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,2 +1,3 @@
 DIST re2-2020-08-01.tar.gz 404076 BLAKE2B 
063c3e78cf4983d214309a93a234d864d5ad3acc63ca40befb0b78604ea1406676eb85c34489f3baf74afc0f05ea46482bd7400eb485cd1951feaf4c1429b21c
 SHA512 
1ae261155a1eb96606788eb736faa4dc3240d85f47e3b4c412a4f85f7e4cc69f7c7cbab98397aaf725def1cbc9c5da2c679cfb5573a442d60897740766ae2967
 DIST re2-2020-10-01.tar.gz 403344 BLAKE2B 
163d44991dc80dc04871bc53c64d4eec9f9e8db36b057a44eba3b1f033f0b130d7fccf4ba8aec33cc515ab5b11bd4f5b0343b4381758e8d9446c5017f1f04d14
 SHA512 
cd620878ffa6d4e47f1583f27a179f6520fc1226554bd7c0e104d3d45b2bee70873c0d661e87eb4a9d912b58f86f115766c35d08e124f5f67ddcc3b50535f726
+DIST re2-2020-11-01.tar.gz 402756 BLAKE2B 
4c5bb5d4859f5b822408483a90a37b4f7e18d3ee81ecfe52563b091c0594dc32343257521c53267ff0c4b62a81a58b2231b628915afd94d368aebf13b965921e
 SHA512 
167f21ec5a94640820cc1e2e9f4a4d3819a5e70011d0f8afb3fec3b2f66e21688196cedc66ce785158e49d1a0cb34b5f9ae68729e602e77d1077eadcbca7d7fe

diff --git a/dev-libs/re2/re2-0.2020.11.01.ebuild 
b/dev-libs/re2/re2-0.2020.11.01.ebuild
new file mode 100644
index 000..55f22b8e2cd
--- /dev/null
+++ b/dev-libs/re2/re2-0.2020.11.01.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2012-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+# Different date format used upstream.
+RE2_VER=${PV#0.}
+RE2_VER=${RE2_VER//./-}
+
+DESCRIPTION="An efficient, principled regular expression library"
+HOMEPAGE="https://github.com/google/re2;
+SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> 
re2-${RE2_VER}.tar.gz"
+
+LICENSE="BSD"
+# NOTE: Always run libre2 through abi-compliance-checker!
+# https://abi-laboratory.pro/tracker/timeline/re2/
+SONAME="9"
+SLOT="0/${SONAME}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="icu"
+
+BDEPEND="icu? ( virtual/pkgconfig )"
+DEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/re2-${RE2_VER}"
+
+DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
+HTML_DOCS=( doc/syntax.html )
+
+src_prepare() {
+   default
+   grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
+   if use icu; then
+   sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
+   fi
+   multilib_copy_sources
+}
+
+src_configure() {
+   tc-export AR CXX
+}
+
+multilib_src_compile() {
+   emake SONAME="${SONAME}" shared
+}
+
+multilib_src_install() {
+   emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" 
libdir="\$(exec_prefix)/$(get_libdir)" shared-install
+}



[gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx-hangul/

2020-11-03 Thread Mike Gilbert
commit: 5c7fccf9f00f2b1966da21fd317c2200fd791c23
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Mon Nov  2 04:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Nov  3 20:19:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c7fccf9

app-i18n/fcitx-hangul: Use cmake.eclass.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild  | 2 +-
 app-i18n/fcitx-hangul/fcitx-hangul-4..ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild 
b/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild
index fdbf7d7716b..e203a031e17 100644
--- a/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild
+++ b/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 if [[ "${PV}" =~ (^|\.)$ ]]; then
inherit git-r3

diff --git a/app-i18n/fcitx-hangul/fcitx-hangul-4..ebuild 
b/app-i18n/fcitx-hangul/fcitx-hangul-4..ebuild
index 0c3f83a8582..a8d7517f6eb 100644
--- a/app-i18n/fcitx-hangul/fcitx-hangul-4..ebuild
+++ b/app-i18n/fcitx-hangul/fcitx-hangul-4..ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 if [[ "${PV}" =~ (^|\.)$ ]]; then
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx-configtool/

2020-11-03 Thread Mike Gilbert
commit: 99180cb3e54a0a453ebb25e1e445bde939b1fc32
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Mon Nov  2 03:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Nov  3 20:19:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99180cb3

app-i18n/fcitx-configtool: Use cmake.eclass.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild | 4 ++--
 app-i18n/fcitx-configtool/fcitx-configtool-4..ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild 
b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
index 1f5e7d08ada..f7411584a94 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake-utils
+inherit cmake
 
 if [[ "${PV}" =~ (^|\.)$ ]]; then
inherit git-r3
@@ -40,5 +40,5 @@ src_configure() {
-DENABLE_GTK3=ON
)
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }

diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-4..ebuild 
b/app-i18n/fcitx-configtool/fcitx-configtool-4..ebuild
index 9ef906f089f..e8947d25826 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-4..ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-4..ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake-utils
+inherit cmake
 
 if [[ "${PV}" =~ (^|\.)$ ]]; then
inherit git-r3
@@ -40,5 +40,5 @@ src_configure() {
-DENABLE_GTK3=ON
)
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }



[gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx-anthy/

2020-11-03 Thread Mike Gilbert
commit: 3f7f471748ba4b3866dc53454f037b7bd07e256f
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Mon Nov  2 00:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Nov  3 20:19:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f7f4717

app-i18n/fcitx-anthy: Use cmake.eclass.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild  | 2 +-
 app-i18n/fcitx-anthy/fcitx-anthy-4..ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild 
b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
index 4230b7a7138..9149d9e377b 100644
--- a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
+++ b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 if [[ "${PV}" =~ (^|\.)$ ]]; then
inherit git-r3

diff --git a/app-i18n/fcitx-anthy/fcitx-anthy-4..ebuild 
b/app-i18n/fcitx-anthy/fcitx-anthy-4..ebuild
index 7bdab3f7755..c28c3f4bd68 100644
--- a/app-i18n/fcitx-anthy/fcitx-anthy-4..ebuild
+++ b/app-i18n/fcitx-anthy/fcitx-anthy-4..ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 if [[ "${PV}" =~ (^|\.)$ ]]; then
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-i18n/kcm-fcitx/

2020-11-03 Thread Mike Gilbert
commit: 793e938b2c904637816c631c8969d66f0791c1f0
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Mon Nov  2 06:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Nov  3 20:19:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=793e938b

app-i18n/kcm-fcitx: Use cmake.eclass.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild| 4 ++--
 app-i18n/kcm-fcitx/kcm-fcitx-4.5..ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild 
b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
index c8f903b0e90..8f420c466aa 100644
--- a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake-utils
+inherit cmake
 
 if [[ "${PV}" =~ (^|\.)$ ]]; then
inherit git-r3
@@ -55,5 +55,5 @@ src_configure() {
-DKDE_INSTALL_USE_QT_SYS_PATHS=yes
)
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }

diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-4.5..ebuild 
b/app-i18n/kcm-fcitx/kcm-fcitx-4.5..ebuild
index 5edbbf830dd..9d7e431899a 100644
--- a/app-i18n/kcm-fcitx/kcm-fcitx-4.5..ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-4.5..ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake-utils
+inherit cmake
 
 if [[ "${PV}" =~ (^|\.)$ ]]; then
inherit git-r3
@@ -55,5 +55,5 @@ src_configure() {
-DKDE_INSTALL_USE_QT_SYS_PATHS=yes
)
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }



[gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx-qt5/

2020-11-03 Thread Mike Gilbert
commit: 9935f91b60e5d85162758df5d7c22af380c45b5e
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Mon Nov  2 05:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Nov  3 20:19:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9935f91b

app-i18n/fcitx-qt5: Use cmake.eclass.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild  | 2 +-
 app-i18n/fcitx-qt5/fcitx-qt5-4..ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild 
b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
index 0517f4e0d2d..406a2119dda 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake-utils
+inherit cmake
 
 if [[ "${PV}" =~ (^|\.)$ ]]; then
inherit git-r3

diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-4..ebuild 
b/app-i18n/fcitx-qt5/fcitx-qt5-4..ebuild
index 9c1255da7ca..4b6a0c84a68 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-4..ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-4..ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake-utils
+inherit cmake
 
 if [[ "${PV}" =~ (^|\.)$ ]]; then
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx-chewing/

2020-11-03 Thread Mike Gilbert
commit: 37e876a0a572b182f8bfc5db2c1eec93c1fbfc74
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Mon Nov  2 01:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Nov  3 20:19:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37e876a0

app-i18n/fcitx-chewing: Use cmake.eclass.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild  | 2 +-
 app-i18n/fcitx-chewing/fcitx-chewing-4..ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild 
b/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild
index 5c7b46177e7..62f9a48cb0a 100644
--- a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild
+++ b/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 if [[ "${PV}" =~ (^|\.)$ ]]; then
inherit git-r3

diff --git a/app-i18n/fcitx-chewing/fcitx-chewing-4..ebuild 
b/app-i18n/fcitx-chewing/fcitx-chewing-4..ebuild
index 8b63f929ae4..abf180f4e75 100644
--- a/app-i18n/fcitx-chewing/fcitx-chewing-4..ebuild
+++ b/app-i18n/fcitx-chewing/fcitx-chewing-4..ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 if [[ "${PV}" =~ (^|\.)$ ]]; then
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx-cloudpinyin/

2020-11-03 Thread Mike Gilbert
commit: ee67ad84b3f8ae112da8534f038097332c34737a
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Mon Nov  2 02:00:00 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Nov  3 20:19:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee67ad84

app-i18n/fcitx-cloudpinyin: Use cmake.eclass.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild  | 2 +-
 app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4..ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild 
b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
index 2cf1b903b2d..23e8cb10360 100644
--- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
+++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake-utils
+inherit cmake
 
 if [[ "${PV}" =~ (^|\.)$ ]]; then
inherit git-r3

diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4..ebuild 
b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4..ebuild
index 6a77e0dc682..cdd15de53f0 100644
--- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4..ebuild
+++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4..ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake-utils
+inherit cmake
 
 if [[ "${PV}" =~ (^|\.)$ ]]; then
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: dev-lua/lutok/

2020-11-03 Thread Mike Gilbert
commit: a36867489b61a7146ee641c8e21d32487c557b51
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Nov  3 18:38:07 2020 +
Commit:     Mike Gilbert  gentoo  org>
CommitDate: Tue Nov  3 18:38:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3686748

dev-lua/lutok: drop luajit support due to test failures

Signed-off-by: Mike Gilbert  gentoo.org>

 dev-lua/lutok/lutok-0.4-r10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lua/lutok/lutok-0.4-r10.ebuild 
b/dev-lua/lutok/lutok-0.4-r10.ebuild
index d7b3ce48b51..a88f7f0ef0c 100644
--- a/dev-lua/lutok/lutok-0.4-r10.ebuild
+++ b/dev-lua/lutok/lutok-0.4-r10.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-LUA_COMPAT=( luajit lua5-{1..4} )
+LUA_COMPAT=( lua5-{1..4} )
 
 inherit lua-single
 



  1   2   3   4   5   6   7   8   9   10   >