Merge updates from master

This commit is contained in:
Repository mirror & CI
2021-06-25 10:21:30 +00:00
100 changed files with 567 additions and 1013 deletions

View File

@@ -2,12 +2,9 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="project">
<email>openstack@gentoo.org</email>
<name>Openstack</name>
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<longdescription lang="en">
Provides services for discovering, registering, and retrieving virtual

View File

@@ -1,5 +1,5 @@
--- a/extras/gtomb/gtomb 2021-04-12 03:01:14.803394386 +0200
+++ b/extras/gtomb/gtomb 2021-04-12 03:02:19.277491170 +0200
--- a/extras/gtomb/gtomb
+++ b/extras/gtomb/gtomb
@@ -19,8 +19,8 @@
# along with this source code. If not, see <http://www.gnu.org/licenses/>.

View File

@@ -0,0 +1,17 @@
--- a/extras/kdf-keys/Makefile
+++ b/extras/kdf-keys/Makefile
@@ -2,10 +2,10 @@
PREFIX ?= /usr/local
all:
- $(CC) -O2 $(CFLAGS) -o tomb-kdb-pbkdf2 pbkdf2.c -lgcrypt
- $(CC) -O2 $(CFLAGS) -o tomb-kdb-pbkdf2-getiter benchmark.c -lgcrypt
- $(CC) -O2 $(CFLAGS) -o tomb-kdb-pbkdf2-gensalt gen_salt.c -lgcrypt
- $(CC) -O2 $(CFLAGS) -o tomb-kdb-hexencode hexencode.c
+ $(CC) $(CFLAGS) $(LDFLAGS) -o tomb-kdb-pbkdf2 pbkdf2.c -lgcrypt
+ $(CC) $(CFLAGS) $(LDFLAGS) -o tomb-kdb-pbkdf2-getiter benchmark.c -lgcrypt
+ $(CC) $(CFLAGS) $(LDFLAGS) -o tomb-kdb-pbkdf2-gensalt gen_salt.c -lgcrypt
+ $(CC) $(CFLAGS) $(LDFLAGS) -o tomb-kdb-hexencode hexencode.c
test:
@echo "Running Tomb-kdb tests"

View File

