Commit 73cf654f authored by Liguros - Gitlab CI/CD [develop]'s avatar Liguros - Gitlab CI/CD [develop]
Browse files

updates

merged:

  xor: 3071bfd7fd0587e684f1606b81cceeb2c8555251
  cinnamon: b27bc38bfabe38ea79fafee91ba4545cd88bcaa0
  mate-desktop: 6e86c9bf8da7190d52e76b2a8f54cbfe524fc3ae
  fusion809: 67d2c25bf18af22d7021df2ac8167878613328ef
  steam: d6b161d6c28b026cc993320d43797097fa668746
  go-overlay: 435b13dcc2cdc2dc5b5fee57005d8deb2caa114c
  stefantalpalaru: 05a812d0618eb1ed02a01fec8068cad707507e92
  ports: 5dfb25e198677c1b6c0e734b6c1b3938036608af
  gentoo-libressl: eea877be8b5f120e5ca67b3d0bf34acd908ae960
  gentoo-staging: 3ed67e7fcede7e73830a9b7edcc910d0d46afa2d
  calculatelinux: c1377fb5b39bdf799497f694effd3ef6364ff476
  kit-fixups: 47fe44d990342fd949292326070d9c5b1fdb95a1
parent 78de6ffc
......@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE=""
DEPEND=""
......
DIST borgmatic-1.5.10.tar.gz 71743 BLAKE2B b2b5f9135a15730ca7ddddeaa7f621f82207f1dcf383c3be7459eb39dbffc85a310184a4ddce3fb0bd47aa213cb588eb3f3e2f73418659330a421b7da5b87698 SHA512 52436535810ce42f5ab30ae8a4705005e8c7a5d91d52520aab4160320215196cdc088dfae1a21a0d65d0161fb2bb3c9b984cfe2cb5204f7b9bd0ed27c3a38c5b
DIST borgmatic-1.5.6.tar.gz 70075 BLAKE2B 23e233c7457c25ae5b83571436dcfac4e70bf4c9a9bf9af95b8722533b48fdd82089152da220b7d61a01569233f2aedddf300c3a5ad2c69c631060f0b08e6b59 SHA512 e314fa1f20516dd52f4435c782bf634821a034925c0f11553483a1e55eef5d588e54e7abb1a88d239c1619f291548a5058a8f636d16dd829680089c20c601a79
DIST borgmatic-1.5.8.tar.gz 71078 BLAKE2B 488a2d3a1689d16ac2e4e2e9e0f842fab51322a83b024f5bff742e31290d70e6acb683cfe74cc610b0bf0e3ff9d523bacd7faa309560f2ebb8b5b4820de54119 SHA512 25f38bbd48eb41ded8e315620fdcd929c10b38b89a3fc428db9e0053d4c1c46941962f6693018c5e26aa2187ed20bf366424b1b03f9c61cc56274c7008e824e9
DIST borgmatic-1.5.9.tar.gz 71857 BLAKE2B c30c2629e327168ee81e9ecc26c811c5bab7369063f5711cd79567922f21d4e5c0980fe34021340d94923cea85ab0c307f9f348268c3f2063d084d0360e5fdfa SHA512 a1ea62ffdc1457fc1e7b964a474bc25d2b2d3d153ba2026018d5081011acf8d6d1329a440c2616e201ebf0351bf2f12a1e37ec2477a6f5da44de315ec3bb0c3a
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{5,6,7,8,9} )
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_SETUPTOOLS="rdepend"
inherit distutils-r1 systemd
DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
HOMEPAGE="https://torsion.org/borgmatic/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64"
# borg is called as an external tool, hence no pythonic stuff
RDEPEND="app-backup/borgbackup
$(python_gen_cond_dep '
dev-python/colorama[${PYTHON_USEDEP}]
>=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
<dev-python/ruamel-yaml-0.17.0[${PYTHON_USEDEP}]
')"
BDEPEND="
test? (
$(python_gen_cond_dep '
dev-python/flexmock[${PYTHON_USEDEP}]
')
)"
PATCHES=(
"${FILESDIR}"/${PN}-1.5.1-systemd_service_bin_path.patch
"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
)
distutils_enable_tests pytest
src_prepare() {
distutils-r1_src_prepare
# Unlike the other two test files in integration/commands, which use the
# relevant modules' respective APIs, test_borgmatic.py tries to call the
# 'borgmatic' executable - which by the time we execute src_test will
# not have been created yet. distutils_install_for_testing would likely
# take care of this - but between the aforementioned behaviour inconsistency
# and the fact the only test run from this file as of version 1.5.1 is the
# parsing of contents of 'borgmatic --version', just skip it for now.
rm -f "${S}"/tests/integration/commands/test_borgmatic.py
}
src_install() {
distutils-r1_src_install
systemd_dounit sample/systemd/borgmatic.{service,timer}
keepdir /etc/borgmatic
}
pkg_postinst() {
if [[ -z "${REPLACING_VERSIONS}" ]]; then
elog "To generate a sample configuration file, run:"
elog " generate-borgmatic-config"
fi
elog
elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
}
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{5,6,7,8,9} )
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_SETUPTOOLS="rdepend"
inherit distutils-r1 systemd
DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
HOMEPAGE="https://torsion.org/borgmatic/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
# borg is called as an external tool, hence no pythonic stuff
RDEPEND="app-backup/borgbackup
$(python_gen_cond_dep '
dev-python/colorama[${PYTHON_USEDEP}]
>=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
<dev-python/ruamel-yaml-0.17.0[${PYTHON_USEDEP}]
')"
BDEPEND="
test? (
$(python_gen_cond_dep '
dev-python/flexmock[${PYTHON_USEDEP}]
')
)"
PATCHES=(
"${FILESDIR}"/${PN}-1.5.1-systemd_service_bin_path.patch
"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
)
distutils_enable_tests pytest
src_prepare() {
distutils-r1_src_prepare
# Unlike the other two test files in integration/commands, which use the
# relevant modules' respective APIs, test_borgmatic.py tries to call the
# 'borgmatic' executable - which by the time we execute src_test will
# not have been created yet. distutils_install_for_testing would likely
# take care of this - but between the aforementioned behaviour inconsistency
# and the fact the only test run from this file as of version 1.5.1 is the
# parsing of contents of 'borgmatic --version', just skip it for now.
rm -f "${S}"/tests/integration/commands/test_borgmatic.py
}
src_install() {
distutils-r1_src_install
systemd_dounit sample/systemd/borgmatic.{service,timer}
keepdir /etc/borgmatic
}
pkg_postinst() {
if [[ -z "${REPLACING_VERSIONS}" ]]; then
elog "To generate a sample configuration file, run:"
elog " generate-borgmatic-config"
fi
elog
elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
}
DIST burp-2.2.18.tar.gz 632805 BLAKE2B 6106aa4bd96db035ad5893c2fe314537e620a67519295fdf99efaf2c5a639bedd15b4c8d95caa3daa3072dfac28a1ba7fd7bb4f949d9ea2b70bd13060a22f2c6 SHA512 beb14c61ace6d61b98a10fc4e6709eec9722e28990de862eef6a75984f9fbd0f903c5fe64d20ed84c95528a9889bc22618ba6d2318318cf5d515b35688db0a4d
DIST burp-2.3.30.tar.gz 617064 BLAKE2B 62aa65da16155d2a321d4ef700a83000e9754eeee53ad7605b97c589a09e1168cd4cece3076d2c4660c098967f5b19056875b5aa4f226f135a17965fc099bb44 SHA512 c315c30c064073f864058d1ec9341b6e800964f308fa5ea298759e35a58ff27a198a3b6886cc04692bc259f1cfe5a5e077542fd45d3e89813541af2e4ca03533
DIST burp-2.3.32.tar.gz 617641 BLAKE2B f193b3ed42bb8456fbad72ca5625d4a32b498749d04fc187a87f68e03c1a4131dd8e7276bcd6ded40e551f17c6bda7c12ba538e0dc74a8d750bff91e4e2ae84b SHA512 a7393d5097b03a3684104693620ecc9646caf3f4556201977ea88462700274361b01f1134f9c18368ffec6a31d11b4a9bd9091af7a54ac98dfd724779dab41c6
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools systemd
DESCRIPTION="Network backup and restore client and server for Unix and Windows"
HOMEPAGE="https://burp.grke.org/"
SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="acl ipv6 libressl test xattr"
RESTRICT="!test? ( test )"
CDEPEND=" acct-group/burp
acct-user/burp
dev-libs/uthash
net-libs/librsync
sys-libs/ncurses:0=
sys-libs/zlib
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
acl? ( sys-apps/acl )
xattr? ( sys-apps/attr )"
DEPEND="${CDEPEND}
virtual/pkgconfig
test? ( dev-libs/check )"
RDEPEND="${CDEPEND}
virtual/logger"
PATCHES=(
"${FILESDIR}"/${PN}-2.1.20-no_mkdir_run.patch
"${FILESDIR}"/${PN}-2.1.20-protocol1_by_default.patch
"${FILESDIR}"/${PN}-2.0.54-server_user.patch
)
src_prepare() {
default
eautoreconf
}
src_configure() {
local myeconfargs=(
--localstatedir=/var
--sysconfdir=/etc/burp
--enable-largefile
$(use_enable acl)
$(use_enable ipv6)
$(use_enable xattr)
)
# --runstatedir option will only work from autoconf-2.70 onwards
runstatedir='/run' \
econf "${myeconfargs[@]}"
}
src_install() {
default
keepdir /var/spool/burp
fowners -R root:${PN} /var/spool/burp
fperms 0770 /var/spool/burp
emake DESTDIR="${D}" install-configs
fowners -R root:${PN} /etc/burp
fperms 0750 /etc/burp
fperms 0640 /etc/burp/burp-server.conf
fperms 0750 /etc/burp/clientconfdir
newinitd "${FILESDIR}"/${PN}.initd ${PN}
systemd_dounit "${FILESDIR}"/${PN}.service
}
pkg_postinst() {
ewarn
ewarn "You are installing a development version of burp. These versions contain"
ewarn "new features but might have unexpected issues. It is recommended by upstream"
ewarn "to use the current stable version (i.e. currently the 2.2 branch) instead."
ewarn
elog "Burp ebuilds now support the autoupgrade mechanism in both"
elog "client and server mode. In both cases it is disabled by"
elog "default. You almost certainly do NOT want to enable it in"
elog "client mode because upgrades obtained this way will not be"
elog "managed by Portage."
if [[ ! -e /etc/burp/CA/index.txt ]]; then
elog ""
elog "At first run burp server will generate DH parameters and SSL"
elog "certificates. You should adjust configuration before."
elog "Server configuration is located at"
elog ""
elog " /etc/burp/burp-server.conf"
elog ""
fi
# According to PMS this can be a space-separated list of version
# numbers, even though in practice it is typically just one.
local oldver
for oldver in ${REPLACING_VERSIONS}; do
if [[ $(ver_cut 1 ${oldver}) -lt 2 ]]; then
ewarn "Starting with version 2.0.54 we no longer patch bedup to use"
ewarn "the server config file by default. If you use bedup, please"
ewarn "update your scripts to invoke it as"
ewarn ""
ewarn " bedup -c /etc/burp/burp-server.conf"
ewarn ""
ewarn "Otherwise deduplication will not work!"
break
fi
done
}
......@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
S=${WORKDIR}/${P}/${PN}
else
SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
S=${WORKDIR}/certbot-${PV}/acme
fi
......
......@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
S=${WORKDIR}/${P}/${PN}
else
SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
KEYWORDS="~amd64 ~arm64 ~x86"
KEYWORDS="amd64 ~arm64 x86"
S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
fi
......
......@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
S=${WORKDIR}/${P}/${PN}
else
SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
KEYWORDS="amd64 ~arm ~arm64 x86"
S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
fi
......
......@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
fi
S=${WORKDIR}/${P}/${PN}
......
......@@ -17,7 +17,7 @@ https://utils.kde.org/projects/okteta/"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
KEYWORDS="~amd64 ~arm64 ~x86"
KEYWORDS="amd64 ~arm64 x86"
fi
LICENSE="GPL-2 handbook? ( FDL-1.2 )"
......
diff --git a/src/Makefile.in b/src/Makefile.in
index 36bd280..07cebdf 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -4473,7 +4473,7 @@ SECURITY_DRIVER_APPARMOR_SOURCES = \
$(NULL)
SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES_IN = \
- security/apparmor/usr.lib.libvirt.virt-aa-helper.in \
+ security/apparmor/usr.libexec.virt-aa-helper.in \
security/apparmor/usr.sbin.libvirtd.in \
$(NULL)
@@ -13821,11 +13821,11 @@ security/apparmor/%: $(srcdir)/security/apparmor/%.in
@WITH_APPARMOR_PROFILES_TRUE@install-apparmor-local: $(SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES)
@WITH_APPARMOR_PROFILES_TRUE@ $(MKDIR_P) "$(APPARMOR_LOCAL_DIR)"
@WITH_APPARMOR_PROFILES_TRUE@ echo "# Site-specific additions and overrides for \
-@WITH_APPARMOR_PROFILES_TRUE@ 'usr.lib.libvirt.virt-aa-helper'" \
-@WITH_APPARMOR_PROFILES_TRUE@ >"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper"
+@WITH_APPARMOR_PROFILES_TRUE@ 'usr.libexec.virt-aa-helper'" \
+@WITH_APPARMOR_PROFILES_TRUE@ >"$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper"
@WITH_APPARMOR_PROFILES_TRUE@uninstall-apparmor-local:
-@WITH_APPARMOR_PROFILES_TRUE@ rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper"
+@WITH_APPARMOR_PROFILES_TRUE@ rm -f "$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper"
@WITH_APPARMOR_PROFILES_TRUE@ rmdir "$(APPARMOR_LOCAL_DIR)" || :
$(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \
diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am
index 5f2f4c8..d457cc6 100644
--- a/src/security/Makefile.inc.am
+++ b/src/security/Makefile.inc.am
@@ -31,7 +31,7 @@ SECURITY_DRIVER_APPARMOR_SOURCES = \
$(NULL)
SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES_IN = \
- security/apparmor/usr.lib.libvirt.virt-aa-helper.in \
+ security/apparmor/usr.libexec.virt-aa-helper.in \
security/apparmor/usr.sbin.libvirtd.in \
$(NULL)
@@ -130,11 +130,11 @@ APPARMOR_LOCAL_DIR = "$(DESTDIR)$(apparmordir)/local"
install-apparmor-local: $(SECURITY_DRIVER_APPARMOR_GENERATED_PROFILES)
$(MKDIR_P) "$(APPARMOR_LOCAL_DIR)"
echo "# Site-specific additions and overrides for \
- 'usr.lib.libvirt.virt-aa-helper'" \
- >"$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper"
+ 'usr.libexec.virt-aa-helper'" \
+ >"$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper"
uninstall-apparmor-local:
- rm -f "$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper"
+ rm -f "$(APPARMOR_LOCAL_DIR)/usr.libexec.virt-aa-helper"
rmdir "$(APPARMOR_LOCAL_DIR)" || :
INSTALL_DATA_LOCAL += install-apparmor-local
diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu
index 80986ae..d550d8c 100644
--- a/src/security/apparmor/libvirt-qemu
+++ b/src/security/apparmor/libvirt-qemu
@@ -88,6 +88,7 @@
/usr/share/sgabios/** r,
/usr/share/slof/** r,
/usr/share/vgabios/** r,
+ /usr/share/seavgabios/** r,
# pki for libvirt-vnc and libvirt-spice (LP: #901272, #1690140)
/etc/pki/CA/ r,
diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in b/src/security/apparmor/usr.libexec.virt-aa-helper.in
similarity index 97%
rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
rename to src/security/apparmor/usr.libexec.virt-aa-helper.in
index dd18c8a..d06f9cb 100644
--- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
+++ b/src/security/apparmor/usr.libexec.virt-aa-helper.in
@@ -69,5 +69,5 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper {
/**.[iI][sS][oO] r,
/**/disk{,.*} r,
- #include <local/usr.lib.libvirt.virt-aa-helper>
+ #include <local/usr.libexec.virt-aa-helper>
}
......@@ -123,7 +123,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
"${FILESDIR}"/${PN}-6.1.0-fix-paths-for-apparmor.patch
"${FILESDIR}"/${PN}-6.5.0-fix-paths-for-apparmor.patch
"${FILESDIR}"/${PN}-6.5.0-do-not-use-sysconfig.patch
)
......
--- a/configure
+++ b/configure
@@ -6349,9 +6349,6 @@ if test "$debug_info" = "yes"; then
CFLAGS="-g $CFLAGS"
LDFLAGS="-g $LDFLAGS"
fi
-if test "$debug" = "no"; then
- CFLAGS="-O2 $CFLAGS"
-fi
case "$ARCH" in
alpha)
......@@ -223,9 +223,7 @@ RDEPEND="${CDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
"${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902
"${FILESDIR}"/${PN}-4.2.0-cflags.patch
"${FILESDIR}"/${PN}-5.1.0-pixman-for-vhost-user-gpu.patch
"${FILESDIR}"/${PN}-9999-cflags.patch
)
QA_PREBUILT="
......@@ -412,7 +410,6 @@ qemu_src_configure() {
--datadir=/usr/share
--docdir=/usr/share/doc/${PF}/html
--mandir=/usr/share/man
--with-confsuffix=/qemu
--localstatedir=/var
--disable-bsd-user
--disable-containers # bug #732972
......
......@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
PYTHON_COMPAT=( python3_{5,6,7,8,9} )
inherit autotools python-single-r1
......
DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33
DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e
https://github.com/sunpinyin/sunpinyin/issues/111
--- /wrapper/ibus/setup/main.py
+++ /wrapper/ibus/setup/main.py
@@ -63,7 +63,7 @@
class Logger:
@staticmethod
def pr(message):
- print >> sys.stderr, message
+ print(message, file=sys.stderr)
class Option(object):
@@ -73,10 +73,10 @@
"""
config = ibus.Bus().get_config()
__wrappers = {
- type(True): glib.Variant.new_boolean,
- type(1): glib.Variant.new_int32,
- type('str'): glib.Variant.new_string,
- type([]): glib.Variant.new_strv,
+ bool: glib.Variant.new_boolean,
+ int: glib.Variant.new_int32,
+ str: glib.Variant.new_string,
+ list: glib.Variant.new_strv,
}
def __init__(self, name, default):
@@ -258,7 +258,7 @@
def read_config(self):
if not self.saved_pairs:
self.saved_pairs = self.read()
- keys = set([pair.split(':')[0] for pair in self.saved_pairs])
+ keys = {pair.split(':')[0] for pair in self.saved_pairs}
for opt in self.options:
opt.is_enabled = (opt.key() in keys)
# throw away unknown pair
@@ -445,28 +445,28 @@
# TODO: the UI should looks like a virtual keyboard,
# user are allowed to choose the mappings to all punctuation keys.
def __init__(self):
- mappings = [MappingInfo('togglebutton1', [('`',None), ('~',u'~')]),
+ mappings = [MappingInfo('togglebutton1', [('`', None), ('~', '~')]),
MappingInfo('togglebutton2', []),
- MappingInfo('togglebutton3', [('2',None), ('@',u'@')]),
- MappingInfo('togglebutton4', [('3',None), ('#',u'#')]),
- MappingInfo('togglebutton5', [('4',None), ('$',u'¥' )]),
- MappingInfo('togglebutton6', [('5',None), ('%',u'%')]),
- MappingInfo('togglebutton7', [('6',None), ('^',u'…')]),
- MappingInfo('togglebutton8', [('7',None), ('&',u'&')]),
- MappingInfo('togglebutton9', [('8',None), ('*',u'*')]),
- MappingInfo('togglebutton10', [('9',None), ('*',u'(')]),
- MappingInfo('togglebutton11', [('0',None), ('*',u')')]),
- MappingInfo('togglebutton12', [('-',u'-'), ('_',u'——')]),
- MappingInfo('togglebutton13', [('=',u'='), ('+',u'+')]),
- MappingInfo('togglebutton14', [('\\',None), ('|',u'‖')]),
- MappingInfo('togglebutton27', [('[',u'〔'), ('{',u'{')]),
- MappingInfo('togglebutton28', [(']',u'〕'), ('}',u'}')]),
+ MappingInfo('togglebutton3', [('2', None), ('@', '@')]),
+ MappingInfo('togglebutton4', [('3', None), ('#', '#')]),
+ MappingInfo('togglebutton5', [('4', None), ('$', '¥' )]),
+ MappingInfo('togglebutton6', [('5', None), ('%', '%')]),
+ MappingInfo('togglebutton7', [('6', None), ('^', '…')]),
+ MappingInfo('togglebutton8', [('7', None), ('&', '&')]),
+ MappingInfo('togglebutton9', [('8', None), ('*', '*')]),
+ MappingInfo('togglebutton10', [('9', None), ('*', '(')]),
+ MappingInfo('togglebutton11', [('0', None), ('*', ')')]),
+ MappingInfo('togglebutton12', [('-', '-'), ('_', '——')]),
+ MappingInfo('togglebutton13', [('=', '='), ('+', '+')]),
+ MappingInfo('togglebutton14', [('\\', None), ('|', '‖')]),
+ MappingInfo('togglebutton27', [('[', '〔'), ('{', '{')]),
+ MappingInfo('togglebutton28', [(']', '〕'), ('}', '}')]),
MappingInfo('togglebutton39', []),
MappingInfo('togglebutton40', []),
- MappingInfo('togglebutton50', [(',',None), ('<',u'〈')]),
- MappingInfo('togglebutton51', [('.',u'·'), ('>',u'〉')]),
- MappingInfo('togglebutton52', [('/',u'/'), ('?',None)])]
- #'\'',(u'‘',u'’'),
+ MappingInfo('togglebutton50', [(',', None), ('<', '〈')]),
+ MappingInfo('togglebutton51', [('.', '·'), ('>', '〉')]),
+ MappingInfo('togglebutton52', [('/', '/'), ('?', None)])]
+ #'\'', ('‘', '’'),
MultiCheckDialog.__init__(self, ui_name="punctmapping",
config_name="General/PunctMapping/Mappings",
mappings=mappings,
# Copyright 2009-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
PYTHON_COMPAT=( python3_{5,6,7,8,9} )
inherit python-single-r1 scons-utils toolchain-funcs
MY_PN="sunpinyin"
MY_P="${MY_PN}-${PV}"
if [[ "${PV}" == "9999" ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/sunpinyin/sunpinyin"
elif [[ "${PV}" == *_pre* ]]; then
SUNPINYIN_GIT_REVISION="f39c195db08661e894017507842991a1ef70bedf"
fi
DESCRIPTION="Chinese SunPinyin engine for IBus"
HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
if [[ "${PV}" == "9999" ]]; then
SRC_URI=""
elif [[ "${PV}" == *_pre* ]]; then
SRC_URI="https://github.com/sunpinyin/${MY_PN}/archive/${SUNPINYIN_GIT_REVISION}.tar.gz -> ${MY_P}.tar.gz"
else
SRC_URI="https://github.com/sunpinyin/${MY_PN}/archive/v${PV/_/-}.tar.gz -> ${MY_P}.tar.gz"
fi
LICENSE="|| ( CDDL LGPL-2.1 )"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+gui"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
BDEPEND="sys-devel/gettext
virtual/pkgconfig"
DEPEND="app-i18n/ibus
~app-i18n/sunpinyin-${PV}
dev-libs/glib:2
virtual/libintl"
RDEPEND="${DEPEND}
app-i18n/sunpinyin-data