Merge updates from master

This commit is contained in:
Repository mirror & CI
2021-08-17 17:06:11 +00:00
19 changed files with 255 additions and 53 deletions

View File

@@ -1,9 +1,9 @@
# Copyright 2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EAPI=8
PYTHON_COMPAT=( python3_{8,9} )
PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_USE_SETUPTOOLS=pyproject.toml
inherit distutils-r1 desktop
@@ -12,7 +12,10 @@ HOMEPAGE="https://github.com/FreeLanguageTools/ssmtool/ https://pypi.org/project
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
DEPEND="
SLOT="0"
KEYWORDS="~amd64 ~x86"
RDEPEND="
dev-python/PyQt5[${PYTHON_USEDEP}]
dev-python/simplemma[${PYTHON_USEDEP}]
~dev-python/googletrans-4.0.0_rc1[${PYTHON_USEDEP}]
@@ -22,16 +25,15 @@ DEPEND="
dev-python/bidict[${PYTHON_USEDEP}]
dev-python/pystardict[${PYTHON_USEDEP}]
"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
python_prepare_all () {
# sed to remove the data_files option, which are necessary to include
# data files in the packaged version, but will install files into
# /usr/data if not removed before converting it to setup.py
sed -i -e '/options\.data_files/,+4d' setup.cfg
sed -i -e '/options\.data_files/,+4d' setup.cfg || die
distutils-r1_python_prepare_all
}
python_install() {
distutils-r1_python_install
newicon icon.png ssmtool.png

1
dev-cpp/drogon/Manifest Normal file
View File

@@ -0,0 +1 @@
DIST drogon-1.7.1.tar.gz 465299 BLAKE2B 72ddcc050333f6ff8d0749c3de5a4db80cf5f36613253d90abcbf8983aa53db44a6a4e71b73cc42c0596684b7a56a1cb69faa348652c0fc673e6be7d3ad383b3 SHA512 8a7cb8aa87cc48b130a5b47558b3c9e2a0af13cd8b76681e42d14a366dac75c88e389f2e2fe03b4f0f1e0e31971a47eee2bf5df8fcb4b79f8ed00d2a592315b6

View File

@@ -0,0 +1,64 @@
# Copyright 2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake
DESCRIPTION="C++14/17 based HTTP web application framework"
HOMEPAGE="https://github.com/drogonframework/drogon"
SRC_URI="https://github.com/drogonframework/drogon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE="+brotli examples mariadb postgres redis sqlite +ssl test"
RESTRICT="!test? ( test )"
RDEPEND="
dev-cpp/trantor
dev-libs/jsoncpp
sys-libs/zlib
brotli? ( app-arch/brotli )
mariadb? ( dev-db/mariadb:= )
postgres? ( dev-db/postgresql:= )
redis? ( dev-libs/hiredis )
sqlite? ( dev-db/sqlite )
ssl? ( dev-libs/openssl )
"
DEPEND="
${RDEPEND}
test? ( dev-cpp/gtest )
"
PATCHES=( "${FILESDIR}/${PN}-1.7.1_GNUInstallDirs.patch" )
DOCS=( CONTRIBUTING.md ChangeLog.md README.md README.zh-CN.md README.zh-TW.md )
src_prepare() {
sed -i '/add_subdirectory(trantor)/d' CMakeLists.txt || die
sed -i '/${PROJECT_SOURCE_DIR}\/trantor\/trantor\/tests\/server.pem/d' \
lib/tests/CMakeLists.txt || die
use brotli || sed -i '/find_package(Brotli)/d' CMakeLists.txt || die
use ssl || sed -i '/find_package(OpenSSL)/d' CMakeLists.txt || die
use examples && DOCS+=( "${S}/examples" )
cmake_src_prepare
}
src_configure() {
# NOTE: Next version has BUILD_DOC switch.
local -a mycmakeargs=(
"-DBUILD_EXAMPLES=NO"
"-DBUILD_DROGON_SHARED=YES"
"-DBUILD_POSTGRESQL=$(usex postgres)"
"-DBUILD_MYSQL=$(usex mariadb)"
"-DBUILD_SQLITE=$(usex sqlite)"
"-DBUILD_REDIS=$(usex redis)"
"-DBUILD_TESTING=$(usex test)"
)
cmake_src_configure
}

View File

@@ -0,0 +1,33 @@
From 318327104fa444f764caccc9ad7ae40ae3452ea9 Mon Sep 17 00:00:00 2001
From: tastytea <tastytea@tastytea.de>
Date: Mon, 16 Aug 2021 22:19:46 +0200
Subject: [PATCH] cmake: Use GNUInstallDirs to figure out install dirs.
---
CMakeLists.txt | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 821cf09..9634bfc 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,11 +33,12 @@ set(DROGON_VERSION
${DROGON_MAJOR_VERSION}.${DROGON_MINOR_VERSION}.${DROGON_PATCH_VERSION})
set(DROGON_VERSION_STRING "${DROGON_VERSION}")
+include(GNUInstallDirs)
# Offer the user the choice of overriding the installation directories
-set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries")
-set(INSTALL_BIN_DIR bin CACHE PATH "Installation directory for executables")
-set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files")
-set(DEF_INSTALL_DROGON_CMAKE_DIR lib/cmake/Drogon)
+set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries")
+set(INSTALL_BIN_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Installation directory for executables")
+set(INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Installation directory for header files")
+set(DEF_INSTALL_DROGON_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/Drogon)
set(INSTALL_DROGON_CMAKE_DIR ${DEF_INSTALL_DROGON_CMAKE_DIR}
CACHE PATH "Installation directory for cmake files")
--
2.31.1

View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gentoo@tastytea.de</email>
<name>Ronny (tastytea) Gutbrod</name>
</maintainer>
<upstream>
<doc>https://drogon.docsforge.com/</doc>
</upstream>
<use>
<flag name="brotli">Enable support for brotli compression</flag>
<flag name="mariadb">Add support for the mariadb database</flag>
<flag name="redis">Add support for the Redis database via
dev-libs/hiredis</flag>
</use>
</pkgmetadata>

1
dev-cpp/trantor/Manifest Normal file
View File

@@ -0,0 +1 @@
DIST trantor-1.5.1.tar.gz 102696 BLAKE2B 7670b2e2bb56b703aa387df463433261cff33b5a8682681071ff5159d14a516e11faebde7e2431232ba3651f6420a017491a7468ce3f90c4c099284808e27171 SHA512 9f6664abc94943598805192ee09a98340e6e20efb15e448aac5e21480f1798b0991782d18766f5ef54399251d4980c2f68aeda3136c7e058e3c31623c8f7ce3f

View File

@@ -0,0 +1,34 @@
From 68aa2e7d41002d00c5d3bd3c6a7d55b0ebb8154d Mon Sep 17 00:00:00 2001
From: tastytea <tastytea@tastytea.de>
Date: Mon, 16 Aug 2021 21:43:59 +0200
Subject: [PATCH] cmake: Use GNUInstallDirs to figure out install dirs.
And set initial value for INSTALL_BIN_DIR.
---
CMakeLists.txt | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad5a1b3..44ca114 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,12 +11,13 @@ set(TRANTOR_PATCH_VERSION 1)
set(TRANTOR_VERSION
${TRANTOR_MAJOR_VERSION}.${TRANTOR_MINOR_VERSION}.${TRANTOR_PATCH_VERSION})
+include(GNUInstallDirs)
# Offer the user the choice of overriding the installation directories
-set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries")
+set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries")
set(INSTALL_INCLUDE_DIR
- include
+ ${CMAKE_INSTALL_INCLUDEDIR}
CACHE PATH "Installation directory for header files")
-set(DEF_INSTALL_TRANTOR_CMAKE_DIR lib/cmake/Trantor)
+set(DEF_INSTALL_TRANTOR_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/Trantor)
set(INSTALL_TRANTOR_CMAKE_DIR
${DEF_INSTALL_TRANTOR_CMAKE_DIR}
CACHE PATH "Installation directory for cmake files")
--
2.31.1

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gentoo@tastytea.de</email>
<name>Ronny (tastytea) Gutbrod</name>
</maintainer>
<upstream>
<doc>https://trantor.docsforge.com/</doc>
</upstream>
</pkgmetadata>

View File

@@ -0,0 +1,47 @@
# Copyright 2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake
DESCRIPTION="Non-blocking I/O tcp network lib based on c++14/17"
HOMEPAGE="https://github.com/an-tao/trantor"
SRC_URI="https://github.com/an-tao/trantor/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
IUSE="adns doc +ssl test"
RESTRICT="!test? ( test )"
RDEPEND="
adns? ( net-dns/c-ares )
ssl? ( dev-libs/openssl )
"
DEPEND="
${RDEPEND}
doc? ( app-doc/doxygen )
test? ( dev-cpp/gtest )
"
PATCHES=( "${FILESDIR}/${PN}-1.5.1_GNUInstallDirs.patch" )
src_prepare() {
use adns || sed -i '/find_package(c-ares)/d' CMakeLists.txt || die
use ssl || sed -i '/find_package(OpenSSL)/d' CMakeLists.txt || die
use doc && HTML_DOCS="${BUILD_DIR}/docs/trantor/html/*"
cmake_src_prepare
}
src_configure() {
local -a mycmakeargs=(
"-DBUILD_TRANTOR_SHARED=YES"
"-DBUILD_DOC=$(usex doc)"
"-DBUILD_TESTING=$(usex test)"
)
cmake_src_configure
}

View File

@@ -1,28 +1,19 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
PYTHON_COMPAT=( python3_{8,9} )
#DISTUTILS_USE_SETUPTOOLS=rdepend
EAPI=8
PYTHON_COMPAT=( python3_{8..10} pypy3 )
inherit distutils-r1
# This package uses rc1 without the underscore which is not supported by
# portage
VNAME="4.0.0rc1"
S="${WORKDIR}/${PN}-${VNAME}"
MY_PV=${PV/_/}
DESCRIPTION="Free Google Translate API for Python. Translates totally free of charge."
HOMEPAGE="https://pypi.org/project/googletrans"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${VNAME}.tar.gz -> ${P}.tar.gz"
HOMEPAGE="https://pypi.org/project/googletrans https://github.com/ssut/py-googletrans"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-${MY_PV}"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
RDEPEND="
dev-python/requests[${PYTHON_USEDEP}]
"
RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}"

View File

@@ -1,16 +1,15 @@
# Copyright 2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EAPI=8
PYTHON_COMPAT=( python3_{8,9} pypy3 )
PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_USE_SETUPTOOLS=bdepend
inherit distutils-r1
DESCRIPTION="A simple multilingual lemmatizer for Python."
HOMEPAGE="https://github.com/adbar/simplemma https://pypi.org/project/simplemma/"
SRC_URI="https://github.com/adbar/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
DEPEND=""
LICENSE="MIT"
SLOT="0"

View File

@@ -1,2 +1,2 @@
DIST cyclone-0.28.0.tar.gz 3683280 BLAKE2B 7f5e5982104094bbadc9cde545b3d9d21b3f000136ff07543b4fd4f8a5e79799b8adf8c480bc65f15645e62ec9ae5cccc9c5ae9305334ae2ef080eab6d730045 SHA512 e106a0ef779a4829b729a928e30cf80409e6fe6bb14859c595098e0bfe18fcd5d9ba8859d607a55ec2f97b2c58ec8ccb3405b41de34044994441889718c6caec
DIST cyclone-0.31.0.tar.gz 3936909 BLAKE2B 6439501caa0cb92fe2bb5c59b452b13ac4206c62ce4ddfb3e459c1160ee0904b4720f3b8506b71eab67841b72a1b96ffc31283946fc91da285c8ba7ca75d4d4d SHA512 f0a5d7c6890183ccab65028f43be2080dcf7d44b80a254f176ffa034c04a2701266febbc3f91072e58175bc84eb86a839dab1dbb3674868128ef3d8e650c91c9
DIST cyclone-0.32.0.tar.gz 3936913 BLAKE2B b3d33e664eca32eb23e448bbd9a50bcc209be7dea00f988ccbca4b1b431daac9b797409b4aee11ea9a074ee4b9b4ef7e6d7ee336b10dbf7b6ff72ce94598d066 SHA512 9a2c24f667e148fc87c6a87eed5c96ddab7e47f804fe1d725a1d13411dd66acc910c0ab138f34c0eb57c7c496ed0f4d9ff33bd71f750b08eeed60664cccfa056

View File

@@ -1,2 +1,3 @@
DIST libcall-ui-465f6add090b623fb80c6c5cbb9ab2880ff531a4.tar.gz 50329 BLAKE2B 218635af4f1a6076198746a038a522f56648f2e058a7cf874033da3b533683acde5edc482d824b56402a939c16e1003f61747c158b5beb9a82c2836400afc9d3 SHA512 d11de7b15777f175d0a2323cd7b6a07f76b1ccd1e01a4948084b2e950f356f80357604dd95853c60fa49c812d2e981d0899ade1ce7d933f0f9e32fc8c44807eb
DIST libgnome-volume-control-c5ab6037f460406ac9799b1e5765de3ce0097a8b.tar.gz 46481 BLAKE2B 7ea8424d640d71361905e2eff346f45e024f9cd430cc8cc92c53d8cf72a8ea312c00bdbd0d9c25f499e1af2122fcafbf08a600d69f053ff9fa04baeb44283ccf SHA512 368d56223907d3eaafd35fce643abddf00e963800eebe98fb5cbe6fbbd8da115d1afb93bd5d557167e787579e3ff8b8e7885cae74d8f0326b45085870ac8cc05
DIST phosh-v0.12.1.tar.gz 477007 BLAKE2B 2b5f78cb07c10522832ca499fae86d0e27d6b2d1bcbfcef4631a6f23c17da455aa40f664e3bc6fb3e15701aef3eebac2ef1e8287c2d051b7db6ca3816578aa1b SHA512 dddc76e069ff35954411ba2cce5dd12732dd9f1afe8762078d53c061c98afd9486c76bc9423fb909d70e56dac446062dfb65101b40b3871c80ef52f027c2c924
DIST phosh-v0.13.0.tar.gz 491512 BLAKE2B 5d459c15195ae966a363120d88d6dbbe08d811a479c09447f092ebb7e3e78b781c8e1e173db2005df2d157d5a9b44b5d8ac8edf6d8fd53f857223d6f6d1966d7 SHA512 6e398ab55007d05be5b3e2e2523d4d2d7df483efbfe1df5fadeae3eae032adf0aba828914e4645e9938c60db4518d96be55f3fe195c9880a181519548f93feb9

View File

@@ -1,5 +1,15 @@
<?xml version='1.0' encoding='UTF-8'?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<maintainer type="person">
<email>gjdijkman@gjdwebserver.nl</email>
<name>Gerben Jan Dijkman</name>
</maintainer>
<longdescription lang="en">
A pure Wayland shell prototype for GNOME on mobile devices. For a matching compositor see x11-wm/phoc but others implementing wlr-layer-shell should work as well.
</longdescription>
<upstream>
<doc>https://source.puri.sm/Librem5/phosh</doc>
<bugs-to>https://source.puri.sm/Librem5/phosh/-/issues</bugs-to>
</upstream>
</pkgmetadata>

View File

@@ -6,13 +6,15 @@ EAPI=7
inherit desktop gnome2-utils meson pam readme.gentoo-r1 vala systemd xdg
MY_P="${PN}-v${PV}"
MY_COMMIT="c5ab6037f460406ac9799b1e5765de3ce0097a8b"
LVC_COMMIT="c5ab6037f460406ac9799b1e5765de3ce0097a8b"
LCU_COMMIT="465f6add090b623fb80c6c5cbb9ab2880ff531a4"
DESCRIPTION="A pure Wayland shell prototype for GNOME on mobile devices"
HOMEPAGE="https://source.puri.sm/Librem5/phosh"
HOMEPAGE="https://gitlab.gnome.org/World/Phosh/phosh/"
SRC_URI="
https://source.puri.sm/Librem5/phosh/-/archive/v${PV}/${MY_P}.tar.gz
https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/${MY_COMMIT}.tar.gz -> libgnome-volume-control-${MY_COMMIT}.tar.gz
https://gitlab.gnome.org/World/Phosh/phosh/-/archive/v${PV}/${MY_P}.tar.gz
https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/${LVC_COMMIT}/libgnome-volume-control-${LVC_COMMIT}.tar.gz
https://gitlab.gnome.org/World/Phosh/libcall-ui/-/archive/${LCU_COMMIT}/libcall-ui-${LCU_COMMIT}.tar.gz
"
S="${WORKDIR}/${MY_P}"
@@ -44,7 +46,9 @@ src_prepare() {
default
eapply_user
rm -r "${S}"/subprojects/gvc || die
mv "${WORKDIR}"/libgnome-volume-control-"${MY_COMMIT}" "${S}"/subprojects/gvc || die
mv "${WORKDIR}"/libgnome-volume-control-"${LVC_COMMIT}" "${S}"/subprojects/gvc || die
rm -r "${S}"/subprojects/libcall-ui || die
mv "${WORKDIR}"/libcall-ui-"${LCU_COMMIT}" "${S}"/subprojects/libcall-ui || die
}
src_install() {
@@ -52,13 +56,12 @@ src_install() {
meson_src_install
newpamd "${FILESDIR}"/pam_phosh 'phosh'
systemd_newunit "${FILESDIR}"/phosh.service 'phosh.service'
domenu "${FILESDIR}"/sm.puri.OSK0.desktop
insinto /usr/share/applications/
doins "${FILESDIR}"/sm.puri.OSK0.desktop
DOC_CONTENTS="
To amend the existing password policy please see the man 5 passwdqc.conf
page and then edit the /etc/security/passwdqc.conf file to change enforce=none
to allow use digit only password as phosh only support passcode for now
"
DOC_CONTENTS="To amend the existing password policy please see the man 5 passwdqc.conf
page and then edit the /etc/security/passwdqc.conf file to change enforce=none
to allow use digit only password as phosh only support passcode for now"
readme.gentoo_create_doc
}

View File

@@ -1 +1 @@
DIST hin9-v0.9.9.tar.gz 90575 BLAKE2B 9860970c9296f78bbb9deefe44b9d71e0ae0ad30b98302e36810506ef36ef44e39998407730400e0da7093abb77aefdf49b1cca90eac48f6fbe2c3080a1f31ae SHA512 cc384cc1c321209ebf0f96f95aad28051a8f90038a4e626caf292a61c0a0e7bc5b514fde6f64c3275f5e25ea846d5817e1a6daa2cc18f3b60b760a55f400fd28
DIST hin9-v0.9.10.tar.gz 91078 BLAKE2B 0209ebfb59ffe2f4c0e71f5c33fc364b65297e94101622505618ea58af22f04439fd5004b7df25a7ac98616b03749bdc10183af7bb48c10311dad6c1b8f56e35 SHA512 8e7a66d4fa173c5b74947ed2e8d075d91a3ff07f896892c1908e2d9fbe52912056b2d63d6106e32085f2178f98f512bafc7223e80343c094cd69229ddab24c4d

View File

@@ -81,10 +81,4 @@ pkg_postinst() {
ewarn "hinsightd requires io_uring and kernel ~5.6.0"
ewarn ""
fi
ewarn ""
ewarn "hinsightd requires a higher than default RLIMIT_MEMLOCK for"
ewarn "things like graceful restarting"
ewarn "memory limit can be increased in /etc/security/limits.conf"
ewarn ""
}

View File

@@ -81,10 +81,4 @@ pkg_postinst() {
ewarn "hinsightd requires io_uring and kernel ~5.6.0"
ewarn ""
fi
ewarn ""
ewarn "hinsightd requires a higher than default RLIMIT_MEMLOCK for"
ewarn "things like graceful restarting"
ewarn "memory limit can be increased in /etc/security/limits.conf"
ewarn ""
}