@@ -3,15 +3,17 @@
EAPI="7"
MYP="${P^}"
inherit desktop qmake-utils toolchain-funcs xdg
MYP="${P^}"
DESCRIPTION="Tomb :: File Encryption on GNU/Linux"
HOMEPAGE="
https://www.dyne.org/software/tomb
https://github.com/dyne/Tomb
"
SRC_URI="https://files.dyne.org/tomb/releases/Tomb-${PV}.tar.gz"
S="${WORKDIR}/${MYP}"
LICENSE="
GPL-3
gui? ( GPL-3+ )
@@ -19,9 +21,13 @@ LICENSE="
SLOT="0"
KEYWORDS="~amd64"
IUSE="gui test tray"
#test require sudo, can't be done non interactively
RESTRICT="test"
PATCHES=( "${FILESDIR}/gtomb.patch" )
PATCHES=(
"${FILESDIR}/${P}-gtomb.patch"
"${FILESDIR}/${P}-respect-ldflags.patch"
)
DOCS=(
AUTHORS.txt
ChangeLog.txt
@@ -36,7 +42,7 @@ DOCS=(
doc/TKS1-draft.pdf
doc/tomb_manpage.pdf
)
S="${WORKDIR}/${MYP}"
CDEPEND="
dev-libs/libgcrypt
tray? (
@@ -109,6 +115,8 @@ src_install() {
pushd extras/qt-tray || die
dobin tomb-qt-tray
doicon pixmaps/tomb_icon.png
insinto /usr/share
doins -r i18n
popd || die
fi

View File

@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer needed -->
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<longdescription>
A database for 'dict'-compatible dictionary software, based on Ambrose Bierce's satirical The Devil's Dictionary.
</longdescription>

View File

@@ -1,13 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer needed -->
<upstream>
<maintainer status="inactive">
<name>Jay Kominek</name>
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
</upstream>
<longdescription>
A database for 'dict'-compatible dictionary software, based on Jay Kominek's descriptions of the atomic elements.
</longdescription>
<upstream>
<maintainer status="inactive">
<name>Jay Kominek</name>
</maintainer>
</upstream>
<longdescription>
A database for 'dict'-compatible dictionary software, based on Jay Kominek's descriptions of the atomic elements.
</longdescription>
</pkgmetadata>

View File

@@ -1,13 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer needed -->
<upstream>
<maintainer>
<name>Denis Howe</name>
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
</upstream>
<longdescription>
A database for 'dict'-compatible dictionary software, based on the Free On-line Dictionary of Computing describing various topics in computing.
</longdescription>
<upstream>
<maintainer>
<name>Denis Howe</name>
</maintainer>
</upstream>
<longdescription>
A database for 'dict'-compatible dictionary software, based on the Free On-line Dictionary of Computing describing various topics in computing.
</longdescription>
</pkgmetadata>

View File

@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<upstream>
<remote-id type="sourceforge">dict-gazetteer</remote-id>
</upstream>

View File

@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer needed -->
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
</pkgmetadata>

View File

@@ -1,18 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer needed -->
<upstream>
<maintainer status="inactive">
<name>Eric S. Raymond</name>
<email>esr@thyrsus.com</email>
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<maintainer status="inactive">
<name>Guy Steele</name>
<email>gls@think.com</email>
</maintainer>
</upstream>
<longdescription>
A database for 'dict'-compatible dictionary software, based on the classic Jargon File describing the slang that developed around computer programming in the '70s and '80s.
</longdescription>
<upstream>
<maintainer status="inactive">
<name>Eric S. Raymond</name>
<email>esr@thyrsus.com</email>
</maintainer>
<maintainer status="inactive">
<name>Guy Steele</name>
<email>gls@think.com</email>
</maintainer>
</upstream>
<longdescription>
A database for 'dict'-compatible dictionary software, based on the classic Jargon File describing the slang that developed around computer programming in the '70s and '80s.
</longdescription>
</pkgmetadata>

View File

@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer needed -->
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
</pkgmetadata>

View File

@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer needed -->
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<use>
<flag name="ipa">convert transcription into the IPA Unicode</flag>
</use>

View File

@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer needed -->
<upstream>
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<upstream>
<maintainer>
<name>Patrick Cassidy</name>
<email>cassidy@micra.com</email>

View File

@@ -4,7 +4,7 @@
<maintainer type="person">
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
<description>comaintainers welcome</description>
<description>co-maintainers welcome</description>
</maintainer>
<upstream>
<remote-id type="github">schachmat/wego</remote-id>

View File

@@ -0,0 +1,5 @@
option domain-name-servers 8.8.8.8, 8.8.4.4;
option subnet-mask 255.255.255.0;
subnet 10.15.19.0 netmask 255.255.255.0 {
range 10.15.19.100 10.15.19.254;
}

View File

@@ -0,0 +1,9 @@
[Service]
PIDFile=/run/danctnix/dhcpd4.pid
# We need to fix this ASAP, dhcpd won't run with dhcp user, this needs
# to be investigated.
User=root
ExecStart=
ExecStart=/usr/bin/dhcpd -4 -q -cf /etc/danctnix/dhcpd.conf -pf /run/danctnix/dhcpd4.pid -lf /run/danctnix/dhcpd4.lease

View File

@@ -0,0 +1,2 @@
d /run/danctnix 0755 root root
f /run/danctnix/dhcpd4.lease 0644 root root

View File

@@ -0,0 +1,77 @@
#!/bin/sh
# ConfigFS script is taken from postmarketOS
# https://postmarketos.org
# These are very important, it defines what is the device:
deviceinfo_usb_idVendor="0x1F3A"
deviceinfo_usb_idProduct="0xEFE8"
deviceinfo_manufacturer="DanctNIX"
deviceinfo_name="Arch Linux Mobile"
# We'll let them know that this device is Arch ARM.
deviceinfo_usb_serialnumber="Arch"
setup_usb_network_configfs() {
# See: https://www.kernel.org/doc/Documentation/usb/gadget_configfs.txt
CONFIGFS=/sys/kernel/config/usb_gadget/
if ! [ -e "$CONFIGFS" ]; then
echo " $CONFIGFS does not exist, skipping configfs usb gadget"
return
fi
# Default values for USB-related deviceinfo variables
usb_idVendor="${deviceinfo_usb_idVendor:-0x18D1}" # default: Google Inc.
usb_idProduct="${deviceinfo_usb_idProduct:-0xD001}" # default: Nexus 4 (fastboot)
usb_serialnumber="${deviceinfo_usb_serialnumber:-postmarketOS}"
usb_rndis_function="${deviceinfo_usb_rndis_function:-rndis.usb0}"
echo " Setting up an USB gadget through configfs"
# Create an usb gadet configuration
mkdir $CONFIGFS/g1 || echo " Couldn't create $CONFIGFS/g1"
echo "$usb_idVendor" > "$CONFIGFS/g1/idVendor"
echo "$usb_idProduct" > "$CONFIGFS/g1/idProduct"
# Create english (0x409) strings
mkdir $CONFIGFS/g1/strings/0x409 || echo " Couldn't create $CONFIGFS/g1/strings/0x409"
# shellcheck disable=SC2154
echo "$deviceinfo_manufacturer" > "$CONFIGFS/g1/strings/0x409/manufacturer"
echo "$usb_serialnumber" > "$CONFIGFS/g1/strings/0x409/serialnumber"
# shellcheck disable=SC2154
echo "$deviceinfo_name" > "$CONFIGFS/g1/strings/0x409/product"
# Create rndis function. The function can be named differently in downstream kernels.
mkdir $CONFIGFS/g1/functions/"$usb_rndis_function" \
|| echo " Couldn't create $CONFIGFS/g1/functions/$usb_rndis_function"
# Create configuration instance for the gadget
mkdir $CONFIGFS/g1/configs/c.1 \
|| echo " Couldn't create $CONFIGFS/g1/configs/c.1"
mkdir $CONFIGFS/g1/configs/c.1/strings/0x409 \
|| echo " Couldn't create $CONFIGFS/g1/configs/c.1/strings/0x409"
echo "rndis" > $CONFIGFS/g1/configs/c.1/strings/0x409/configuration \
|| echo " Couldn't write configration name"
# Link the rndis instance to the configuration
ln -s $CONFIGFS/g1/functions/"$usb_rndis_function" $CONFIGFS/g1/configs/c.1 \
|| echo " Couldn't symlink $usb_rndis_function"
# Check if there's an USB Device Controller
if [ -z "$(ls /sys/class/udc)" ]; then
echo " No USB Device Controller available"
return
fi
# Link the gadget instance to an USB Device Controller. This activates the gadget.
# See also: https://github.com/postmarketOS/pmbootstrap/issues/338
# shellcheck disable=SC2005
echo "$(ls /sys/class/udc)" > $CONFIGFS/g1/UDC || echo " Couldn't write UDC"
}
# And we go.
setup_usb_network_configfs
ip address add 10.15.19.82/24 dev usb0
ip link set usb0 up

View File

@@ -0,0 +1,12 @@
# systemd service file for usb-tethering
[Unit]
Wants=dhcpd4.service
Description=USB Tethering
[Service]
Type=oneshot
ExecStart=/bin/bash /usr/lib/danctnix/usb-tethering
[Install]
WantedBy=multi-user.target

View File

@@ -0,0 +1,8 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>marco@scardovi.com</email>
<name>Marco Scardovi</name>
</maintainer>
</pkgmetadata>

View File

@@ -0,0 +1,33 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit systemd
DESCRIPTION="USB tethering on Pine64/ConfigFS systems"
HOMEPAGE="https://github.com/dreemurrs-embedded/Pine64-Arch"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~arm64"
DEPEND="
net-misc/dhcp
sys-apps/systemd
"
RDEPEND="${DEPEND}"
S="${WORKDIR}"
src_install() {
exeinto "/usr/lib/danctnix"
doexe "${FILESDIR}/usb-tethering"
systemd_dounit "${FILESDIR}"/usb-tethering.service
insinto "/usr/lib/tmpfiles.d/"
doins "${FILESDIR}"/tmpfiles.d.danctnix-usb.conf
insinto "/etc/systemd/system/dhcpd4.service.d/"
doins "${FILESDIR}"/dhcpd4.service-customexec.conf
insinto "/etc/danctnix/"
doins "${FILESDIR}"/dhcpd.conf
}

View File

@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
<remote-id type="sourceforge">gentoo-sweep</remote-id>
</upstream>
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<upstream>
<remote-id type="sourceforge">gentoo-sweep</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<longdescription>
Bring your ZSH history to Fish shell

View File

@@ -1,2 +1,2 @@
DIST epubgrep-0.5.0.tar.gz 253335 BLAKE2B 43a0fff1368a4173797355b8e408ea740ec2810fc13d2a96fb96fda861d076b28c2ce1ce66ddeea64370be21f0873327a96bddca249c73427f6874476dd1d628 SHA512 87deba97675f827dd7e8914b7cf537d903f22a91504e0316e70fd04e567e0282998c729d1a7cef0d0bfaaaa8cf2bd4765afa18c41403248f261bc4240dd08c1a
DIST epubgrep-0.5.1.tar.gz 269799 BLAKE2B 11f67e7584a33d0ba4249e2b8d210c3d74d67a6d6f5a44b2ed8f6d50d52e6ceb4f6db18458afcefa004b185acf4848e724da85286ec7c9ee155dafc4c76f6668 SHA512 dc8550f0802ce92344c7f24d2ffb57c656bef81914414e47310c703ad5c302d1508b3cf3b28459a939156dc5772a702a6a28a8ec28a946218c541c4e690da3c5
DIST epubgrep-0.6.0.tar.gz 271553 BLAKE2B 6693c6bb61cf8b778145b5dcf1976ecf17716e8a42e01f9754e4fd82a72c136a09baf12f197029a84aeea727af2d95d4a56aacaf9b4aac5bae81e3ed6b356226 SHA512 4e28c041d434d85ea8dfa4c43f3e0ae7263e11714330ead356b782968ec96642baefbb4d2f37d28cabfd0e53610edb04ec8409dff7232a970f01eb8a5755befe

View File

@@ -41,7 +41,3 @@ src_configure() {
cmake_src_configure
}
src_test() {
BUILD_DIR="${BUILD_DIR}/tests" cmake_src_test
}

View File

@@ -3,7 +3,7 @@
<pkgmetadata>
<longdescription>VexCL is a vector expression template library for OpenCL/CUDA. It has been created for ease of GPGPU development with C++. VexCL strives to reduce amount of boilerplate code needed to develop GPGPU applications. The library provides convenient and intuitive notation for vector arithmetic, reduction, sparse matrix-vector products, etc. Multi-device and even multi-platform computations are supported. The source code of the library is distributed under very permissive MIT license.</longdescription>
<maintainer type="person">
<description>comaintainers welcome</description>
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>

View File

@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<longdescription lang="en">Aldor is a programming language. It is the successor of A# as the extension language of the Axiom computer algebra system.
The Aldor language combines imperative, functional, and object-oriented features. It has an elaborate dependent type system, allowing types to be used as first-class values. Aldor's syntax is heavily influenced by Pascal, but it is optionally indentation-sensitive, like Python. In its current implementation, it is compiled, but an interactive listener is provided.</longdescription>
<maintainer type="person">
<description>co-maintainers welcome</description>
<description>comaintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<longdescription lang="en">Aldor is a programming language. It is the successor of A# as the extension language of the Axiom computer algebra system.
The Aldor language combines imperative, functional, and object-oriented features. It has an elaborate dependent type system, allowing types to be used as first-class values. Aldor's syntax is heavily influenced by Pascal, but it is optionally indentation-sensitive, like Python. In its current implementation, it is compiled, but an interactive listener is provided.
</longdescription>
<upstream>
<remote-id type="github">pippijn/aldor</remote-id>
</upstream>

View File

@@ -1,2 +1,2 @@
DIST b45468080eee851da500613ecedd709639b6d769.tar.gz 80860 BLAKE2B a80829b496e314fd04f17024a3e5415e02852b217df5f9bcbca6159b4bded5220cd6cc9d39a66c24de500bbe91c111ca1e4d05669b53decc07ca0adb91b851da SHA512 7e869c127059d2f070d368ca894808f2fb78fd04048662dabd303a45d86a3b53bf3646f64e088cd720c6f54777a86673156d3cf782fdd663dc25fae65bd04e6e
DIST feedbackd-b45468080eee851da500613ecedd709639b6d769.tar.gz 80860 BLAKE2B a80829b496e314fd04f17024a3e5415e02852b217df5f9bcbca6159b4bded5220cd6cc9d39a66c24de500bbe91c111ca1e4d05669b53decc07ca0adb91b851da SHA512 7e869c127059d2f070d368ca894808f2fb78fd04048662dabd303a45d86a3b53bf3646f64e088cd720c6f54777a86673156d3cf782fdd663dc25fae65bd04e6e
DIST feedbackd-device-themes-1602d415aed30b1a67c0ff270551230725b8ef92.tar.gz 13832 BLAKE2B 87c1ccd52dec982e4e1651e11598b60daa8380f2de4c371e0abc70e2840abd1e62fa9fd70cbe8a5860942c282cac54ea11b548066cd01be5b49ba939b488ec3a SHA512 0e6ece5deddc3df3824aa01b6bbc2ad7fc9ab96db6afe9e4aa84652a005eb860c5552e52aeb17329dde84e8d2bccc33c7e603ab04eb2ca41ed19bbe331ce6933

View File

@@ -17,7 +17,7 @@ MY_THEME_COMMIT="1602d415aed30b1a67c0ff270551230725b8ef92"
DESCRIPTION="A daemon to provide haptic feedback on events"
HOMEPAGE="https://source.puri.sm/Librem5/feedbackd"
SRC_URI="
https://source.puri.sm/Librem5/feedbackd/-/archive/${MY_COMMIT}/${MY_COMMIT}.tar.gz
https://source.puri.sm/Librem5/feedbackd/-/archive/${MY_COMMIT}/${MY_COMMIT}.tar.gz -> ${PN}-${MY_COMMIT}.tar.gz
https://source.puri.sm/Librem5/feedbackd-device-themes/-/archive/${MY_THEME_COMMIT}/feedbackd-device-themes-${MY_THEME_COMMIT}.tar.gz
"

View File

@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
<pkgmetadata>
<maintainer type="person">
<description>comaintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<longdescription lang="en">
FSST: Fast Static Symbol Table compression
see the PVLDB paper https://github.com/cwida/fsst/raw/master/fsstcompression.pdf

View File

@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<longdescription>
zfp is a compressed format for representing multidimensional floating-point and integer arrays. zfp provides compressed-array classes that support high throughput read and write random access to individual array elements. zfp also supports serial and parallel (OpenMP and CUDA) compression of whole arrays, e.g., for applications that read and write large data sets to and from disk.
@@ -8,10 +13,6 @@ zfp uses lossy but optionally error-bounded compression to achieve high compress
zfp is freely available as open source and is distributed under a BSD license. zfp is primarily written in C and C++ but also includes Python and Fortran bindings. zfp conforms to various language standards, including C89, C99, C11, C++98, C++11, and C++14, and is supported on Linux, macOS, and Windows.
</longdescription>
<maintainer type="person">
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<upstream>
<bugs-to>https://github.com/LLNL/zfp/issues</bugs-to>
<remote-id type="github">LLNL/zfp</remote-id>

View File

@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<description>comaintainers welcome</description>
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>

View File

@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<description>comaintainers welcome</description>
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>

View File

@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="project">
<email>openstack@gentoo.org</email>
<name>Openstack</name>
</maintainer>
<stabilize-allarches/>
<upstream>
<remote-id type="pypi">WSME</remote-id>

View File

@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>xen@gentoo.org</email>
<name>Gentoo Xen Project</name>
</maintainer>
<upstream>
<remote-id type="pypi">XenAPI</remote-id>
</upstream>

View File

@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="project">
<email>openstack@gentoo.org</email>
<name>Openstack</name>
</maintainer>
<stabilize-allarches/>
<upstream>
<remote-id type="pypi">cursive</remote-id>

View File

@@ -19,6 +19,7 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
DOCS="DESCRIPTION.md"
@@ -28,6 +29,7 @@ DEPEND="
dev-python/nose[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
)"
BDEPEND="app-arch/unzip"
python_test() {
nosetests --verbose || die

View File

@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="project">
<email>openstack@gentoo.org</email>
<name>Openstack</name>
</maintainer>
<stabilize-allarches/>
<upstream>
<remote-id type="pypi">keystonemiddleware</remote-id>

View File

@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="project">
<email>python@gentoo.org</email>
<name>Python</name>
</maintainer>
<longdescription lang="en">
Oslo concurrency library has utilities for safely running multi-thread, multi-process applications using locking mechanisms and for running external processes.
</longdescription>

View File

@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.concurrency-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm arm64 ~x86"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE=""
RESTRICT=""

View File

@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="project">
<email>python@gentoo.org</email>
<name>Python</name>
</maintainer>
<stabilize-allarches/>
<upstream>
<remote-id type="pypi">oslo.messaging</remote-id>

View File

@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="project">
<email>python@gentoo.org</email>
<name>Python</name>
</maintainer>
<longdescription lang="en">
Oslo middleware library includes components that can be injected into wsgi pipelines to intercept request/response flows. The base class can be enhanced with functionality like add/delete/modification of http headers and support for limiting size/connection etc
</longdescription>

View File

@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="project">
<email>python@gentoo.org</email>
<name>Python</name>
</maintainer>
<stabilize-allarches/>
<upstream>
<remote-id type="pypi">oslo.policy</remote-id>

View File

@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="project">
<email>python@gentoo.org</email>
<name>Python</name>
</maintainer>
<stabilize-allarches/>
<upstream>
<remote-id type="pypi">oslo.privsep</remote-id>

View File

@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="project">
<email>python@gentoo.org</email>
<name>Python</name>
</maintainer>
<stabilize-allarches/>
<upstream>
<remote-id type="pypi">oslo.rootwrap</remote-id>

View File

@@ -1,18 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>openstack@gentoo.org</email>
<name>Openstack</name>
</maintainer>
<maintainer type="project">
<email>python@gentoo.org</email>
<name>Python</name>
</maintainer>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<longdescription lang="en">
The Oslo messaging API supports RPC and notifications over a number of different messaging transports.
</longdescription>

View File

@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="project">
<email>python@gentoo.org</email>
<name>Python</name>
</maintainer>
<stabilize-allarches/>
<upstream>
<remote-id type="pypi">pycadf</remote-id>

View File

@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="project">
<email>openstack@gentoo.org</email>
<name>Openstack</name>
</maintainer>
<stabilize-allarches/>
<upstream>
<remote-id type="pypi">python-heatclient</remote-id>

View File

@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="project">
<email>openstack@gentoo.org</email>
<name>Openstack</name>
</maintainer>
<stabilize-allarches/>
<upstream>
<remote-id type="pypi">python-mistralclient</remote-id>

View File

@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="project">
<email>openstack@gentoo.org</email>
<name>Openstack</name>
</maintainer>
<stabilize-allarches/>
<upstream>
<remote-id type="pypi">python-monascaclient</remote-id>

View File

@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="project">
<email>openstack@gentoo.org</email>
<name>Openstack</name>
</maintainer>
<stabilize-allarches/>
<upstream>
<remote-id type="pypi">python-saharaclient</remote-id>

View File

@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="project">
<email>openstack@gentoo.org</email>
<name>Openstack</name>
</maintainer>
<stabilize-allarches/>
<upstream>
<remote-id type="pypi">python-troveclient</remote-id>

View File

@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="project">
<email>openstack@gentoo.org</email>
<name>Openstack</name>
</maintainer>
<stabilize-allarches/>
<upstream>
<remote-id type="pypi">taskflow</remote-id>

View File

@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<longdescription lang="en">
The Tooz project aims at centralizing the most common distributed primitives like group membership protocol, lock service and leader election by providing a coordination API helping developers to build distributed applications.
</longdescription>

View File

@@ -1 +1 @@
DIST csv9.5.4.tar.gz 32313134 BLAKE2B ef8ec4e40389cfdc5bd1f631b02b5439f5353e73f95c48ecf1ec813cd6dc651b305cf019bb3e3083907f402b6578c31a10b2490bce32de6fa621f55d850ae168 SHA512 bc377fc5a7355703193849a21fbcd633f35b56f1f898c747fbddedc63ac979c124d966bdd9ed32366bb466881abdf44e03085af16e9795b10975a72c0d0b6123
DIST chez-9.5.4.tar.gz 32313134 BLAKE2B ef8ec4e40389cfdc5bd1f631b02b5439f5353e73f95c48ecf1ec813cd6dc651b305cf019bb3e3083907f402b6578c31a10b2490bce32de6fa621f55d850ae168 SHA512 bc377fc5a7355703193849a21fbcd633f35b56f1f898c747fbddedc63ac979c124d966bdd9ed32366bb466881abdf44e03085af16e9795b10975a72c0d0b6123

View File

@@ -3,40 +3,61 @@
EAPI=7
MY_PN="csv"
MY_P="${MY_PN}${PV}"
CSV="csv${PV}"
inherit multilib
DESCRIPTION="A programming language based on R6RS"
HOMEPAGE="https://cisco.github.io/ChezScheme/ https://github.com/cisco/ChezScheme"
SRC_URI="https://github.com/cisco/ChezScheme/releases/download/v${PV}/${MY_P}.tar.gz"
SRC_URI="https://github.com/cisco/ChezScheme/releases/download/v${PV}/${CSV}.tar.gz -> ${P}.tar.gz"
# Chez Scheme itself is Apache 2.0, but it vendors LZ4 (BSD-2),
# Nanopass (MIT), stex (MIT), and zlib (ZLIB).
LICENSE="Apache-2.0 BSD-2 MIT ZLIB"
SLOT="0"
KEYWORDS="~amd64"
IUSE="examples threads"
IUSE="X examples ncurses threads"
S="${WORKDIR}"/${MY_P}
DEPEND="
X? ( x11-libs/libX11 )
ncurses? ( sys-libs/ncurses )
"
RDEPEND="
${DEPEND}
"
S="${WORKDIR}/${CSV}"
src_prepare() {
default
if use ncurses; then
eapply "${FILESDIR}/tinfo.patch"
fi
}
src_configure() {
local myconfargs=(
--64
$(usex threads '--threads' '')
$(usex ncurses '' '--disable-curses')
$(usex X '' '--disable-x11')
--installprefix="/usr"
--installbin="/usr/bin"
--installlib="/usr/$(get_libdir)"
--installman="/usr/share/man"
--temproot="${D}"
--installschemename=chezscheme
--installpetitename=chezscheme-petite
--installscriptname=chezscheme-script
--installprefix="${EPREFIX}"/usr
--nogzip-man-pages
--disable-curses # TODO: ncurses USE flag.
--disable-x11 # TODO: X USE flag.
)
use threads && myconfargs+=(--threads)
./configure "${myconfargs[@]}" || die
}
src_install() {
emake install TempRoot="${D}"
use examples || rm -r "${D}"/usr/lib/${MY_P}/examples || die
default
if ! use examples; then
rm -r "${D}/usr/$(get_libdir)/${CSV}/examples" || die
fi
}

View File

@@ -0,0 +1,26 @@
diff --git a/c/Mf-a6le b/c/Mf-a6le
index 1564cce..0cf0bd4 100644
--- a/c/Mf-a6le
+++ b/c/Mf-a6le
@@ -16,7 +16,7 @@
m = a6le
Cpu = X86_64
-mdclib = -lm -ldl ${ncursesLib} -lrt -luuid
+mdclib = -lm -ldl ${ncursesLib} -lrt -luuid -ltinfo
C = ${CC} ${CPPFLAGS} -m64 -msse2 -Wpointer-arith -Wall -Wextra -Werror -Wno-implicit-fallthrough -O2 ${CFLAGS}
o = o
mdsrc = i3le.c
diff --git a/c/Mf-ta6le b/c/Mf-ta6le
index 6adb83f..7f4d805 100644
--- a/c/Mf-ta6le
+++ b/c/Mf-ta6le
@@ -16,7 +16,7 @@
m = ta6le
Cpu = X86_64
-mdclib = -lm -ldl ${ncursesLib} -lpthread -lrt -luuid
+mdclib = -lm -ldl ${ncursesLib} -lpthread -lrt -luuid -ltinfo
C = ${CC} ${CPPFLAGS} -m64 -msse2 -Wpointer-arith -Wall -Wextra -Werror -Wno-implicit-fallthrough -O2 -D_REENTRANT -pthread ${CFLAGS}
o = o
mdsrc = i3le.c

View File

@@ -5,6 +5,10 @@
<email>matt@offtopica.uk</email>
<name>Matt Smith</name>
</maintainer>
<maintainer type="person">
<email>xgqt@riseup.net</email>
<name>Maciej Barć</name>
</maintainer>
<longdescription lang="en">
Chez Scheme is both a programming language and an implementation
of that language, with supporting tools and documentation.

View File

@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<upstream>
<bugs-to>https://github.com/adobe-type-tools/afdko/issues</bugs-to>
<remote-id type="github">adobe-type-tools/afdko</remote-id>

View File

@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<upstream>
<bugs-to>https://github.com/googlefonts/fontmake/issues</bugs-to>
<remote-id type="github">googlefonts/fontmake</remote-id>

View File

@@ -1,10 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
<bugs-to>https://github.com/googlefonts/gftools/issues</bugs-to>
<remote-id type="github">googlefonts/gftools</remote-id>
<remote-id type="pypi">gftools</remote-id>
</upstream>
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<upstream>
<bugs-to>https://github.com/googlefonts/gftools/issues</bugs-to>
<remote-id type="github">googlefonts/gftools</remote-id>
<remote-id type="pypi">gftools</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -1,10 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
<bugs-to>https://github.com/adobe-type-tools/psautohint/issues</bugs-to>
<remote-id type="github">adobe-type-tools/psautohint</remote-id>
<remote-id type="pypi">psautohint</remote-id>
</upstream>
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<upstream>
<bugs-to>https://github.com/adobe-type-tools/psautohint/issues</bugs-to>
<remote-id type="github">adobe-type-tools/psautohint</remote-id>
<remote-id type="pypi">psautohint</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<description>comaintainers welcome</description>
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>

View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>lssndrbarbieri@gmail.com</email>

View File

@@ -17,15 +17,29 @@ S="${WORKDIR}/${PN}-${COMMIT}"
LICENSE="LGPL-2+"
SLOT="5"
KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="konqueror"
DEPEND="
>=dev-qt/qtwidgets-${QTMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kparts-${KFMIN}:5
"
RDEPEND="${DEPEND}"
RDEPEND="${DEPEND}
konqueror? (
kde-apps/konqueror:5
kde-misc/kio-gemini:5
)
"
src_test() {
export QT_QPA_PLATFORM=offscreen
ecm_src_test
}
src_install() {
ecm_src_install
if ! use konqueror ; then
rm "${ED}"/usr/share/applications/gemini-konqueror.desktop || die
fi
}

View File

@@ -12,4 +12,7 @@
<email>cyber+gentoo@sysrq.in</email>
<name>Anna</name>
</maintainer>
<use>
<flag name="konqueror">Make Konqueror handle gemini:// URLs</flag>
</use>
</pkgmetadata>

View File

@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<longdescription lang="en">
This font is derived from the x3270 font, which, in turn, was translated from the one in Georgia Tech's 3270tool, which was itself hand-copied from a 3270 series terminal. I built it because I felt terminals deserve to be pretty. The .sfd font file contains a x3270 bitmap font that was used for guidance.
</longdescription>

View File

@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
</pkgmetadata>

View File

@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
</pkgmetadata>

View File

@@ -1 +1 @@
DIST rtmidi-4.0.0.tar.gz 95928 BLAKE2B 25c0c8a4bb63acd24fad5afa18194d0c6de6138298e7c163118e725ec772276b5cea3c7eb0f4aad9f8b27ad51941027d260835cc373857021280a03dc76eb789 SHA512 1c4c1400b60de5a91a47849efaf3f51af6cd2fc5e681c2f5981b7d748c438efef0b8f0dbc3a26408820ca1eabb58c86ba2f7a6abaf0dd1f083fd6b768065bc0a
DIST rtmidi-4.0.0.tar.gz 509743 BLAKE2B 16a43e0c30e49775e7fcf8af1318fb2240b97d2f5e32e043763e51896b95c38d508b3cdbbf712d562f6e57b7b3ed99f74b5a22c50cd298ebb020215c3e78eed8 SHA512 1b7e6698944104f6a80c17c9af85a9fad4b215af47277f4d9f5e61668cdea86886aae8296c79948313b3efbaa8569c441c38b0b1f3bad20dce3cee19d6a5eaa8

View File

@@ -7,7 +7,7 @@ inherit cmake
DESCRIPTION="A set of C++ classes that provide a common API for realtime MIDI input/output"
HOMEPAGE="http://www.music.mcgill.ca/~gary/rtmidi"
SRC_URI="https://dl.bintray.com/aeon-engine/aeon_dependencies/rtmidi/src/${P}.tar.gz"
SRC_URI="http://www.music.mcgill.ca/~gary/rtmidi/release/${P}.tar.gz"
LICENSE="RtMidi"
SLOT="0"

View File

@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<description>comaintainers welcome</description>
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>

View File

@@ -1 +0,0 @@
byte-compile - enable byte compiling

View File

@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- Maintainer Needed -->
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<upstream>
<remote-id type="github">mlpack/ensmallen</remote-id>
</upstream>

View File

@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<longdescription lang="en">Simple Go program to enable/disable C6 C-state, processor boosting, address space layout randomization (ASLR) and the Power Supply Idle Control workaround on an AMD Ryzen processor, in order to help with the infamous "MCE-random-reboots-while-idle" issue.</longdescription>
<upstream>
<bugs-to>https://github.com/qrwteyrutiyoup/ryzen-stabilizator/issues</bugs-to>

View File

@@ -1,18 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<use>
<flag name="memcached">Installs dependencies needed for using memcached as a backend</flag>
<flag name="mongo">Installs dependencies needed for using mongo as a backend</flag>
</use>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="project">
<email>openstack@gentoo.org</email>
<name>Openstack</name>
</maintainer>
<upstream>
<remote-id type="launchpad">keystone</remote-id>
</upstream>

View File

@@ -32,6 +32,7 @@ DEPEND=">=dev-python/pbr-5.4.1[${PYTHON_USEDEP}]
app-admin/sudo"
# >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}] # do not include, upstream depricated
#TODO: remove zstd
RDEPEND="
>=dev-python/pbr-5.4.1[${PYTHON_USEDEP}]
>=dev-python/decorator-4.1.0[${PYTHON_USEDEP}]

View File

@@ -2,8 +2,9 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<use>
<flag name="api">Installs the initscripts for the cinder api service</flag>

View File

@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<longdescription lang="en">
Heat is a service to orchestrate multiple composite cloud applications using
templates, through both an OpenStack-native REST API and a

View File

@@ -2,12 +2,9 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="project">
<email>openstack@gentoo.org</email>
<name>Openstack</name>
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<longdescription lang="en">
Just like OpenStack Nova provides an API to dynamically request and

View File

@@ -2,12 +2,9 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="project">
<email>openstack@gentoo.org</email>
<name>Openstack</name>
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<longdescription lang="en">
Nova is a cloud computing fabric controller

View File

@@ -2,12 +2,9 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="project">
<email>openstack@gentoo.org</email>
<name>Openstack</name>
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<longdescription lang="en">
OpenStack Placement provides an HTTP service for managing, selecting, and claiming providers of classes of inventory representing available resources in a cloud.

View File

@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<use>
<flag name="account">adds swift account support</flag>
<flag name="container">adds swift container support</flag>
@@ -8,14 +13,6 @@
<flag name="object">adds swift object support</flag>
<flag name="proxy">adds swift proxy support</flag>
</use>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
<maintainer type="project">
<email>openstack@gentoo.org</email>
<name>Openstack</name>
</maintainer>
<upstream>
<remote-id type="launchpad">swift</remote-id>
</upstream>

View File

@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<description>comaintainers welcome</description>
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>

View File

@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<use>
<flag name="togglecode">Install the togglecode utility to turn on/off the Q-Code display on ASUS Crosshair VI Hero motherboards (and other boards with a compatible Super I/O chip)</flag>
</use>

View File

@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<upstream>
<bugs-to>https://github.com/jfredrickson/disable-c6/issues</bugs-to>
<remote-id type="github">jfredrickson/disable-c6</remote-id>

View File

@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
</pkgmetadata>

View File

@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
</pkgmetadata>

View File

@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
</pkgmetadata>

View File

@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
</pkgmetadata>

View File

@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
</pkgmetadata>

View File

@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
</pkgmetadata>

View File

@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<maintainer type="person">
<description>co-maintainers welcome</description>
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
</pkgmetadata>

View File

@@ -3,14 +3,16 @@
EAPI=7
inherit bash-completion-r1 systemd udev
PYTHON_COMPAT=( python3_{7..10} )
inherit bash-completion-r1 distutils-r1 systemd udev
if [[ "${PV}" = "9999" ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/phillipberndt/${PN}.git"
else
SRC_URI="https://github.com/phillipberndt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="Automatically select a display configuration based on connected devices"
@@ -18,36 +20,43 @@ HOMEPAGE="https://github.com/phillipberndt/autorandr"
LICENSE="GPL-3"
SLOT="0"
IUSE="bash-completion systemd udev"
IUSE="bash-completion launcher systemd udev"
RDEPEND="
launcher? ( x11-libs/libxcb )
udev? ( virtual/udev )
"
DEPEND="
virtual/pkgconfig
${RDEPEND}
"
RDEPEND="
bash-completion? ( app-shells/bash )
systemd? ( sys-apps/systemd )
udev? ( virtual/udev )
"
src_compile() {
distutils-r1_src_compile
if use launcher; then
emake contrib/autorandr_launcher/autorandr-launcher
fi
}
src_install() {
targets="autorandr autostart_config"
if use bash-completion; then
targets="$targets bash_completion"
fi
if use systemd; then
targets="$targets systemd"
fi
if use udev; then
targets="$targets udev"
fi
distutils-r1_src_install
doman autorandr.1
local targets=(
autostart_config
$(usex bash-completion bash_completion "")
$(usev launcher)
$(usev systemd)
$(usev udev)
)
emake DESTDIR="${D}" \
install \
BASH_COMPLETIONS_DIR="$(get_bashcompdir)" \
SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" \
UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
TARGETS="$targets"
$(printf "install_%s " "${targets[@]}")
}
pkg_postinst() {

View File

@@ -3,14 +3,16 @@
EAPI=7
inherit bash-completion-r1 systemd udev
PYTHON_COMPAT=( python3_{7..10} )
inherit bash-completion-r1 distutils-r1 systemd udev
if [[ "${PV}" = "9999" ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/phillipberndt/${PN}.git"
else
SRC_URI="https://github.com/phillipberndt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="Automatically select a display configuration based on connected devices"
@@ -18,36 +20,43 @@ HOMEPAGE="https://github.com/phillipberndt/autorandr"
LICENSE="GPL-3"
SLOT="0"
IUSE="bash-completion systemd udev"
IUSE="bash-completion launcher systemd udev"
RDEPEND="
launcher? ( x11-libs/libxcb )
udev? ( virtual/udev )
"
DEPEND="
virtual/pkgconfig
${RDEPEND}
"
RDEPEND="
bash-completion? ( app-shells/bash )
systemd? ( sys-apps/systemd )
udev? ( virtual/udev )
"
src_compile() {
distutils-r1_src_compile
if use launcher; then
emake contrib/autorandr_launcher/autorandr-launcher
fi
}
src_install() {
targets="autorandr autostart_config"
if use bash-completion; then
targets="$targets bash_completion"
fi
if use systemd; then
targets="$targets systemd"
fi
if use udev; then
targets="$targets udev"
fi
distutils-r1_src_install
doman autorandr.1
local targets=(
autostart_config
$(usex bash-completion bash_completion "")
$(usev launcher)
$(usev systemd)
$(usev udev)
)
emake DESTDIR="${D}" \
install \
BASH_COMPLETIONS_DIR="$(get_bashcompdir)" \
SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" \
UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
TARGETS="$targets"
$(printf "install_%s " "${targets[@]}")
}
pkg_postinst() {

View File

@@ -6,7 +6,6 @@
<name>Florian Schmaus</name>
</maintainer>
<use>
<flag name="systemd">Install autorand systemd files</flag>
<flag name="udev">Use udev for monitor detection</flag>
<flag name="launcher">Install the launcher</flag>
</use>
</pkgmetadata>

View File

@@ -1,470 +0,0 @@
From 93e4345e823dbb9d9ee187d1f5b32c6dd7dffdd3 Mon Sep 17 00:00:00 2001
From: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
Date: Mon, 5 Apr 2021 08:17:07 +0000
Subject: [PATCH 1/2] layout: Take into account text purpose again
---
src/data.rs | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/data.rs b/src/data.rs
index e5aa3910..71711c3f 100644
--- a/src/data.rs
+++ b/src/data.rs
@@ -239,13 +239,18 @@ fn load_layout_data_with_fallback(
.map(PathBuf::from)
.or_else(|| xdg::data_path("squeekboard/keyboards"));
- log_print!(
- logging::Level::Debug,
- "load_layout_data_with_fallback() -> name:{}, purpose:{:?}, overlay:{}, layout_name:{}",
- name, purpose, overlay, &name
- );
+ let layout_purpose = match overlay {
+ "" => match purpose {
+ ContentPurpose::Number => "number",
+ ContentPurpose::Digits => "number",
+ ContentPurpose::Phone => "number",
+ ContentPurpose::Terminal => "terminal",
+ _ => "",
+ },
+ overlay => overlay,
+ };
- for (kind, source) in list_layout_sources(&name, kind, overlay, path) {
+ for (kind, source) in list_layout_sources(&name, kind, layout_purpose, path) {
let layout = load_layout_data(source.clone());
match layout {
Err(e) => match (e, source) {
--
GitLab
From 190876903281774bf0f304269ad7f047f44482b1 Mon Sep 17 00:00:00 2001
From: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
Date: Mon, 5 Apr 2021 10:36:41 +0000
Subject: [PATCH 2/2] layouts: Make selection testable
From now on, all the parameters for loading layout are handled inside a single pure function, which makes them possible to test.
As a side benefit, the old preference order function composed of a mess of nested procedures is gone.
---
src/data.rs | 312 ++++++++++++++++++++++++++++++++++----------------
src/layout.rs | 2 +-
2 files changed, 212 insertions(+), 102 deletions(-)
diff --git a/src/data.rs b/src/data.rs
index 71711c3f..29cd4ba4 100644
--- a/src/data.rs
+++ b/src/data.rs
@@ -69,8 +69,12 @@ pub mod c {
let overlay_str = as_str(&overlay)
.expect("Bad overlay name")
.expect("Empty overlay name");
+ let overlay_str = match overlay_str {
+ "" => None,
+ other => Some(other),
+ };
- let (kind, layout) = load_layout_data_with_fallback(&name, type_, variant, &overlay_str);
+ let (kind, layout) = load_layout_data_with_fallback(&name, type_, variant, overlay_str);
let layout = ::layout::Layout::new(layout, kind);
Box::into_raw(Box::new(layout))
}
@@ -113,97 +117,156 @@ impl fmt::Display for DataSource {
}
}
-type LayoutSource = (ArrangementKind, DataSource);
-
-/// Lists possible sources, with 0 as the most preferred one
-/// Trying order: native lang of the right kind, native base,
-/// fallback lang of the right kind, fallback base
-/// The `purpose` argument is not ContentPurpose,
-/// but rather ContentPurpose and overlay in one.
-fn list_layout_sources(
- name: &str,
- kind: ArrangementKind,
- purpose: &str,
- keyboards_path: Option<PathBuf>,
-) -> Vec<LayoutSource> {
- // Just a simplification of often called code.
- let add_by_name = |
- mut ret: Vec<LayoutSource>,
- purpose: &str,
- name: &str,
- kind: &ArrangementKind,
- | -> Vec<LayoutSource> {
- let name = if purpose == "" { name.into() }
- else { format!("{}/{}", purpose, name) };
-
- if let Some(path) = keyboards_path.clone() {
- ret.push((
- kind.clone(),
- DataSource::File(
- path.join(name.clone())
- .with_extension("yaml")
- )
- ))
- }
-
- ret.push((
- kind.clone(),
- DataSource::Resource(name)
- ));
- ret
- };
-
- // Another grouping.
- let add_by_kind = |ret, purpose: &str, name: &str, kind| {
- let ret = match kind {
- &ArrangementKind::Base => ret,
- kind => add_by_name(
- ret,
- purpose,
- &name_with_arrangement(name.into(), kind),
- kind,
- ),
- };
-
- add_by_name(ret, purpose, name, &ArrangementKind::Base)
+/* All functions in this family carry around ArrangementKind,
+ * because it's not guaranteed to be preserved,
+ * and the resulting layout needs to know which version was loaded.
+ * See `squeek_layout_get_kind`.
+ * Possible TODO: since this is used only in styling,
+ * and makes the below code nastier than needed, maybe it should go.
+ */
+
+/// Returns ordered names treating `name` as the base name,
+/// ignoring any `+` inside.
+fn _get_arrangement_names(name: &str, arrangement: ArrangementKind)
+ -> Vec<(ArrangementKind, String)>
+{
+ let name_with_arrangement = match arrangement {
+ ArrangementKind::Base => name.into(),
+ ArrangementKind::Wide => format!("{}_wide", name),
};
-
- fn name_with_arrangement(
- name: String,
- kind: &ArrangementKind,
- ) -> String {
- match kind {
- ArrangementKind::Base => name,
- ArrangementKind::Wide => name + "_wide",
- }
+
+ let mut ret = Vec::new();
+ if name_with_arrangement != name {
+ ret.push((arrangement, name_with_arrangement));
}
+ ret.push((ArrangementKind::Base, name.into()));
+ ret
+}
- let ret = Vec::new();
-
- // Name as given takes priority.
- let ret = add_by_kind(ret, purpose, name, &kind);
-
- // Then try non-alternative name if applicable (`us` for `us+colemak`).
- let ret = {
+/// Returns names accounting for any `+` in the `name`,
+/// including the fallback to the default layout.
+fn get_preferred_names(name: &str, kind: ArrangementKind)
+ -> Vec<(ArrangementKind, String)>
+{
+ let mut ret = _get_arrangement_names(name, kind);
+
+ let base_name_preferences = {
let mut parts = name.splitn(2, '+');
match parts.next() {
Some(base) => {
- // The name is already equal to base, so it was already added.
- if base == name { ret }
- else {
- add_by_kind(ret, purpose, base, &kind)
+ // The name is already equal to base, so nothing to add
+ if base == name {
+ vec![]
+ } else {
+ _get_arrangement_names(base, kind)
}
},
// The layout's base name starts with a "+". Weird but OK.
None => {
log_print!(logging::Level::Surprise, "Base layout name is empty: {}", name);
- ret
+ vec![]
}
}
};
+
+ ret.extend(base_name_preferences.into_iter());
+ let fallback_names = _get_arrangement_names(FALLBACK_LAYOUT_NAME, kind);
+ ret.extend(fallback_names.into_iter());
+ ret
+}
+
+/// Includes the subdirectory before the forward slash.
+type LayoutPath = String;
+
+// This is only used inside iter_fallbacks_with_meta.
+// Placed at the top scope
+// because `use LayoutPurpose::*;`
+// complains about "not in scope" otherwise.
+// This seems to be a Rust 2015 edition problem.
+/// Helper for determining where to look up the layout.
+enum LayoutPurpose<'a> {
+ Default,
+ Special(&'a str),
+}
+
+/// Returns the directory string
+/// where the layout should be looked up, including the slash.
+fn get_directory_string(
+ content_purpose: ContentPurpose,
+ overlay: Option<&str>) -> String
+{
+ use self::LayoutPurpose::*;
+
+ let layout_purpose = match overlay {
+ None => match content_purpose {
+ ContentPurpose::Number => Special("number"),
+ ContentPurpose::Digits => Special("number"),
+ ContentPurpose::Phone => Special("number"),
+ ContentPurpose::Terminal => Special("terminal"),
+ _ => Default,
+ },
+ Some(overlay) => Special(overlay),
+ };
+
+ // For intuitiveness,
+ // default purpose layouts are stored in the root directory,
+ // as they correspond to typical text
+ // and are seen the most often.
+ match layout_purpose {
+ Default => "".into(),
+ Special(purpose) => format!("{}/", purpose),
+ }
+}
- add_by_kind(ret, purpose, FALLBACK_LAYOUT_NAME.into(), &kind)
+/// Returns an iterator over all fallback paths.
+fn to_layout_paths(
+ name_fallbacks: Vec<(ArrangementKind, String)>,
+ content_purpose: ContentPurpose,
+ overlay: Option<&str>,
+) -> impl Iterator<Item=(ArrangementKind, LayoutPath)> {
+ let prepend_directory = get_directory_string(content_purpose, overlay);
+
+ name_fallbacks.into_iter()
+ .map(move |(arrangement, name)|
+ (arrangement, format!("{}{}", prepend_directory, name))
+ )
+}
+type LayoutSource = (ArrangementKind, DataSource);
+
+fn to_layout_sources(
+ layout_paths: impl Iterator<Item=(ArrangementKind, LayoutPath)>,
+ filesystem_path: Option<PathBuf>,
+) -> impl Iterator<Item=LayoutSource> {
+ layout_paths.flat_map(move |(arrangement, layout_path)| {
+ let mut sources = Vec::new();
+ if let Some(path) = &filesystem_path {
+ sources.push((
+ arrangement,
+ DataSource::File(
+ path.join(&layout_path)
+ .with_extension("yaml")
+ )
+ ));
+ };
+ sources.push((arrangement, DataSource::Resource(layout_path.clone())));
+ sources.into_iter()
+ })
+}
+
+/// Returns possible sources, with first as the most preferred one.
+/// Trying order: native lang of the right kind, native base,
+/// fallback lang of the right kind, fallback base
+fn iter_layout_sources(
+ name: &str,
+ arrangement: ArrangementKind,
+ purpose: ContentPurpose,
+ ui_overlay: Option<&str>,
+ layout_storage: Option<PathBuf>,
+) -> impl Iterator<Item=LayoutSource> {
+ let names = get_preferred_names(name, arrangement);
+ let paths = to_layout_paths(names, purpose, ui_overlay);
+ to_layout_sources(paths, layout_storage)
}
fn load_layout_data(source: DataSource)
@@ -231,7 +294,7 @@ fn load_layout_data_with_fallback(
name: &str,
kind: ArrangementKind,
purpose: ContentPurpose,
- overlay: &str,
+ overlay: Option<&str>,
) -> (ArrangementKind, ::layout::LayoutData) {
// Build the path to the right keyboard layout subdirectory
@@ -239,18 +302,7 @@ fn load_layout_data_with_fallback(
.map(PathBuf::from)
.or_else(|| xdg::data_path("squeekboard/keyboards"));
- let layout_purpose = match overlay {
- "" => match purpose {
- ContentPurpose::Number => "number",
- ContentPurpose::Digits => "number",
- ContentPurpose::Phone => "number",
- ContentPurpose::Terminal => "terminal",
- _ => "",
- },
- overlay => overlay,
- };
-
- for (kind, source) in list_layout_sources(&name, kind, layout_purpose, path) {
+ for (kind, source) in iter_layout_sources(&name, kind, purpose, overlay, path) {
let layout = load_layout_data(source.clone());
match layout {
Err(e) => match (e, source) {
@@ -982,11 +1034,11 @@ mod tests {
/// First fallback should be to builtin, not to FALLBACK_LAYOUT_NAME
#[test]
- fn fallbacks_order() {
- let sources = list_layout_sources("nb", ArrangementKind::Base, "", None);
+ fn test_fallback_basic_builtin() {
+ let sources = iter_layout_sources("nb", ArrangementKind::Base, ContentPurpose::Normal, None, None);
assert_eq!(
- sources,
+ sources.collect::<Vec<_>>(),
vec!(
(ArrangementKind::Base, DataSource::Resource("nb".into())),
(
@@ -996,14 +1048,36 @@ mod tests {
)
);
}
+
+ /// Prefer loading from file system before builtin.
+ #[test]
+ fn test_preferences_order_path() {
+ let sources = iter_layout_sources("nb", ArrangementKind::Base, ContentPurpose::Normal, None, Some(".".into()));
+
+ assert_eq!(
+ sources.collect::<Vec<_>>(),
+ vec!(
+ (ArrangementKind::Base, DataSource::File("./nb.yaml".into())),
+ (ArrangementKind::Base, DataSource::Resource("nb".into())),
+ (
+ ArrangementKind::Base,
+ DataSource::File("./us.yaml".into())
+ ),
+ (
+ ArrangementKind::Base,
+ DataSource::Resource("us".into())
+ ),
+ )
+ );
+ }
/// If layout contains a "+", it should reach for what's in front of it too.
#[test]
- fn fallbacks_order_base() {
- let sources = list_layout_sources("nb+aliens", ArrangementKind::Base, "", None);
+ fn test_preferences_order_base() {
+ let sources = iter_layout_sources("nb+aliens", ArrangementKind::Base, ContentPurpose::Normal, None, None);
assert_eq!(
- sources,
+ sources.collect::<Vec<_>>(),
vec!(
(ArrangementKind::Base, DataSource::Resource("nb+aliens".into())),
(ArrangementKind::Base, DataSource::Resource("nb".into())),
@@ -1016,22 +1090,58 @@ mod tests {
}
#[test]
- fn fallbacks_terminal_order_base() {
- let sources = list_layout_sources("nb+aliens", ArrangementKind::Base, "terminal", None);
+ fn test_preferences_order_arrangement() {
+ let sources = iter_layout_sources("nb", ArrangementKind::Wide, ContentPurpose::Normal, None, None);
assert_eq!(
- sources,
+ sources.collect::<Vec<_>>(),
+ vec!(
+ (ArrangementKind::Wide, DataSource::Resource("nb_wide".into())),
+ (ArrangementKind::Base, DataSource::Resource("nb".into())),
+ (
+ ArrangementKind::Wide,
+ DataSource::Resource("us_wide".into())
+ ),
+ (
+ ArrangementKind::Base,
+ DataSource::Resource("us".into())
+ ),
+ )
+ );
+ }
+
+ #[test]
+ fn test_preferences_order_overlay() {
+ let sources = iter_layout_sources("nb", ArrangementKind::Base, ContentPurpose::Normal, Some("terminal"), None);
+
+ assert_eq!(
+ sources.collect::<Vec<_>>(),
vec!(
- (ArrangementKind::Base, DataSource::Resource("terminal/nb+aliens".into())),
(ArrangementKind::Base, DataSource::Resource("terminal/nb".into())),
(
ArrangementKind::Base,
- DataSource::Resource(format!("terminal/{}", FALLBACK_LAYOUT_NAME))
+ DataSource::Resource("terminal/us".into())
),
)
);
}
-
+
+ #[test]
+ fn test_preferences_order_hint() {
+ let sources = iter_layout_sources("nb", ArrangementKind::Base, ContentPurpose::Terminal, None, None);
+
+ assert_eq!(
+ sources.collect::<Vec<_>>(),
+ vec!(
+ (ArrangementKind::Base, DataSource::Resource("terminal/nb".into())),
+ (
+ ArrangementKind::Base,
+ DataSource::Resource("terminal/us".into())
+ ),
+ )
+ );
+ }
+
#[test]
fn unicode_keysym() {
let keysym = xkb::keysym_from_name(
diff --git a/src/layout.rs b/src/layout.rs
index 413795f0..0b8607b0 100644
--- a/src/layout.rs
+++ b/src/layout.rs
@@ -600,7 +600,7 @@ impl View {
}
/// The physical characteristic of layout for the purpose of styling
-#[derive(Clone, PartialEq, Debug)]
+#[derive(Clone, Copy, PartialEq, Debug)]
pub enum ArrangementKind {
Base = 0,
Wide = 1,
--
GitLab

View File

@@ -1,38 +0,0 @@
From 4fdce2802ad3ed8705c9629aa5622c89c70eabae Mon Sep 17 00:00:00 2001
From: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
Date: Wed, 7 Apr 2021 15:26:18 +0000
Subject: [PATCH] layouts: Stop assuming that layout name always changes on
switch
Layout type switching outside of overlay was always done with gsettings in the middle, assuming that all clicks on languages in the popover result in a gsettings event. That's a bad assumption if there's only one xkb lang present.
This is a simple work around. A better solution would be to turn the entire system of layout switching into a central object that receives messages about changes that need to be applied, and then applies them.
---
src/popover.rs | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/popover.rs b/src/popover.rs
index 92103869..0d909b82 100644
--- a/src/popover.rs
+++ b/src/popover.rs
@@ -213,7 +213,16 @@ fn set_visible_layout(
layout_id: LayoutId,
) {
match layout_id {
- LayoutId::System { kind, name } => set_layout(kind, name),
+ LayoutId::System { kind, name } => {
+ unsafe {
+ use std::ptr;
+ manager::c::eekboard_context_service_set_overlay(
+ manager,
+ ptr::null(),
+ );
+ }
+ set_layout(kind, name);
+ }
LayoutId::Local(name) => {
let name = CString::new(name.as_str()).unwrap();
let name_ptr = name.as_ptr();
--
GitLab

View File

@@ -1,157 +0,0 @@
---
outlines:
default: { width: 50, height: 50 }
altline: { width: 70, height: 50 }
spaceline: { width: 160, height: 50 }
special: { width: 35.33, height: 50 }
action: { width: 85, height: 35 }
fkey: { width: 41, height: 50 }
views:
base:
- "1 2 3 4 5 6 7 8 9 0"
- "q w e r t y u i o p"
- "a s d f g h j k l"
- "Shift_L z x c v b n m BackSpace"
- "show_symbols show_eschars preferences space , . Return"
- "Ctrl Tab ↑ ↓ ← →"
upper:
- "! @ # $ % ^ & * ( )"
- "Q W E R T Y U I O P"
- "A S D F G H J K L"
- "Shift_L Z X C V B N M BackSpace"
- "show_symbols show_eschars preferences space < > Return"
- "Alt Esc PgUp PgDn Home End"
symbols:
- "~ ` ´ - _ + = ° © ®"
- "[ ] { } \\ | ÷ × √"
- "; : ' \" · € £ ¥"
- "Del / ? § π τ µ ¶ BackSpace"
- "show_letters show_eschars preferences space < > Return"
- "Ctrl Tab ↑ ↓ ← →"
eschars:
- "F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12"
- "ä è é ö ü Ä È É Ö Ü"
- "à â ê î ô À Â È Î Ô"
- "Del « » ç Ç æ œ ß BackSpace"
- "show_symbols show_eschars preferences space „ “ Return"
- "Alt Esc PgUp PgDn Home End"
buttons:
Shift_L:
action:
locking:
lock_view: "upper"
unlock_view: "base"
outline: "altline"
icon: "key-shift"
Ctrl:
modifier: "Control"
outline: "action"
label: "Ctrl"
Alt:
modifier: "Alt"
outline: "action"
label: "Alt"
BackSpace:
outline: "altline"
icon: "edit-clear-symbolic"
action: "erase"
preferences:
action: "show_prefs"
outline: "special"
icon: "keyboard-mode-symbolic"
show_letters:
action:
set_view: "base"
outline: "altline"
label: "abc"
show_symbols:
action:
set_view: "symbols"
outline: "altline"
label: "[{/"
show_eschars:
action:
locking:
lock_view: "eschars"
unlock_view: "base"
outline: "altline"
label: "func"
space:
outline: "spaceline"
label: " "
text: " "
Return:
outline: "altline"
icon: "key-enter"
keysym: "Return"
F1:
outline: "fkey"
keysym: "F1"
F2:
outline: "fkey"
keysym: "F2"
F3:
outline: "fkey"
keysym: "F3"
F4:
outline: "fkey"
keysym: "F4"
F5:
outline: "fkey"
keysym: "F5"
F6:
outline: "fkey"
keysym: "F6"
F7:
outline: "fkey"
keysym: "F7"
F8:
outline: "fkey"
keysym: "F8"
F9:
outline: "fkey"
keysym: "F9"
F10:
outline: "fkey"
keysym: "F10"
F11:
outline: "fkey"
keysym: "F11"
F12:
outline: "fkey"
keysym: "F12"
Esc:
outline: "action"
keysym: "Escape"
Home:
outline: "action"
keysym: "Home"
End:
outline: "action"
keysym: "End"
Del:
outline: "altline"
keysym: "Delete"
PgUp:
outline: "action"
keysym: "Page_Up"
PgDn:
outline: "action"
keysym: "Page_Down"
Tab:
outline: "action"
keysym: "Tab"
"↑":
outline: "action"
keysym: "Up"
"↓":
outline: "action"
keysym: "Down"
"←":
outline: "action"
keysym: "Left"
"→":
outline: "action"
keysym: "Right"

View File

@@ -71,10 +71,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
BDEPEND="
virtual/pkgconfig
dev-util/intltool
virtual/rust
dev-util/gtk-doc
dev-util/intltool
virtual/pkgconfig
virtual/rust
"
S="${WORKDIR}/${PN}-${MY_COMMIT}"