Merge updates from master

2026-07-15 18:13:10 -04:00 · 2021-04-27 23:34:57 +00:00
parent 0486956d7d c35a513312
commit 4e7269c829
64 changed files with 1541 additions and 190 deletions
--- a/app-crypt/tomb/tomb-2.9-r5.ebuild
+++ b/app-crypt/tomb/tomb-2.9-r5.ebuild
@@ -3,7 +3,7 @@

 EAPI="7"

-inherit desktop qmake-utils xdg
+inherit desktop qmake-utils toolchain-funcs xdg

 MYP="${P^}"
 DESCRIPTION="Tomb :: File Encryption on GNU/Linux"
@@ -62,6 +62,7 @@ BDEPEND="
 "

 src_compile() {
+	export CC=$(tc-getCC)
 	export PREFIX="${EPREFIX}/usr"
 	emake

--- a/app-editors/bluegriffon-bin/bluegriffon-bin-3.1-r1.ebuild
+++ b/app-editors/bluegriffon-bin/bluegriffon-bin-3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -9,51 +9,61 @@ DESCRIPTION="The Open Source next-gen Web Editor based on the rendering engine o
 HOMEPAGE="https://github.com/therealglazou/bluegriffon http://www.bluegriffon.org/"
 SRC_URI="http://bluegriffon.org/freshmeat/${PV}/bluegriffon-${PV}.Ubuntu18.04-x86_64.tar.bz2 -> ${P}.tar.bz2
 http://bluegriffon.org/BG_files/bluegriffon.png -> ${PN}.png"
+
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
+
 S="${WORKDIR}/bluegriffon/"
 XDG_ECLASS_DESKTOPFILES="${FILESDIR}"
 XDG_ECLASS_ICONFILES="${FILESDIR}"

-BUNDLED_DEPEND="dev-libs/nspr
-		dev-libs/nss"
-DEPEND=">=sys-libs/glibc-2.30-r8"
-RDEPEND="${DEPEND}
+BUNDLED_DEPEND="
+	dev-libs/nspr
+	dev-libs/nss
+"
+
+DEPEND="sys-libs/glibc"
+
+RDEPEND="
+	${DEPEND}
 	${BUNDLED_DEPEND}
-	x11-libs/gtk+:2
-	virtual/opengl
-	x11-libs/cairo
-	x11-libs/pango
-	dev-libs/gobject-introspection
-	x11-libs/libxcb
-	x11-libs/libXrender
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	media-libs/freetype
-	x11-libs/libxcb
-	x11-libs/pixman
-	media-libs/libpng:0/16
-	sys-apps/util-linux
-	media-libs/harfbuzz:0/0.9.18
+	dev-libs/dbus-glib
+	dev-libs/expat
 	dev-libs/fribidi
+	dev-libs/gobject-introspection
+	dev-libs/libbsd
 	dev-libs/libffi:0/7
 	dev-libs/libpcre
-	dev-libs/expat
 	media-gfx/graphite2
-	dev-libs/libbsd"
-BDEPEND=""
+	media-libs/freetype
+	media-libs/harfbuzz:0/0.9.18
+	media-libs/libpng:0/16
+	sys-apps/util-linux
+	virtual/opengl
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/pango
+	x11-libs/pixman
+"
+
+QA_PREBUILT="/opt/bluegriffon/*"

 src_install() {
 	dodir /opt/bluegriffon
-	cp -ap "${S}"/* "${D}"/opt/bluegriffon/
+	cp -ap "${S}"/* "${ED}"/opt/bluegriffon/ || die
 	dosym ../../opt/bluegriffon/bluegriffon-bin /usr/bin/bluegriffon-bin
 	doicon "${DISTDIR}/bluegriffon-bin.png"
 	domenu "${FILESDIR}/bluegriffon-bin.desktop"
--- a/app-editors/bluegriffon-bin/metadata.xml
+++ b/app-editors/bluegriffon-bin/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>marco@scardovi.com</email>
+		<name>Marco Scardovi</name>
+	</maintainer>
 	<longdescription lang="en">BlueGriffon
 		The next-gen Web and EPUB Editor based on the rendering engine of Firefox

--- a/app-misc/far2l/Manifest
+++ b/app-misc/far2l/Manifest
@@ -1 +1,2 @@
 DIST far2l-2.3.20210419_alpha.tar.gz 5441978 BLAKE2B d8878704d5928d5240e1cdcf32dc3e2bd298c3a283811ae29a9cff36c20d1ae8b655ea5355f7c41660eb91b6e53b6c26cf66e93f7d4fc59e12ad3ee1e2cac4b0 SHA512 99b98f5946ce93ddbd93a9d26ce4db22ee687e7c9cbaab53b0087896a9a8247041064614b489d5e6e0a0d4ead72057db5bcbdbf6b060e36b9eb4f61aa30dec38
+DIST far2l-2.3.20210426_alpha.tar.gz 5441382 BLAKE2B d6f1c2611d4c149755bf7bf7b25428030489f56b3ff5a0f8a5d4703b2229c45a4d35ec6ce3b7b90681690135028678b29cd3062be5fe74eb5a4494edfe3a2b93 SHA512 28a4e819c36815d8e754ea04b57631ee61d5c48ecfe32ce7d7a45564d8f3e08dd8cdcc5a34d3c8c4abc45b143d819c286ad95cbdc281c6b94e8599ff3acdcec3
--- a/app-misc/far2l/far2l-2.3.20210426_alpha.ebuild
+++ b/app-misc/far2l/far2l-2.3.20210426_alpha.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit cmake xdg wxwidgets python-r1
+
+DESCRIPTION="Linux port of FAR Manager v2"
+HOMEPAGE="https://github.com/elfmz/far2l"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/elfmz/far2l"
+	EGIT_BRANCH="master"
+else
+	MY_PV="${PV:4:4}-${PV:8:2}-${PV:10:8}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/elfmz/far2l/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+ssl sftp samba nfs webdav +archive +wxwidgets python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="sys-devel/m4"
+
+RDEPEND="dev-libs/xerces-c
+	dev-libs/spdlog
+	app-i18n/uchardet
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	ssl? ( dev-libs/openssl )
+	sftp? ( net-libs/libssh[sftp] )
+	samba? ( net-fs/samba )
+	nfs? ( net-fs/libnfs )
+	webdav? ( net-libs/neon )
+	archive? (
+		dev-libs/libpcre2
+		app-arch/libarchive )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/virtualenv[${PYTHON_USEDEP}]')
+	)"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+
+pkg_setup() {
+	if use wxwidgets; then
+		setup-wxwidgets
+	fi
+}
+
+src_prepare() {
+	sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_askpass)::" -i "${S}"/CMakeLists.txt || die
+	sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_sudoapp)::" -i "${S}"/CMakeLists.txt || die
+	sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/objinfo/plug/objinfo.far-plug-mb)::" -i "${S}"/CMakeLists.txt || die
+	sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/farftp/plug/farftp.far-plug-mb && echo Removed existing farftp plugin)::" -i "${S}"/CMakeLists.txt || die
+	sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/python/plug/python.far-plug-wide && echo Removed existing python plugin)::" -i "${S}"/CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSEWX="$(usex wxwidgets)"
+		-DPYTHON="$(usex python)"
+		-DBUILD_SHARED_LIBS=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install(){
+	cmake_src_install
+	einstalldocs
+	dosym "../../bin/far2l" "usr/lib/far2l/far2l_askpass"
+	dosym "../../bin/far2l" "usr/lib/far2l/far2l_sudoapp"
+}
--- a/app-misc/watchexec/Manifest
+++ b/app-misc/watchexec/Manifest
@@ -11,17 +11,24 @@ DIST clap-2.33.1.crate 201567 BLAKE2B 7bb63b6a243eb33050e5354622fb544ba6db3b8590
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST darling-0.10.2.crate 17620 BLAKE2B 33d1fc3dc10fc971ea304efe5bf8084843241ca9c2a89e54e7c5227e53b1ad86749bd8693989ced6bf17805001909033aff92d600e7169a02dccf009fe60a88a SHA512 b312a74e577cb2f889315ae42513c7f26597faff306a40281189be2101339661772016a5e197466bd85ef94c275e811adee1b7c0772458126677d1998ed6fb15
 DIST darling-0.12.3.crate 18933 BLAKE2B 1f817e2f32b8fc6459cec4f05933ad734720ade175c9cd44767b3351f1c07f2a66dedf1c3ce40c14b30d2c18204355d6a2ad65b819c4ead143b4d26b1e6fbd17 SHA512 1e986c70d629e14d67ffee4e9ec1520c04f6f27599dc3a2df3312ace3ef81f435bff9a8573badb8385bddee188db8eaefa35f562fb83a14269e82c4a425eade0
+DIST darling-0.12.4.crate 19031 BLAKE2B 460587ac5f11ce01116da6c07c1bb0c94da24bd5f3003de028ff772af2111ffc3ec4db1fcb4e732763c441dd8c449297c778854f8b40387b311b3d5086263c67 SHA512 12358298bbbe4c18a6b8b1ff838c210806980973f7fa2307af97f0b33df2e3f1bb43dc2b990b5e8bbdd4f8ec97e1785ece556ada8ad6d6957f9dfb37316ab7a6
 DIST darling_core-0.10.2.crate 44339 BLAKE2B 3ab3762840aa869baccf1030617a2a534c5d63019deb7ec5848cf4f80aa6304307ae32c4425264f1fda220a502110549812112d08f0f60261b30731ee47335af SHA512 a0af8e8ebb8584973c20eac01fe9ae828744b5e86cbe268262f8710a2e0ad568bbc6cd051d5225cc536a0a1fcb1886233063c8c18ea16b45c47207ce64af89d9
 DIST darling_core-0.12.3.crate 49266 BLAKE2B d6286b82db56ebf63d0025b9298eb6cffac91166e90a785ceca4f3785f3c8589f8070a1c96242a3b482c4225f4530cebd34503483ae5b38d83848aae5b6c4bcf SHA512 279e3bf0f3cdd39ce68d6fdc80ab9e390353d2572887d6a25f4659d24dafd962bcd204f047fe19f8216acf08fe1bb2feeccc7c416df795e2d0f3d0fdcb82e9a3
+DIST darling_core-0.12.4.crate 49742 BLAKE2B 72f2b7994565f56bf369ee74658da4fcc15712f001754797bb066c5ef0e6b1669b1ff5ee3145ee1cd26dcf92c184f911288db187b686c333762812ab23ca78e7 SHA512 0e89867284cf34506d0dee4423120c8e1f40efcc66d510e111959fe0c8eecc956b9a03c85b81ea0489be067b18113586909d1ee36f78495b123e4d64d41b300f
 DIST darling_macro-0.10.2.crate 1919 BLAKE2B 6f07815ff5b333b6c34df08f3aec2e5af5385e60a94bf9d169701be19935d2a9292ec7396905d2caadddba38d3f70bc5e5c3f1167690f045b778b8fc8cb00985 SHA512 43a0e9091fe12ec986e229a73bc41e23b1815fecfe62df8eed74d2ef33f5c329c444f1568d3c966554ff0bb29220146ba8f30d1c2d77ed7dea9adea10dacd152
 DIST darling_macro-0.12.3.crate 1866 BLAKE2B 766fd2d30dffb53553036df283c3cf95c0f472654c222ab44fd9bfe2936ebb688e16ef937990625d1dac2613a689770fb61485f7f9f60b19c71889f1edd044a9 SHA512 e55d05676b9751e5c067d736f3e2446c1d751d8a24607d5bd5d494d660aa474485fb5f781ce1dfc739061683aa4fbf912c12f839869e4ae26d49f385da9bfdf6
+DIST darling_macro-0.12.4.crate 1866 BLAKE2B 67832eb0da1abeebfdb1a883ea31bc919589d259e4ae03a8ffd9bbc242907204985f7e3c5f041b52acab41fa8055b19eb6c3ef2e05f63b0c437cd92a974f2cc3 SHA512 324c778f4243b0d34d10998dd1ef7f911fba9392928eb8626c8ce389c599f6fe39791b1558a4480d366bdaea8be78f9d6a4f7ded48a4a020e721bda240804e1f
 DIST derive_builder-0.10.0.crate 29400 BLAKE2B ed2039d6ebd84d1fe2bc9c83389517e41ebf797dd583b1983ea5c7cc67013a267c58d36c8c2b3aa258f0ec8066db6aeadc2fd8039088d3a7f96641e4d6c92859 SHA512 deab62e921a3ee8f8ba50842a29c6a18d8a0d2475e1475fb69cbbe57844e2fd16e7bea1ec9f8312c8e2902c8f19ea0515fa810f9b845f61a3dc6e5096148bb26
+DIST derive_builder-0.10.2.crate 29777 BLAKE2B ee35b2093c9fd49a24778972df7e62fa28ff766493f2a6348d7542b347811c5c48a4a4d15b160ae4f62a9ad4826e8ffab17c391b9c67eaad73cac20433958bbe SHA512 1d76ced2c6c566eee5bbe44cb437c863396f989d0f850ec2d269fb90621e8a9445e68062ec1d8eabd0fb3dbc5ccb827bc6d13d74023282f82015f84d926eb221
 DIST derive_builder-0.9.0.crate 38161 BLAKE2B 08bcbf8851ba813627a56e3f93a95f08a938e0cdd4f2a7971961eb5ecbdd3c96f6143214b49d8ae6cf6be166a934208ff7d0f768a3408868cab093872860e7dc SHA512 e56a01ed13420ac024be394883e5cf148f83ea74d2488931216d84cd2e8f00953e2d61f9b81d34f18be40bda055c02614baeaa89d5fbb9d3defe9ed314f2ef95
 DIST derive_builder_core-0.10.0.crate 24860 BLAKE2B 100db93ca9e3d1af25ec14c7444d26d77e123e4011123bc32c8cb50f0a841958ec167592dcc083419d0d11ed827443d276a568cdabe89ccab022bfcdb6daebf1 SHA512 4448c5fec5f2092bc610eedb75e73b6f541189b14e3dad174ad42d38e1c2cdca9fe26836f6c9b5478a9267bbd0abc716e9071315531c569bd99f89c0d38fe666
+DIST derive_builder_core-0.10.2.crate 24691 BLAKE2B 4336ef5879dad9dc442b771644df2067767dc43a105ae99337573e9f53584289c4ae553ca980a1529b0b2d4a5263e74d5c58f087391dd5b32d0a1ae5e8647ece SHA512 4037d4dff2f2ade95135e28f05c0bfd792acd0faf4edb8bcc6f04b4032f222bbe9251910b79735b162101445f5f17264b8e8b9318a30aeb65c9a7ae1b178cc07
 DIST derive_builder_core-0.9.0.crate 18328 BLAKE2B b7a70372bf9300a2957927dc6bf45d64ff923552d2aff463e9811cf295d8bf300f8e3a03c73d08e1f727e91bb0eca2d34e332bd65a1b43506b9d486e559c879a SHA512 432e17868ffbbf6e776ae885eac33617ce06e5f1cb9610e2ced4f17a0d2aa46d3576ec3249f92275379d875cd90dd86ba4de882089ad620fe6497fcd301e4fdf
 DIST derive_builder_macro-0.10.0.crate 6210 BLAKE2B 6a8ad9113bc5685ec57ff0bab162bcf057e8179c0a6cbb3b484b763fcbdeed451f46e6418545f2751c30d8463b0d6dcad6b6a4bcafb8d5df901dd0fe64e8acd2 SHA512 2dc7a33d6009006f736fc06502377ef06b818280811fae3ec946bc80a77457f6b586c2cfe7bdeeb1dbc29d970319c0575d693ec679e27bd7e3c4a029c1a55b5d
+DIST derive_builder_macro-0.10.2.crate 6210 BLAKE2B 00de51ccd227cfaf16cf7f35c8144c7be63dca0584afcf528aae862cd15d73d4d59549d3f8dd39990fef43cdf601cdd5232cd8b9d0a925e28c1edc3ec505695b SHA512 36356bf7e2f6c56b0856c1df0c04388d8d0d1f6e5843396276c3cc2b2c39cc649d6cb08f54b91eb0e2fb3dcd30a9dcb29e98f769f840ca725c9e9a62dc3827eb
 DIST embed-resource-1.3.3.crate 10472 BLAKE2B fcb0e869b2e49a53644d4f2b6bf82be0b50b54c69905b650c3f4aa51d697dc70e47a095420045b7134c6116d1559556de13d959612225799ef0ae3ea894a772c SHA512 a979520d08c823e77d9d3ffdd3ded74c235c2eebe16aef07180f4c0b39ca2a603cb538c45f1ce76d28b682c33856f7f9a1dfcd4c0a1e31c054ca79facb5b2741
 DIST embed-resource-1.6.1.crate 12283 BLAKE2B d5d864f88e8304d9d590f9c34c77bb423a841b9827ec0fdc32eb8b3a65680aa8383b68d6d7b9a78ddfcdd4819d177183fe76732ac6c9c23b5eb964269fbbd140 SHA512 12ebaa77ede4c5e7ae2629e96c1ecbd9aa6cc1223e322363e56b517bca4a89d789bb67f6d28b7c2c54ade7a0442e6ad7d57dc79dff6e80909a6d87869b702fb1
+DIST embed-resource-1.6.2.crate 12401 BLAKE2B 6dd36525acac8f69146914d1d8788589a07589775d88db8df3fd14875c4946cacbe78be48e74e442d992d278a69262af131a9ec9ca546bcf711ae93cdbdc9bfd SHA512 4bfb51208acfd469e3eb2ac21a266d7041e62838fc7c505f1853cd5766c2ab00fd0c7aeac01dffbca05e28842d20120d19984ab6d2c7a023dad61a1d2ff30c6b
 DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
 DIST env_logger-0.8.3.crate 32543 BLAKE2B 513790f39c63eb096b0fb62687c74262b42b0edc3e6fc2e2f2fdd44463eb4cfbf67560136ec206e252afa1477fabf66917f4fc0e8192e040670f98f3d7c4bb51 SHA512 7f6c3c79b8f4efb8d1d4e4b879c1c78a427f15669244ce1eca869aea9bcad950ffa5b59f3f8e4513e085c2daf1f5857313b374e238fc78b731bba2646ec895ff
 DIST filetime-0.2.14.crate 14358 BLAKE2B 7d50e71b5a556bc24a6bcf737ec07f185c6d6a2ba2717d91aaba71ec15d1981c47dd6010e5a4278f8996e05bd49d04f3481f0b9e3156a8ad1da1cf39a84796d6 SHA512 f2e6e41b8b705c510e1f1932451ab8a0acc6a4f84a7a21880c7e69639a6aace7c5ed4f694ebf47d04ae6ff227f8d6c6733f2c4bcb953088531dd91b37262e45b
@@ -71,14 +78,17 @@ DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd9
 DIST redox_syscall-0.2.6.crate 23631 BLAKE2B f594cc615c2c05a053598e6a1bec6488b7972dae2680afcc1012ccbae6cc79169775c0ec8a0ff526846b05222d5be18785d495b964ffbf97fe2e2812a29ea75c SHA512 91137f511d6fd9a7acc755c63703cfba021a2fbb8fec3ac25a4a4b2e67147f4d5dca6cb53c2d49ca0824af3b536c63f617855b08ab345b201070885e082251bf
 DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
 DIST regex-1.4.5.crate 241716 BLAKE2B 6e818193ae1bc8edb2415d82946227ac24b5ef9fc99097d4bff1574a5b1accfd33ea04e38be4f3321c0a498888b2feb99c5ae4611974c79cf4a44d5d38c7fc3d SHA512 9ddcbc7a69df47ef1321c45b681ac2e08c693a7ab0de9b877dbb6eb6a5b07788bfb8444f3e644460bb2a7ad9a768567e0366aa34df2b9453036385dbfd39b85a
+DIST regex-1.4.6.crate 242248 BLAKE2B 4e54699a290fe8952f718709292c726167fa5064407dba2f9e8ed7ba98aee9333bb1ee807c104916b33cbb27eacc6e36b673a23ad0e5af8aefc189b4a5993ea0 SHA512 e789ee66bc37d44efbf9e9c210c3ddc371d9483d6f96d7367b861ee0e0abb5c8abf6ebcad9d3c3fb97f772a5ca91184ca6d36a1a78dd51b43f3279e4048c299c
 DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
 DIST regex-syntax-0.6.23.crate 293195 BLAKE2B cc7c951f252fbc814d12e4276728ee0fb9fc381e5c6b3f9ed2204904ce36ec29d95278db00ebed7268ff65165c19b30b0d959e7e5bb26c96538bb3aa7288d724 SHA512 d4f41e40c1460ee95fd96514a3accb4eaa6c125b47abf66ea7b0b60267c0ab112c51c1877d71bf1cfe4f9277f95617f5047058b2a3da91dc24aa5c1cf2781f34
 DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
+DIST slab-0.4.3.crate 15681 BLAKE2B d7e3eb0374de081d1870d2b46c9137e5ec75950a8fec217e3b120e455fe847e9245884990fbff4d01d512ea297c2012cb1a64f9b169264168081f5f7d6b20b39 SHA512 8649f32f26c1354b3281534fa0e062a145b62813c46f9ff5989ae688154221b00ed1b8c044c67a4b78c00a2e3478a8eb9c1c96fb424c24cd6cefd4df875fbb15
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
 DIST strsim-0.9.2.crate 9707 BLAKE2B e6f99a4292bdc2c83027b7686eb46b0524b8404949269f7fcd5d1af4c86d28422f3192d09512e8f20447b6361cc936b5cdd62a45d0ec513161677c87e37c23bf SHA512 2054444ea844a25f573219a4993986b69ff8c5dc0dfd2dd06fff638d596c8c5b5a1bedafc2bef3a1b9c146dd47a0769bbe039c54fd8e2a5d9894f29ab9f32838
 DIST syn-1.0.69.crate 231954 BLAKE2B 1dde7e78cdbf5c5b93d0196e008dd4e92e4367f8e88395d6157b92a58cd9317dbb6e47caf2d570a5a9fb6b4fdd4fdea5e414eb9b04e054ec4e4dde8bb9f36a96 SHA512 6934423e48f8d6b1e403fe5e4bb2e180f472f125f4337b7d9889788c16cf11d79d1673ed06178604279e0b8a04bd80f7efba187cc8fa44c535457eb1b4f51c20
+DIST syn-1.0.70.crate 232235 BLAKE2B 82419a782ae7b18aed56d2fb72c75fc327916f9e45a4ccb2a34b230deefdb417027ad378309e1d4efff63023899af5071a325aa1694f44b70083652a9c3ba859 SHA512 b739d0d64bca533d4d570945976bbc046409bad891ce98e78771f36735cbe3436c4e328999014be6a2fe4472e878de3ef72246be9251d25a047934289ca8db47
 DIST syn-1.0.8.crate 191978 BLAKE2B 9c4f925cf437c8baec1d0bc347454096124e996f1c26ef27fbb0ccbef087ba7a5eb780f4e1f87037568e93c7b7fea2963e2782621c0ab04e5c33ef98349e97fc SHA512 314229610133a1c1db1d60b549846e7b9f9c50ac345ca59d6fbfb263b828653be7fac0f56fd88312162138d85b915dc994ea651c1f9ac591c9c56c53a1738093
 DIST term_size-0.3.1.crate 10754 BLAKE2B b8ed33afdf8348d9be3200b33b18d121d86fe5a91b6ecd3a8f7a4e55b45910597738fd68c568b5c66feb2cf9d38ba62da705624b52ff01d30bb452c7eca8f6e8 SHA512 fb43e0519cc3371b23b3d4c52d25c59c3e45afc550ba081e8cb832a48d9dbd50cbb69bb154ae7926fe869eb2c35b72b95238cdb8822910bd68b4f65927ca6a5f
 DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
@@ -96,6 +106,7 @@ DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a
 DIST watchexec-1.14.1.tar.gz 40128 BLAKE2B 52764abd1dc669b32a5903e4c4463a72670de511dd95d6d041174b5eed2616c453cfdcf5fc7ba997b73e981c378d9674cfee34690122e4cb693ca6ba816a94c5 SHA512 93cb5d2d34499f8214e5af2cad0491184d60e084b4729381a3fa73065612889519467f7977a96ffa8f8b4bebc82a0f453e3c62be2936903f5152e8ac1a061d73
 DIST watchexec-1.15.0.tar.gz 40407 BLAKE2B f737e8c84da491962f480149ffd02ccfe934423f223215f05b50104794d2901ccb7575a31de8e31f80e817f4a3d450549c633f6371dde6311707d717610dede3 SHA512 5384abd8807557446c1835ecccba058d6129b9738cb819dea28d9042a8c25a1318cd9a54155c6ea63cbb649f63439142005cc2531ea8881440c0496a8a228c25
 DIST watchexec-1.15.1.tar.gz 41762 BLAKE2B 8f575016ade0d391e01f237441f239e17618441a32d23f70ce40a991ee1d41fe0e000ec7c8303ee0cbba7a42a9ff963df48e508696f0f415d0e1ec4f3f802f32 SHA512 f57cc9af381974e50318840c4df318545207bef31399cb2566298795b7e1b85e815abee295ac0fc489df06fe94e2839b8c811a5339cdd2d27a98385d7a221e5a
+DIST watchexec-1.15.2.tar.gz 165409 BLAKE2B 5822960f044b02dc87289b592a461e3fa4314e7a2dc0bf1cad0b259d2cbced3890beda7685ab8262dcc5760fdf564ec2f5c14bafdf0bd2db0a5157c922ac138e SHA512 ad744cb6a8d789ac19b03c1c7c37c41c030afcd212dbdd62815c128af49ed720a161ebab20f31f8366205bfc608614f71e97815718c75b097f6151d29f2ab2bb
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
--- a/app-misc/watchexec/watchexec-1.15.2.ebuild
+++ b/app-misc/watchexec/watchexec-1.15.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.3.1
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.15
+bitflags-1.2.1
+bstr-0.2.15
+cc-1.0.67
+cfg-if-0.1.10
+cfg-if-1.0.0
+clap-2.33.3
+darling-0.12.4
+darling_core-0.12.4
+darling_macro-0.12.4
+derive_builder-0.10.2
+derive_builder_core-0.10.2
+derive_builder_macro-0.10.2
+embed-resource-1.6.2
+env_logger-0.8.3
+filetime-0.2.14
+fnv-1.0.7
+fsevent-0.4.0
+fsevent-sys-2.0.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+glob-0.3.0
+globset-0.4.6
+ident_case-1.0.1
+inotify-0.7.1
+inotify-sys-0.1.5
+iovec-0.1.4
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+lazycell-1.3.0
+libc-0.2.93
+log-0.4.14
+memchr-2.3.4
+mio-0.6.23
+mio-extras-2.0.6
+miow-0.2.2
+net2-0.2.37
+nix-0.20.0
+notify-4.0.16
+proc-macro2-1.0.26
+quote-1.0.9
+redox_syscall-0.2.6
+regex-1.4.6
+regex-syntax-0.6.23
+same-file-1.0.6
+slab-0.4.3
+strsim-0.10.0
+syn-1.0.70
+term_size-0.3.2
+textwrap-0.11.0
+unicode-width-0.1.8
+unicode-xid-0.2.1
+vswhom-0.1.0
+vswhom-sys-0.1.0
+walkdir-2.3.2
+winapi-0.2.8
+winapi-0.3.9
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+winreg-0.8.0
+ws2_32-sys-0.2.1
+"
+
+inherit cargo
+
+DESCRIPTION="Executes commands in response to file modifications"
+HOMEPAGE="https://github.com/watchexec/watchexec"
+SRC_URI="https://github.com/watchexec/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris ${CRATES})"
+# Prevent portage from trying to fetch bunch of *.crate from mirror despite they are not mirrored.
+RESTRICT="mirror"
+LICENSE="Apache-2.0 BSD CC0-1.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+QA_FLAGS_IGNORED="usr/bin/watchexec"
+
+src_install() {
+	cargo_src_install
+
+	dodoc README.md doc/watchexec.1.html
+	doman doc/watchexec.1
+
+	insinto /usr/share/zsh/site-functions
+	newins completions/zsh _watchexec
+}
--- a/app-text/klogg/Manifest
+++ b/app-text/klogg/Manifest
@@ -0,0 +1 @@
+DIST v20.12.tar.gz 14640631 BLAKE2B 94693d3117343b3a4632aa0a1ef8492b9a895bb5e4567c358966d4defe379e5b50367b59d1e74d8beb5d9c105e760b1e618e78ab60806ed829ead44ccee02363 SHA512 c2fabe2d983ad2626d2fe92c91fc2a944d4eb3a10c627ea877a498814fdebe957ac55665623dee2ea30591ed6ce9e70d708073d007d60769c65a2e84714e8c62
--- a/app-text/klogg/klogg-20.12.ebuild
+++ b/app-text/klogg/klogg-20.12.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A GUI application to browse and search through long and complex log files"
+HOMEPAGE="https://klogg.filimonov.dev"
+SRC_URI="https://github.com/variar/klogg/archive/refs/tags/v${PV}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtxml:5
+	dev-qt/qtconcurrent:5
+"
+
+RDEPEND="${DEPEND} x11-themes/hicolor-icon-theme"
+
+BDEPEND="
+	>=dev-util/cmake-3.12
+"
+
+IUSE="+sentry lto"
+
+src_prepare() {
+	sed -e 's|share/doc/klogg|${CMAKE_INSTALL_DOCDIR}|' -i "${S}/CMakeLists.txt" || die "sed CMAKE_INSTALL_DOCDIR"
+	sed -e 's|TBB_INSTALL_LIBRARY_DIR lib|TBB_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}|' -i "${S}/3rdparty/tbb/CMakeLists.txt" || die "sed TBB_INSTALL_LIBRARY_DIR"
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	local cmakeopts="-DWARNINGS_AS_ERRORS=OFF -DDISABLE_WERROR=ON"
+
+	if use sentry; then
+		cmakeopts+=" -DKLOGG_USE_SENTRY=ON"
+	else
+		cmakeopts+=" -DKLOGG_USE_SENTRY=OFF"
+	fi
+
+	if use lto; then
+		cmakeopts+=" -DUSE_LTO=ON"
+	else
+		cmakeopts+=" -DUSE_LTO=OFF"
+	fi
+
+	local mycmakeargs=(
+		${cmakeopts}
+	)
+	export KLOGG_VERSION=${PV}.0.813
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile ${PN}
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
--- a/app-text/klogg/metadata.xml
+++ b/app-text/klogg/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>anton.filimonov@gmail.com</email>
+        <name>Anton Filimonov</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">variar/klogg</remote-id>
+    </upstream>
+    <use>
+        <flag name="sentry">
+            Enable crash reporting using sentry.io.
+        </flag>
+        <flag name="lto">
+            Build with link time optimization (LTO).
+        </flag>
+    </use>
+</pkgmetadata>
--- a/dev-libs/ftl/ftl-1.0_p20210308.ebuild
+++ b/dev-libs/ftl/ftl-1.0_p20210308.ebuild
@@ -34,10 +34,33 @@ pkg_setup() {
 src_prepare() {
 	default

+	case $(tc-getFC) in
+		*gfortran* )
+			sed -i -e '/gnu)/,/COMPILER =/ s:gfortran:'"$(tc-getFC)"':' \
+			-e '/gnu)/,/^\tFLAGS =/ s:(BUILDDIR):(BUILDDIR) '"${FCFLAGS}"':' \
+			-e '/gnu)/,/CXXCOMPILER =/ s:g++:'"$(tc-getCXX)"':' \
+			-e '/gnu)/,/CXXFLAGS =/ s:CXXFLAGS = .*:CXXFLAGS = '"${CXXFLAGS}"':' \
+			makefile || die
+			;;
+		*ifort* )
+			sed -i -e '/^PLATFORM/ s:gnu:intel:' \
+			-e '/intel)/,/COMPILER =/ s:ifort:'"$(tc-getFC)"':' \
+			-e '/intel)/,/^\tFLAGS =/ s:(BUILDDIR):(BUILDDIR) '"${FCFLAGS}"':' \
+			-e '/intel)/,/CXXCOMPILER =/ s:g++:'"$(tc-getCXX)"':' \
+			-e '/intel)/,/CXXFLAGS =/ s:CXXFLAGS = .*:CXXFLAGS = '"${CXXFLAGS}"':' \
+			makefile || die
+			;;
+		* )
+			die "Sorry, GNU gfortran or Intel ifort are currently supported in the ebuild"
+			;;
+	esac
+
 	# Replase install PREFIX, LIBDIR, add library soname
-	sed -i -e 's:PREFIX ?= /usr/local:PREFIX ?= '"${ED}"'/usr/:' \
+	sed -i -e '/^BUILD ?=/s:debug:release:' \
+		-e 's:PREFIX ?= /usr/local:PREFIX ?= '"${ED}"'/usr/:' \
 		-e 's:(PREFIX)/lib:(PREFIX)/'"$(get_libdir)"':' \
-		-e 's:SOLDFLAGS = -shared:SOLDFLAGS = -shared -Wl,-soname=libftl.so.1 '"${LDFLAGS}"':' makefile || die
+		-e 's:SOLDFLAGS = -shared:SOLDFLAGS = -shared -Wl,-soname=libftl.so.1 '"${LDFLAGS}"':' \
+		makefile || die
 }

 src_configure() {
@@ -45,13 +68,7 @@ src_configure() {
 }

 src_compile() {
-	emake \
-		BUILD=release \
-		USE_PCRE=$(usex pcre true false) \
-		COMPILER="$(tc-getFC)" \
-		FLAGS="${FCFLAGS}" \
-		CXXCOMPILER="$(tc-getCXX)" \
-		CXXFLAGS="${CXXFLAGS}"
+	emake USE_PCRE=$(usex pcre true false)
 }

 src_test() {
--- a/dev-libs/protothreads/files/respect-cflags.patch
+++ b/dev-libs/protothreads/files/respect-cflags.patch
@@ -0,0 +1,8 @@
+--- a/Makefile
+++ b/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS=-O -Wuninitialized -Werror
+CFLAGS+=-Wuninitialized
+ 
+ all: example-codelock example-buffer example-small
+ 
--- a/dev-libs/protothreads/protothreads-1.4.ebuild
+++ b/dev-libs/protothreads/protothreads-1.4.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI="7"

-DESCRIPTION="Protothreads - Lightweight, Stackless Threads in C"
+inherit toolchain-funcs
+
+DESCRIPTION="Lightweight, Stackless Threads in C"
 HOMEPAGE="https://web.archive.org/web/20190923093100/http://dunkels.com/adam/pt/"
 SRC_URI="
 	https://web.archive.org/web/20190518175329/http://dunkels.com/adam/download/pt-${PV}.tar.gz -> ${P}.tar
@@ -16,7 +18,7 @@ KEYWORDS="~amd64"
 IUSE="doc examples"

 BDEPEND="doc? ( app-doc/doxygen )"
-
+PATCHES=( "${FILESDIR}/respect-cflags.patch" )
 S="${WORKDIR}/pt-${PV}"

 src_unpack() {
@@ -24,13 +26,8 @@ src_unpack() {
 	cp "${DISTDIR}/graham-pt.h" "${S}"
 }

-src_prepare() {
-	sed -i 's/-Werror//g' Makefile
-	sed -i 's/-O//g' Makefile
-	default
-}
-
 src_compile() {
+	export CC=$(tc-getCC)
 	default
 	use doc && cd doc && emake
 }
@@ -44,7 +41,7 @@ src_install() {
 		dodoc README
 		docinto html
 		dodoc -r doc/html/.
-
+		docompress -x "/usr/share/doc/${P}/html"
 	fi
 	if use examples ; then
 		insinto "/usr/share/${P}/examples"
--- a/dev-libs/supercop/supercop-0_p20200827.ebuild
+++ b/dev-libs/supercop/supercop-0_p20200827.ebuild
@@ -20,6 +20,7 @@ DEPEND="dev-lang/nasm"
 S="${WORKDIR}"/${PN}-${MY_REV}

 src_configure() {
+	append-flags -fPIC
 	append-ldflags -Wl,-z,noexecstack
 	cmake_src_configure
 }
--- a/games-emulation/melonds/Manifest
+++ b/games-emulation/melonds/Manifest
@@ -1,3 +1,2 @@
-DIST melonDS-0.8.3.tar.gz 965501 BLAKE2B 6ada01de8942c7ae5ec4a0a48cc76384ac2196f567d67d242d3d81e7c760dd87d76fcb5a33b540b670fd79358ba8e6a9c355d48e8eb08c721dfe33b54e4a9842 SHA512 4fed77abd231812d2f9ddb19a7fe6e808fb8e92035bb2fea220032b7c0a98671b4fd79ef0f7c7c559e92f3d1875ea119afaa581be2edacaa10f4437620eecd76
 DIST melonDS-0.9.1.tar.gz 1311519 BLAKE2B 7d31f9de32799a28f9e179d05295fe7874f6d879ac63cebeaf7153f1cca553f816fd5fa2853d01b5ace1afe137f00fcd7b4526635ae9c8140ac348630225c745 SHA512 733a9f9352b7f61c76de761c7f632f5fca9c4ae2970a0235a7b5c0e6ca2ea550762472ff293f65ce29aaa63a610bb4f1a22b62e1957004606c2f85be60fbb8f2
-DIST melonDS-0.9.tar.gz 899619 BLAKE2B 4a3fe0c8ca1cce9ed823f74eaf58786f8847b62e0e25d5f0e97b1cc0e68754b61a09b5e9b790264549377011dd899447fbe715ca2831320a903d70e24953b3dd SHA512 7d65058f9140c1bbcdc17d32aee62625023dba8c3c45665486c8a3dbec551ca109831949716eadb8048921464d4a6543698b741835b32cc95a96f5b5cf885e04
+DIST melonDS-0.9.2.tar.gz 1330793 BLAKE2B e504dd2e1344a9680b9820f7f0308fa30decb16f40675df5649babef7ab3fae9528042fc2737a36bafdd28b9125f94a79d20e5a5e791d485feb9dc26b64b1432 SHA512 3d099af675acdcb91431aaaf95bc27c10fd432ebd29aa81c7eb4e65dfad9c20cb4fd5de086d2162cbe4a6b41f7e140880a5742b1ec34eef0511fff052aa1baaa
--- a/games-emulation/melonds/melonds-0.8.3.ebuild
+++ b/games-emulation/melonds/melonds-0.8.3.ebuild
@@ -1,49 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="melonDS"
-MY_P="${MY_PN}-${PV}"
-
-inherit xdg cmake
-
-DESCRIPTION="Nintendo DS emulator, sorta"
-HOMEPAGE="http://melonds.kuribo64.net/"
-
-if [[ "${PV}" == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Arisotura/${MY_PN}.git"
-else
-	SRC_URI="https://github.com/Arisotura/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-RESTRICT="test"
-LICENSE="GPL-3"
-SLOT="0"
-
-DEPEND="
-	media-libs/libsdl2[sound,video]
-	net-libs/libpcap
-	net-misc/curl
-	x11-libs/cairo
-	x11-libs/gtk+:3
-"
-RDEPEND="
-	${DEPEND}
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "You need the following files in order to run melonDS:"
-	elog "- bios7.bin"
-	elog "- bios9.bin"
-	elog "- firmware.bin"
-	elog "- romlist.bin"
-	elog "Place them in ~/.config/melonDS"
-	elog "The romlist.bin file can be found in the /usr/share/melonDS directory"
-	elog "The rest of those files can be found somewhere in the internet ;-)"
-}
--- a/games-emulation/melonds/melonds-0.9.1.ebuild
+++ b/games-emulation/melonds/melonds-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -20,7 +20,6 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi

-RESTRICT="test"
 LICENSE="GPL-3"
 SLOT="0"

--- a/games-emulation/melonds/melonds-0.9.2.ebuild
+++ b/games-emulation/melonds/melonds-0.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -20,7 +20,6 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi

-RESTRICT="test"
 LICENSE="GPL-3"
 SLOT="0"

--- a/games-emulation/melonds/melonds-9999.ebuild
+++ b/games-emulation/melonds/melonds-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -20,7 +20,6 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi

-RESTRICT="test"
 LICENSE="GPL-3"
 SLOT="0"

--- a/kde-apps/kaidan/Manifest
+++ b/kde-apps/kaidan/Manifest
@@ -0,0 +1 @@
+DIST kaidan-0.7.0.tar.xz 516684 BLAKE2B 6ee2f6696b1fca2ec564563e13c621f63edc8696d4b14ec22157adef611d5ba9d2d522bd960d1becc16a720851263503251d5a1f850af409daf439165a23839f SHA512 89389db3dfbc6acfae252c6fad2492a997760495f9a55d6f56bbf0f49832fcbff35548ba89dc3f24e6ff05b0c4b1ee0242566ca1c7f662fc096b13b37f99af94
--- a/kde-apps/kaidan/kaidan-0.7.0.ebuild
+++ b/kde-apps/kaidan/kaidan-0.7.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KFMIN=5.67.0
+QTMIN=5.14.0
+inherit ecm
+
+DESCRIPTION="A simple, user-friendly Jabber/XMPP client for every device!"
+HOMEPAGE="https://www.kaidan.im"
+SRC_URI="mirror://kde/unstable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="Apache-2.0 CC-BY-SA-4.0 GPL-3+ GPL-3-with-openssl-exception MIT"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="kde nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtlocation-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtpositioning-${QTMIN}:5[qml]
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+	>=media-libs/zxing-cpp-1.0.8
+	>=net-libs/qxmpp-1.2.0
+	kde? ( >=kde-frameworks/knotifications-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DI18N=$(usex nls)
+		-DBUILD_TESTS=$(usex test)
+		-DUSE_KNOTIFICATIONS=$(usex kde)
+		# compile QML at build time
+		-DQUICK_COMPILER=ON
+	)
+	ecm_src_configure
+}
--- a/kde-apps/kaidan/metadata.xml
+++ b/kde-apps/kaidan/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">KDE/kaidan</remote-id>
+		<changelog>https://invent.kde.org/network/kaidan/-/raw/master/NEWS</changelog>
+		<bugs-to>https://invent.kde.org/network/kaidan/issues</bugs-to>
+	</upstream>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+</pkgmetadata>
--- a/kde-apps/kclock/kclock-0.4.0.ebuild
+++ b/kde-apps/kclock/kclock-0.4.0.ebuild
@@ -34,3 +34,10 @@ DEPEND="
 	>=kde-frameworks/plasma-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed \
+		-e "/Version=.*/d" \
+		-i org.kde.kclock.desktop || die
+	ecm_src_prepare
+}
--- a/kde-misc/geminipart/geminipart-20210413.ebuild
+++ b/kde-misc/geminipart/geminipart-20210413.ebuild
@@ -25,3 +25,8 @@ DEPEND="
 	>=kde-frameworks/kparts-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+src_test() {
+	export QT_QPA_PLATFORM=offscreen
+	ecm_src_test
+}
--- a/kde-misc/kio-gemini/kio-gemini-20210413.ebuild
+++ b/kde-misc/kio-gemini/kio-gemini-20210413.ebuild
@@ -24,3 +24,8 @@ DEPEND="
 	>=kde-frameworks/kio-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+src_test() {
+	export QT_QPA_PLATFORM=offscreen
+	ecm_src_test
+}
--- a/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild
+++ b/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -16,6 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="lua ttf"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
 # Test phase fails: make: *** [Makefile:1146: ../bin/tests-sdl] Error 1
 RESTRICT="test"

@@ -34,16 +35,15 @@ PATCHES=( "${FILESDIR}/${PN}-desktop-file.patch" )

 src_prepare() {
 	pushd ../ && default && popd
-	sed -i s/lua5\.1/lua/g Makefile || die "sed failed"
 }

 src_compile() {
 	use ttf || MYCNF="NOTTF=1"
 	use lua || MYCNF="${MYCNF} NOLUA=1"

-	emake ${MYCNF} || die "emake failed"
+	emake ${MYCNF}
 }

 src_install() {
-	emake ${MYCNF} DESTDIR="${D}" PREFIX="/usr" install || die "Install failed"
+	emake ${MYCNF} DESTDIR="${ED}" PREFIX="/usr" install
 }
--- a/media-libs/vips/Manifest
+++ b/media-libs/vips/Manifest
@@ -0,0 +1 @@
+DIST vips-8.10.6.tar.gz 19532428 BLAKE2B ccc3fd55a8231a1efb65e12acc5b749c9331ce95fcdce6a95a3b3a6cb26da1846da68a44c16c71837ec7f4de0c14f60cf4b5605ab05b70209ae607ae257d0ec9 SHA512 e3e623ad7b44dfb65078c49d2694d94bb11294300630d9e3c53ff1f9e9aaf58d196881d52c191b4604d9f63453199b7da3601425ffc9554f1c25cf08d630ef8b
--- a/media-libs/vips/metadata.xml
+++ b/media-libs/vips/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<use>
+		<flag name="fits">Enable support for the FITS image format through <pkg>sci-libs/cfitsio</pkg></flag>
+		<flag name="matio">Enable support for reading images from Matlab files through <pkg>sci-libs/matio</pkg></flag>
+		<!--<flag name="openslide">Enable support for reading images from OpenSlide files through <pkg>media-libs/openslide</pkg>(currently conflicts with jpeg-turbo)</flag>-->
+		<flag name="gsf">Enable support for creating image pyramids with dzsave</flag>
+		<flag name="heif">Enable support for HEIC images</flag>
+		<flag name="pango">Enable support for text rendering</flag>
+		<!--<flag name="nsgif">Enable support for nsgif load</flag>-->
+		<flag name="imagequant">Enable support for 8bpp PNG via <pkg>media-gfx/libimagequant</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">libvips/libvips</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/media-libs/vips/vips-8.10.6.ebuild
+++ b/media-libs/vips/vips-8.10.6.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils autotools multilib-minimal
+
+DESCRIPTION="VIPS Image Processing Library"
+SRC_URI="https://github.com/libvips/libvips/releases/download/v${PV}/${P}.tar.gz"
+HOMEPAGE="https://libvips.github.io/libvips/"
+
+LICENSE="LGPL-2.1+"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug exif fftw fits heif gsf graphicsmagick imagemagick imagequant jpeg lcms matio openexr orc pango pdf png svg static-libs tiff webp zlib"
+REQUIRED_USE="imagequant? ( png )"
+
+# FIXME: nitfi (FIND_NIFTI)
+# openslide? ( >=media-libs/openslide-3.3.0 )
+RDEPEND="
+	>=dev-libs/glib-2.6:2
+	dev-libs/expat:=
+	debug? ( dev-libs/dmalloc )
+	fftw? ( sci-libs/fftw:3.0= )
+	imagemagick? (
+		graphicsmagick? ( media-gfx/graphicsmagick )
+		!graphicsmagick? ( media-gfx/imagemagick )
+	)
+	imagequant? ( media-gfx/libimagequant:= )
+	exif? ( >=media-libs/libexif-0.6 )
+	fits? ( sci-libs/cfitsio )
+	heif? ( >=media-libs/libheif-1.3.0:= )
+	jpeg? ( virtual/jpeg:0= )
+	gsf? ( gnome-extra/libgsf:= )
+	lcms? ( media-libs/lcms )
+	matio? ( >=sci-libs/matio-1.3.4 )
+	openexr? ( >=media-libs/openexr-1.2.2 )
+	orc? ( >=dev-lang/orc-0.4.11 )
+	pango? ( x11-libs/pango )
+	pdf? ( app-text/poppler[cairo] )
+	png? ( >=media-libs/libpng-1.2.9:0= )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	webp? ( media-libs/libwebp )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	${RDEPEND}
+	doc? (
+		dev-util/gtk-doc
+		dev-util/gtk-doc-am
+	)
+"
+
+DOCS=(ChangeLog NEWS THANKS README.md)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local magick="--without-magick";
+	use imagemagick && magick="--with-magickpackage=MagickCore"
+	use graphicsmagick && magick="--with-magickpackage=GraphicsMagick"
+
+	econf \
+		${magick} \
+		$(multilib_native_use_enable doc gtk-doc) \
+		$(use_enable debug) \
+		$(use_with debug dmalloc) \
+		$(use_with exif libexif) \
+		$(use_with fftw) \
+		$(use_with fits cfitsio) \
+		$(use_with gsf) \
+		$(use_with imagequant) \
+		$(use_with jpeg) \
+		$(use_with lcms) \
+		$(use_with matio ) \
+		$(use_with openexr OpenEXR) \
+#		$(use_with openslide) \
+		$(use_with orc) \
+		$(use_with pango pangoft2) \
+		$(use_with pango pangocairo) \
+		$(use_with pdf poppler) \
+		$(use_with png) \
+		$(use_with svg rsvg) \
+		$(use_with tiff) \
+		$(use_with webp libwebp) \
+		$(use_with zlib) \
+		$(use_enable static-libs static)
+}
+
+# FIXME: Add the fancier pytest-based testsuite
+# You can find how it's used in ${S}/.travis.yml
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
--- a/media-sound/nuclear-bin/nuclear-bin-0.6.12-r1.ebuild
+++ b/media-sound/nuclear-bin/nuclear-bin-0.6.12-r1.ebuild
@@ -55,16 +55,14 @@ src_install(){
 	fperms +x /opt/"${PN}"/chrome-sandbox
 	fperms +x /opt/"${PN}"/resources/bin/fpcalc
 	make_desktop_entry "/opt/${PN}/nuclear %U" "Nuclear" "nuclear" \
-		"GNOME;GTK;Utility;X-MediaPlayer;" \
-		"GenericName=Media Player\n\nStartupNotify=true\nStartupWMClass=nuclear"
+		"Audio;Music;Player;AudioVideo;" \
+		"GenericName=Nuclear-bin\nStartupNotify=true\nStartupWMClass=nuclear"
 	cd "${S}"/resources/media/ || die
 	mv icon.icns nuclear.icns || die
 	doicon nuclear.icns
 	cd presskit/icons/color || die
 	for i in {16,24,32,48,64,96,128,256,512}; do
 		mv "${i}".png nuclear-"${i}".png || die
-	done
-	for i in {16,24,32,48,64,96,128,256,512}; do
 		doicon -s "${i}" nuclear-"${i}".png
 	done
 	cd ../scalable || die
--- a/media-sound/zita-ajbridge/files/zita-ajbridge-0.8.4_don-t-compress-and-install-manpages.patch
+++ b/media-sound/zita-ajbridge/files/zita-ajbridge-0.8.4_don-t-compress-and-install-manpages.patch
@@ -0,0 +1,35 @@
+From 6490bcd83f4ea0a370cc5862067b288158aacadd Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Tue, 27 Apr 2021 12:21:43 +0200
+Subject: [PATCH] Don't compress and install manpages.
+
+---
+ Makefile | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7238f18..d1f2b22 100644
+--- a/Makefile
+++ b/Makefile
+@@ -27,7 +27,7 @@ CPPFLAGS +=  -MMD -MP -DVERSION=\"$(VERSION)\"
+ CXXFLAGS += -O2 -Wall
+ 
+ 
+-all:	zita-a2j zita-j2a zita-ajbridge.1.gz zita-a2j.1.gz zita-j2a.1.gz 
+all:	zita-a2j zita-j2a
+ 
+ 
+ ZITA-A2J_O = zita-a2j.o alsathread.o jackclient.o pxthread.o lfqueue.o
+@@ -63,9 +63,6 @@ install:	all
+ 	install -d $(DESTDIR)$(MANDIR)
+ 	install -m 755 zita-a2j $(DESTDIR)$(BINDIR)
+ 	install -m 755 zita-j2a $(DESTDIR)$(BINDIR)
+-	install -m 644 zita-ajbridge.1.gz $(DESTDIR)$(MANDIR)
+-	install -m 644 zita-a2j.1.gz $(DESTDIR)$(MANDIR)
+-	install -m 644 zita-j2a.1.gz $(DESTDIR)$(MANDIR)
+ 
+ 
+ uninstall:
+-- 
+2.26.3
+
--- a/media-sound/zita-ajbridge/zita-ajbridge-0.8.4-r1.ebuild
+++ b/media-sound/zita-ajbridge/zita-ajbridge-0.8.4-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="zita-a2j and zita-j2a - bridges between ALSA and JACK"
+HOMEPAGE="https://kokkinizita.linuxaudio.org/linuxaudio/zita-ajbridge-doc/quickguide.html"
+SOURCE_URI="https://kokkinizita.linuxaudio.org/linuxaudio/downloads"
+SRC_URI="${SOURCE_URI}/${PN}-${PV}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="media-libs/alsa-lib
+>=media-libs/zita-alsa-pcmi-0.3.0
+>=media-libs/zita-resampler-1.6.0
+virtual/jack"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/gzip"
+
+S="${WORKDIR}/${P}/source"
+ADIR="${WORKDIR}/${P}/"
+
+DOCS=( ${ADIR}/AUTHORS ${ADIR}/COPYING ${ADIR}/README )
+
+PATCHES=( "${FILESDIR}/zita-ajbridge-0.8.4_don-t-compress-and-install-manpages.patch" )
+
+src_compile() {
+	tc-export CXX
+	export PREFIX="/usr"
+	default
+}
+
+src_install() {
+	doman *.1
+	default
+}
--- a/media-sound/zita-ajbridge/zita-ajbridge-0.8.4.ebuild
+++ b/media-sound/zita-ajbridge/zita-ajbridge-0.8.4.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

+inherit toolchain-funcs
+
 DESCRIPTION="zita-a2j and zita-j2a - bridges between ALSA and JACK"
 HOMEPAGE="https://kokkinizita.linuxaudio.org/linuxaudio/zita-ajbridge-doc/quickguide.html"
 SOURCE_URI="https://kokkinizita.linuxaudio.org/linuxaudio/downloads"
@@ -30,6 +32,11 @@ src_prepare() {
 	sed -i -e "/ldconfig/d" "${S}"/Makefile || die
 }

+src_compile() {
+	tc-export CXX
+	default
+}
+
 src_install() {
 	dodir /usr/bin
 	dodir /usr/share/man/man1
--- a/net-im/srain/Manifest
+++ b/net-im/srain/Manifest
@@ -1,2 +1,2 @@
-DIST srain-1.1.1.tar.gz 941824 BLAKE2B 96b53e7e05f42514bc429cc30938f3a104d65f48ffbc08f0ec176e8bff6fc346cc6dabbcd8cfaa9db41af205a4079400f4b24ea1ad7ef4cb787b34eedd6d6cf5 SHA512 1cd8604b79d03a054b6b785529feef9479836f5fdc406101f3e67bfcb6a400ab8dae2b1ac317fd92b491e60faae069c3a61f4997ae15b6c9b2373b20e8ab7ac0
 DIST srain-1.1.3.tar.gz 944319 BLAKE2B 74beb34a8e10716392aaaf07586c399f7a66601015c7761c116a3dcf822d6f9c69d3bc3e40b1b5ed780aed24ce1b2fa8496f2c8f4a77484acce294edfb653d00 SHA512 ad1c47bb249dae27cea3d4a044bbd10c034f2bb44fbec34053eeb878405caf9cf6236a03a7ff922f4eb4c189e5ccab4a307c208569bf0fdeb654a9de03a6d4fe
+DIST srain-1.2.1.tar.gz 954668 BLAKE2B 20beb88761a387a041659ea11f852655daab9fdcd4b1d2f2b080bfa4dd9c19a61c12ebba9a581a10355d9249a6063dcdfea486dccb625622e68b57a4445afae7 SHA512 594cb65827ba3f4cf99820640103bdd1d67577df31e1fcb27f98722e243bcbab68420aff0c3f26cc7d0c149a4a8c256fc386709b8ff86d6b617c170f00c076f3
--- a/net-im/srain/srain-1.1.3.ebuild
+++ b/net-im/srain/srain-1.1.3.ebuild
@@ -3,7 +3,7 @@

 EAPI=7

-inherit xdg
+inherit toolchain-funcs xdg

 DESCRIPTION="Modern, beautiful IRC client written in GTK+ 3"
 HOMEPAGE="https://github.com/SrainApp/srain"
@@ -28,3 +28,8 @@ DEPEND="
 src_configure() {
 	econf $(use_enable debug)
 }
+
+src_compile() {
+	tc-export CC
+	default
+}
--- a/net-im/srain/srain-1.2.1.ebuild
+++ b/net-im/srain/srain-1.2.1.ebuild
@@ -3,7 +3,7 @@

 EAPI=7

-inherit xdg
+inherit meson xdg

 DESCRIPTION="Modern, beautiful IRC client written in GTK+ 3"
 HOMEPAGE="https://github.com/SrainApp/srain"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/SrainApp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="debug"
+IUSE="debug doc"

 RDEPEND="
 	>=x11-libs/gtk+-3.22.0
@@ -25,6 +25,17 @@ DEPEND="
 	net-libs/libsoup
 "

-src_configure() {
-	econf $(use_enable debug)
+src_prepare() {
+	sed -i "s/'doc', meson.project_name())/'doc', meson.project_name() + '-${PV}')/" \
+		meson.build || die
+
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		--buildtype $(usex debug 'debug' 'plain')
+		-Ddoc_builders="['man'$(usex doc ', "html"' '')]"
+	)
+	meson_src_configure
 }
--- a/net-misc/gmid/Manifest
+++ b/net-misc/gmid/Manifest
@@ -1 +1 @@
-DIST gmid-1.6.tar.gz 59402 BLAKE2B 1a13ae3f598a406e7920ad3a4f73cb230d70fe3bf4a1017d8d196ab80fdc0ffcf339ad79c64de93dc69d06e294132d714ad8ea1a5248dc69377e8d088f772d6c SHA512 cf118ac3b067b23d480006bccf36218ab0bf91d778092855a01706782fb0c68252157615d92d143d29deb8331422ef1263228b9eb53dd30e64a480b17c48af7a
+DIST gmid-1.6.1.tar.gz 59488 BLAKE2B 147c8eb4e1c7195405fdce9bef8260e1a3acb145e9dfd2cb3fb126e4445685a3a1826906b01699429e98a61db6bb2089ec3399a1403323b36adf2555afc61bf2 SHA512 b98592e4bb5b1121fad07dc1fcbdbc95ce69a5648b3c2d22dba974511ae265255be62a330125c2da9b0b357edc2f24065fd8b475013d3d2023a8eded2c01a490
--- a/net-misc/gmid/files/gmid-1.6.1-make-pidfile.patch
+++ b/net-misc/gmid/files/gmid-1.6.1-make-pidfile.patch
@@ -0,0 +1,111 @@
+--- a/gmid.1
+++ b/gmid.1
+@@ -22,6 +22,7 @@
+ .Bk -words
+ .Op Fl fnv
+ .Op Fl c Ar config
+.Op Fl P Ar pidfile
+ .Ek
+ .Nm
+ .Bk -words
+@@ -51,6 +52,10 @@ Specify the configuration file.
+ Stays and logs on the foreground.
+ .It Fl n
+ Check that the configuration is valid, but don't start the server.
+.It Fl P Pa pidfile
+Write
+.Nm
+pid to the given path.
+ .El
+ .Pp
+ If no configuration file is given,
+--- a/gmid.c
+++ b/gmid.c
+@@ -316,7 +316,7 @@ static void
+ usage(const char *me)
+ {
+ 	fprintf(stderr,
+-	    "USAGE: %s [-fn] [-c config] | [-6h] [-d certs-dir] [-H host]\n"
+	    "USAGE: %s [-fn] [-c config] [-P pidfile] | [-6h] [-d certs-dir] [-H host]\n"
+ 	    "       [-p port] [-x cgi] [dir]\n",
+ 	    me);
+ }
+@@ -411,6 +411,34 @@ serve(int argc, char **argv, struct imsgbuf *ibuf)
+ 	_exit(executor_main(ibuf));
+ }
+ 
+static int
+write_pidfile(const char *pidfile)
+{
+	struct flock	lock;
+	int		fd;
+
+	if (pidfile == NULL)
+		return -1;
+
+	if ((fd = open(pidfile, O_WRONLY|O_CREAT|O_CLOEXEC, 0600)) == -1)
+		fatal("can't open pidfile %s: %s", pidfile, strerror(errno));
+
+	lock.l_start = 0;
+	lock.l_len = 0;
+	lock.l_type = F_WRLCK;
+	lock.l_whence = SEEK_SET;
+
+	if (fcntl(fd, F_SETLK, &lock) == -1)
+		fatal("can't lock %s, gmid is already running?", pidfile);
+
+	if (ftruncate(fd, 0) == -1)
+		fatal("ftruncate: %s: %s", pidfile, strerror(errno));
+
+	dprintf(fd, "%d\n", getpid());
+
+	return fd;
+}
+
+ static void
+ setup_configless(int argc, char **argv, const char *cgi)
+ {
+@@ -434,11 +462,12 @@ main(int argc, char **argv)
+ {
+ 	struct imsgbuf exibuf;
+ 	int ch, conftest = 0, configless = 0;
+-	int old_ipv6, old_port;
+	int pidfd, old_ipv6, old_port;
+	const char *pidfile = NULL;
+ 
+ 	init_config();
+ 
+-	while ((ch = getopt(argc, argv, "6c:d:fH:hnp:vx:")) != -1) {
+	while ((ch = getopt(argc, argv, "6c:d:fH:hnP:p:vx:")) != -1) {
+ 		switch (ch) {
+ 		case '6':
+ 			conf.ipv6 = 1;
+@@ -472,6 +501,10 @@ main(int argc, char **argv)
+ 			conftest = 1;
+ 			break;
+ 
+		case 'P':
+			pidfile = optarg;
+			break;
+
+ 		case 'p':
+ 			conf.port = parse_portno(optarg);
+ 			configless = 1;
+@@ -536,6 +569,8 @@ main(int argc, char **argv)
+ 		return 0;
+ 	}
+ 
+	pidfd = write_pidfile(pidfile);
+
+ 	/* Linux seems to call the event handlers even when we're
+ 	 * doing a sigwait.  These dummy handlers are here to avoid
+ 	 * being terminated on SIGHUP, SIGINT or SIGTERM. */
+@@ -604,5 +639,8 @@ main(int argc, char **argv)
+ 	imsg_compose(&logibuf, IMSG_QUIT, 0, 0, -1, NULL, 0);
+ 	imsg_flush(&logibuf);
+ 
+	if (pidfd != -1)
+		close(pidfd);
+
+ 	return 0;
+ }
--- a/net-misc/gmid/files/gmid.initd
+++ b/net-misc/gmid/files/gmid.initd
@@ -12,9 +12,8 @@ description_reload="Reload the gmid configuration without losing connections."
 GMID_CONFIGFILE=${GMID_CONFIGFILE:-/etc/gmid/gmid.conf}

 command="/usr/bin/gmid"
-command_args="-c \"${GMID_CONFIGFILE}\" -f"
-command_background=1
 pidfile="/var/run/gmid.pid"
+command_args="-c \"${GMID_CONFIGFILE}\" -P ${pidfile}"

 depend() {
 	need net
@@ -33,10 +32,6 @@ stop_pre() {
 	fi
 }

-stop_post() {
-	rm -f ${pidfile}
-}
-
 reload() {
 	configtest || return 1
 	ebegin "Refreshing gmid's configuration"
--- a/net-misc/gmid/gmid-1.6.1.ebuild
+++ b/net-misc/gmid/gmid-1.6.1.ebuild
@@ -8,7 +8,7 @@ SSL_DAYS=36500

 inherit ssl-cert toolchain-funcs

-DESCRIPTION="simple and secure Gemini server"
+DESCRIPTION="Simple and secure Gemini server"
 HOMEPAGE="https://www.omarpolo.com/pages/gmid.html"

 if [[ ${PV} == "9999" ]] ; then
@@ -23,6 +23,8 @@ LICENSE="ISC"
 SLOT="0"
 IUSE="libressl"

+PATCHES=( "${FILESDIR}"/${P}-make-pidfile.patch )
+
 DEPEND="acct-user/gemini
 	dev-libs/libevent
 	!libressl? ( dev-libs/libretls )
--- a/net-misc/gmid/gmid-9999.ebuild
+++ b/net-misc/gmid/gmid-9999.ebuild
@@ -8,7 +8,7 @@ SSL_DAYS=36500

 inherit ssl-cert toolchain-funcs

-DESCRIPTION="simple and secure Gemini server"
+DESCRIPTION="Simple and secure Gemini server"
 HOMEPAGE="https://www.omarpolo.com/pages/gmid.html"

 if [[ ${PV} == "9999" ]] ; then
@@ -33,16 +33,6 @@ RDEPEND="${DEPEND}"

 DOCS=( README.md ChangeLog )

-src_prepare() {
-	default
-
-	# QA Notice: command not found
-	# remove `etags` from the "all" target
-	sed \
-		-e "s/^\(all: .*\) TAGS \(.*\)$/\1 \2/" \
-		-i Makefile || die
-}
-
 src_configure() {
 	# note: not an autoconf configure script
 	./configure \
--- a/net-misc/gmid/metadata.xml
+++ b/net-misc/gmid/metadata.xml
@@ -6,7 +6,6 @@
 			<name>Omar Polo</name>
 			<email>op@omarpolo.com</email>
 		</maintainer>
-		<changelog>https://git.omarpolo.com/gmid/tree/ChangeLog</changelog>
 	</upstream>
 	<maintainer type="person">
 		<email>cyber@sysrq.in</email>
--- a/net-p2p/monero/monero-0.17.1.9.ebuild
+++ b/net-p2p/monero/monero-0.17.1.9.ebuild
@@ -18,7 +18,7 @@ fi

 LICENSE="BSD MIT"
 SLOT="0"
-IUSE="+daemon libressl readline +tools +wallet-cli +wallet-rpc"
+IUSE="+daemon readline +tools +wallet-cli +wallet-rpc"
 REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
 RESTRICT="test"

@@ -27,14 +27,13 @@ DEPEND="
 	acct-user/monero
 	dev-libs/boost:=[nls,threads]
 	dev-libs/libsodium:=
+	dev-libs/openssl:=
 	dev-libs/randomx
 	dev-libs/rapidjson
 	dev-libs/supercop
 	net-dns/unbound:=[threads]
 	net-libs/czmq:=
 	net-libs/miniupnpc
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
 	readline? ( sys-libs/readline:0= )
 "
 RDEPEND="${DEPEND}"
--- a/net-p2p/monero/monero-9999.ebuild
+++ b/net-p2p/monero/monero-9999.ebuild
@@ -19,7 +19,7 @@ fi

 LICENSE="BSD MIT"
 SLOT="0"
-IUSE="+daemon libressl readline +tools +wallet-cli +wallet-rpc"
+IUSE="+daemon readline +tools +wallet-cli +wallet-rpc"
 REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
 RESTRICT="test"

@@ -28,14 +28,13 @@ DEPEND="
 	acct-user/monero
 	dev-libs/boost:=[nls,threads]
 	dev-libs/libsodium:=
+	dev-libs/openssl:=
 	dev-libs/randomx
 	dev-libs/rapidjson
 	dev-libs/supercop
 	net-dns/unbound:=[threads]
 	net-libs/czmq:=
 	net-libs/miniupnpc
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
 	readline? ( sys-libs/readline:0= )
 "
 RDEPEND="${DEPEND}"
--- a/sys-apps/0xFFFF/0xFFFF-0.8.ebuild
+++ b/sys-apps/0xFFFF/0xFFFF-0.8.ebuild
@@ -3,6 +3,8 @@

 EAPI=7

+inherit toolchain-funcs
+
 DESCRIPTION="The 0pen Free Fiasco Firmware Flasher"
 HOMEPAGE="https://github.com/pali/0xFFFF/"
 SRC_URI="https://github.com/pali/${PN}/releases/download/${PV}/${P}.tar.gz"
@@ -15,6 +17,11 @@ IUSE=""
 DEPEND="virtual/libusb:0"
 RDEPEND="${DEPEND}"

+src_compile() {
+	tc-export CC
+	default
+}
+
 src_install() {
 	emake DESTDIR="${ED}" PREFIX="/usr" install
 }
--- a/sys-apps/0xFFFF/0xFFFF-0.9.ebuild
+++ b/sys-apps/0xFFFF/0xFFFF-0.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2013-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="The 0pen Free Fiasco Firmware Flasher"
+HOMEPAGE="https://github.com/pali/0xFFFF/"
+SRC_URI="https://github.com/pali/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/libusb:0"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	emake DESTDIR="${ED}" PREFIX="/usr" install
+}
--- a/sys-apps/0xFFFF/Manifest
+++ b/sys-apps/0xFFFF/Manifest
@@ -1 +1,2 @@
 DIST 0xFFFF-0.8.tar.gz 64504 BLAKE2B bc650f494c9c485169c65eeee03f28a62a76089b79aa55948eddd70dd88f135541a16de97820845c98843f4419e80d1b24f1cedef0ec46746c44c14839f8c93b SHA512 514104d60561d601628081de44109c89a21e861e2a0c8ad7e5b9b0fef19c068af9ee1b274a55722083f85b0ca9f6a84a8c6cd97b9017d85b4e975974bb73506a
+DIST 0xFFFF-0.9.tar.gz 64845 BLAKE2B 315d08b21edc053e1357a96e30347d2987cb5d7fb18e6faedfc959f44f710df23f803bb5bc36ebfeec6f2145d2f52685952bc0c192d9d18e45d2e47f4ade3f60 SHA512 6ec5ccc1ed7c8b4b2b10e641176f2c07bc8d490519571e1c935c501e8351e84de641848a2feb4f815a6a199c852f5eebd459b4009c1abed56772697445650daa
--- a/sys-cluster/clusteringsuite/Manifest
+++ b/sys-cluster/clusteringsuite/Manifest
@@ -0,0 +1 @@
+DIST clusteringsuite-2.6.9-src.tar.bz2 8081023 BLAKE2B d53e08a51e0a5a2d487bc4413c19d802804b7ae79b5f1e7c466ba2c37e36d90864a4629f51a98ca5caa83f4cc0a3ca8c74f5652c044c08591c65f3b50acf13d2 SHA512 80903e3d2c018e8ed23874715f7ffc1706ac5d9dcd0826c75bb07c973c28fa9755d4c130021abd6e969e983fbe23463be7361bb29b6d1ab04596ba4f987b1b6a
--- a/sys-cluster/clusteringsuite/clusteringsuite-2.6.9.ebuild
+++ b/sys-cluster/clusteringsuite/clusteringsuite-2.6.9.ebuild
@@ -0,0 +1,103 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+inherit python-any-r1
+
+DESCRIPTION="Automatically expose the main performance trends in applications' computation structure"
+HOMEPAGE="
+	https://tools.bsc.es/cluster-analysis
+	https://github.com/bsc-performance-tools/clustering-suite
+"
+SRC_URI="https://ftp.tools.bsc.es/clusteringsuite/clusteringsuite-${PV}-src.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc mpi old-pcfparser"
+#TODO: muster treedbscan
+#TODO: unbundle ANN
+
+#PATCHES=( "${FILESDIR}/respect-flags.patch" )
+
+RDEPEND="
+	dev-libs/boost:=
+	sci-libs/ann
+	mpi? ( virtual/mpi )
+"
+#	treedbscan? (
+#		dev-libs/boost[threads]:=
+#		dev-libs/gmp
+#		dev-libs/mpfr
+#		sci-mathematics/cgal
+#		sys-cluster/synapse
+#)
+
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_configure() {
+
+	local myconf=(
+		--disable-static
+		--disable-static-boost
+		--enable-shared
+		--with-boost="${EPREFIX}/usr"
+		--with-pic
+
+		$(use_enable old-pcfparser)
+	)
+
+	if use mpi; then
+		myconf+=( "--with-mpi=${EPREFIX}/usr" )
+	else
+		myconf+=( "--without-mpi" )
+	fi
+#	if use muster; then
+#		myconf+=( "--with-muster=${EPREFIX}/usr" )
+#	else
+		myconf+=( "--without-muster" )
+#	fi
+#	if use treedbscan; then
+#		myconf+=( "--enable-treedbscan" )
+#		myconf+=( "--with-cgal=${EPREFIX}/usr" )
+#		myconf+=( "--with-gmp=${EPREFIX}/usr" )
+#		myconf+=( "--with-mpfr=${EPREFIX}/usr" )
+#		myconf+=( "--with-synapse=${EPREFIX}/usr" )
+#	else
+		myconf+=( "--without-cgal" )
+		myconf+=( "--without-gmp" )
+		myconf+=( "--without-mpfr" )
+		myconf+=( "--without-synapse" )
+#	fi
+
+	econf "${myconf[@]}" || die
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	if use doc ; then
+		pushd doc || die
+		emake build-documentation
+		popd
+	fi
+	default
+}
+
+src_install() {
+	MAKEOPTS="-j1" DESTDIR="${D}" emake install
+
+	cd doc || die
+	dodoc -r *.pdf
+
+	rm "${ED}/usr/share/doc/clusteringsuite_manual.pdf" || die
+	mv "${ED}/usr/share/example" "${ED}/usr/share/doc/${PF}/examples" || die
+	docompress -x "/usr/share/doc/${PF}/examples"
+
+	find "${ED}" -name '*.la' -delete || die
+}
--- a/sys-cluster/clusteringsuite/metadata.xml
+++ b/sys-cluster/clusteringsuite/metadata.xml
@@ -0,0 +1,19 @@
+<?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>
+	<use>
+		<!--<flag name="maintainer-mode">enable make rules and dependencies not useful (and sometimes confusing) to the casual installer</flag>-->
+		<flag name="mpi">enable mpi for distributed version</flag>
+		<!--<flag name="muster">enable support for Muster algorithms</flag>-->
+		<flag name="old-pcfparser">enable compilation with old pcfparser</flag>
+		<!--<flag name="treedbscan">enable compilation of TreeDBSCAN support for <pkg>sys-cluster/extrae</pkg></flag>-->
+	</use>
+	<upstream>
+		<bugs-to>https://github.com/bsc-performance-tools/clustering-suite/issues</bugs-to>
+		<remote-id type="github">bsc-performance-tools/clustering-suite</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/sys-cluster/extrae/extrae-3.8.3-r1.ebuild
+++ b/sys-cluster/extrae/extrae-3.8.3-r1.ebuild
@@ -29,14 +29,13 @@ CDEPEND="
 	app-arch/xz-utils
 	dev-libs/icu
 	dev-libs/libpfm
-	sys-libs/libunwind
 	dev-libs/libxml2
 	dev-libs/papi
 	sys-apps/hwloc
-	sys-libs/glibc
 	sys-libs/zlib
 	virtual/mpi

+	|| ( sys-libs/libunwind sys-libs/llvm-libunwind )
 	|| ( sys-devel/binutils:* sys-libs/binutils-libs )

 	boost? ( dev-libs/boost:= )
@@ -56,7 +55,12 @@ RDEPEND="
 	virtual/opencl
 "
 BDEPEND="
-	doc? ( dev-python/sphinx )
+	doc? (
+		app-text/ghostscript-gpl
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+	)
 "
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
--- a/sys-cluster/extrae/extrae-3.8.3-r2.ebuild
+++ b/sys-cluster/extrae/extrae-3.8.3-r2.ebuild
@@ -0,0 +1,198 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+inherit autotools java-pkg-opt-2 python-single-r1
+
+DESCRIPTION="Instrumentation framework to generate execution traces of parallel runtimes"
+HOMEPAGE="https://github.com/bsc-performance-tools/extrae"
+SRC_URI="https://github.com/bsc-performance-tools/extrae/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="boost doc dwarf elf fft heterogeneous inotify +instrument-dynamic-memory +instrument-io +instrument-syscall merge-in-trace nanos opencl openmp +parallel-merge pebs-sampling +posix-clock pthread sampling +single-mpi-lib sionlib smpss +xml"
+#aspectj and aspectj-weaver need to both be enabled at the same time
+#current dev-java/aspectj package only provides aspectj.jar
+#aspectj needs foo/lib/aspectj.jar and foo/bin/ajc
+#aspectj-weaver needs bar/aspectjweaver.jar
+#TODO: find out who is pulling in libpfm
+#TODO: find out which FFT library is used
+#TODO: remove some useflags (boost fft elf dwarf)
+#TODO: pmapi online dyninst cuda spectral cupti openshmem gm mx synapse memkind aspectj
+#TODO: support llvm libunwind, llvm rt, elftoolchain
+
+CDEPEND="
+	${PYTHON_DEPS}
+	app-arch/xz-utils
+	dev-libs/icu
+	dev-libs/libpfm
+	dev-libs/libxml2
+	dev-libs/papi
+	sys-apps/hwloc
+	sys-libs/zlib
+	virtual/mpi
+
+	|| ( sys-libs/libunwind sys-libs/llvm-libunwind )
+	|| ( sys-devel/binutils:* sys-libs/binutils-libs )
+
+	boost? ( dev-libs/boost:= )
+	dwarf? ( dev-libs/libdwarf )
+	elf? ( virtual/libelf )
+	inotify? ( dev-libs/libevent )
+	opencl? ( dev-util/opencl-headers )
+	sionlib? ( sys-cluster/sionlib:= )
+"
+#	aspectj? ( >=dev-java/aspectj-1.9.6 )
+DEPEND="
+	${CDEPEND}
+	java? ( virtual/jdk:1.8 )
+"
+RDEPEND="
+	${CDEPEND}
+	java? ( virtual/jre:1.8 )
+	virtual/opencl
+"
+BDEPEND="
+	doc? (
+		app-text/ghostscript-gpl
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+	)
+"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	java? ( pthread )
+"
+#	cupti? ( cuda )
+#	dyninst? ( boost dwarf elf )
+#	online? ( synapse )
+#	aspectj? ( java )
+#	spectral? ( fft )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	export VARTEXFONTS="${T}/fonts"
+
+	local myconf=(
+		--datadir="${T}"
+		--datarootdir="${T}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/extrae/lib"
+
+		--disable-mic
+		--disable-online
+		--disable-peruse
+		--disable-pmapi
+		--disable-static
+
+		--enable-shared
+
+		--with-librt="${EPREFIX}/usr"
+		--with-mpi="${EPREFIX}/usr"
+		--with-papi="${EPREFIX}/usr"
+		--with-pic
+		--with-unwind="${EPREFIX}/usr"
+
+		--without-dyninst
+		--without-cupti
+		--without-memkind
+		--without-clustering
+		--without-synapse
+		--without-spectral
+		--without-openshmem
+		--without-gm
+		--without-mx
+
+		$(use_enable doc)
+		$(use_enable heterogeneous)
+		$(use_enable inotify)
+		$(use_enable instrument-dynamic-memory)
+		$(use_enable instrument-io)
+		$(use_enable instrument-syscall)
+		$(use_enable merge-in-trace)
+		$(use_enable nanos)
+		$(use_enable openmp)
+		$(use_enable sampling)
+		$(use_enable parallel-merge)
+		$(use_enable pebs-sampling)
+		$(use_enable posix-clock)
+		$(use_enable pthread)
+		$(use_enable single-mpi-lib)
+		$(use_enable smpss)
+		$(use_enable xml)
+	)
+#--with-pmpi-hook (Choose method to call PMPI (dlsym or pmpi))
+
+#	if use aspectj; then
+#		myconf+=( "--with-java-aspectj=${EPREFIX}/usr/share/aspectj/lib" )
+#		myconf+=( "--with-java-aspectj-weaver=${EPREFIX}/usr" )
+#	else
+		myconf+=( "--without-java-aspectj-weaver" )
+		myconf+=( "--without-java-aspectj" )
+#	fi
+	if use boost; then
+		myconf+=( "--with-boost=${EPREFIX}/usr" )
+	else
+		myconf+=( "--without-boost" )
+	fi
+	if use dwarf; then
+		myconf+=( "--with-dwarf=${EPREFIX}/usr" )
+	else
+		myconf+=( "--without-dwarf" )
+	fi
+	if use elf; then
+		myconf+=( "--with-elf=${EPREFIX}/usr" )
+	else
+		myconf+=( "--without-elf" )
+	fi
+	if use fft; then
+		myconf+=( "--with-fft=${EPREFIX}/usr" )
+	else
+		myconf+=( "--without-fft" )
+	fi
+	if use java; then
+		myconf+=( "--with-java-jdk=$(java-config -O)" )
+	else
+		myconf+=( "--without-java-jdk" )
+	fi
+	if use opencl; then
+		myconf+=( "--with-opencl=${EPREFIX}/usr" )
+	else
+		myconf+=( "--without-opencl" )
+	fi
+
+	use sionlib && myconf+=( "--with-sionlib=${EPREFIX}/usr" )
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	mkdir -p "${D}/$(python_get_sitedir)/" || die
+	mv "${ED}/usr/libexec/pyextrae" "${D}/$(python_get_sitedir)/" || die
+	python_optimize "${D}/$(python_get_sitedir)/pyextrae"
+
+	#super-duper workaround
+	mkdir -p "${ED}/usr/share/doc/${PF}" || die
+	mv "${ED}/${T}/example" "${ED}/usr/share/doc/${PF}/examples" || die
+	mv "${ED}/${T}/tests" "${ED}/usr/share/doc/${PF}/" || die
+
+	if use doc ; then
+		mv "${T}/docs"/* "${ED}/usr/share/doc/${PF}/" || die
+		mv "${T}/man" "${ED}/usr/share/" || die
+		docompress -x "/usr/share/doc/${PF}/html"
+	fi
+	docompress -x "/usr/share/doc/${PF}/examples"
+	docompress -x "/usr/share/doc/${PF}/tests"
+
+	find "${ED}" -name '*.a' -delete || die
+	find "${ED}" -name '*.la' -delete || die
+}
--- a/sys-cluster/extrae/extrae-3.8.3-r3.ebuild
+++ b/sys-cluster/extrae/extrae-3.8.3-r3.ebuild
@@ -0,0 +1,203 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+inherit autotools java-pkg-opt-2 python-single-r1
+
+DESCRIPTION="Instrumentation framework to generate execution traces of parallel runtimes"
+HOMEPAGE="https://github.com/bsc-performance-tools/extrae"
+SRC_URI="https://github.com/bsc-performance-tools/extrae/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="boost clustering doc dwarf elf fft heterogeneous inotify +instrument-dynamic-memory +instrument-io +instrument-syscall merge-in-trace nanos opencl openmp +parallel-merge pebs-sampling +posix-clock pthread sampling +single-mpi-lib sionlib smpss +xml"
+#aspectj and aspectj-weaver need to both be enabled at the same time
+#current dev-java/aspectj package only provides aspectj.jar
+#aspectj needs foo/lib/aspectj.jar and foo/bin/ajc
+#aspectj-weaver needs bar/aspectjweaver.jar
+#TODO: find out who is pulling in libpfm
+#TODO: find out which FFT library is used
+#TODO: remove some useflags (boost fft elf dwarf)
+#TODO: pmapi online dyninst cuda spectral cupti openshmem gm mx synapse memkind aspectj
+#TODO: support llvm libunwind, llvm rt, elftoolchain
+
+CDEPEND="
+	${PYTHON_DEPS}
+	app-arch/xz-utils
+	dev-libs/icu
+	dev-libs/libpfm
+	dev-libs/libxml2
+	dev-libs/papi
+	sys-apps/hwloc
+	sys-libs/zlib
+	virtual/mpi
+
+	|| ( sys-libs/libunwind sys-libs/llvm-libunwind )
+	|| ( sys-devel/binutils:* sys-libs/binutils-libs )
+
+	boost? ( dev-libs/boost:= )
+	clustering? ( sys-cluster/clusteringsuite )
+	dwarf? ( dev-libs/libdwarf )
+	elf? ( virtual/libelf )
+	inotify? ( dev-libs/libevent )
+	opencl? ( dev-util/opencl-headers )
+	sionlib? ( sys-cluster/sionlib:= )
+"
+#	aspectj? ( >=dev-java/aspectj-1.9.6 )
+DEPEND="
+	${CDEPEND}
+	java? ( virtual/jdk:1.8 )
+"
+RDEPEND="
+	${CDEPEND}
+	java? ( virtual/jre:1.8 )
+	virtual/opencl
+"
+BDEPEND="
+	doc? (
+		app-text/ghostscript-gpl
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+	)
+"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	java? ( pthread )
+"
+#	cupti? ( cuda )
+#	dyninst? ( boost dwarf elf )
+#	online? ( synapse )
+#	aspectj? ( java )
+#	spectral? ( fft )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	export VARTEXFONTS="${T}/fonts"
+
+	local myconf=(
+		--datadir="${T}"
+		--datarootdir="${T}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/extrae/lib"
+
+		--disable-mic
+		--disable-online
+		--disable-peruse
+		--disable-pmapi
+		--disable-static
+
+		--enable-shared
+
+		--with-librt="${EPREFIX}/usr"
+		--with-mpi="${EPREFIX}/usr"
+		--with-papi="${EPREFIX}/usr"
+		--with-pic
+		--with-unwind="${EPREFIX}/usr"
+
+		--without-dyninst
+		--without-cupti
+		--without-memkind
+		--without-synapse
+		--without-spectral
+		--without-openshmem
+		--without-gm
+		--without-mx
+
+		$(use_enable doc)
+		$(use_enable heterogeneous)
+		$(use_enable inotify)
+		$(use_enable instrument-dynamic-memory)
+		$(use_enable instrument-io)
+		$(use_enable instrument-syscall)
+		$(use_enable merge-in-trace)
+		$(use_enable nanos)
+		$(use_enable openmp)
+		$(use_enable sampling)
+		$(use_enable parallel-merge)
+		$(use_enable pebs-sampling)
+		$(use_enable posix-clock)
+		$(use_enable pthread)
+		$(use_enable single-mpi-lib)
+		$(use_enable smpss)
+		$(use_enable xml)
+	)
+#--with-pmpi-hook (Choose method to call PMPI (dlsym or pmpi))
+
+#	if use aspectj; then
+#		myconf+=( "--with-java-aspectj=${EPREFIX}/usr/share/aspectj/lib" )
+#		myconf+=( "--with-java-aspectj-weaver=${EPREFIX}/usr" )
+#	else
+		myconf+=( "--without-java-aspectj-weaver" )
+		myconf+=( "--without-java-aspectj" )
+#	fi
+	if use boost; then
+		myconf+=( "--with-boost=${EPREFIX}/usr" )
+	else
+		myconf+=( "--without-boost" )
+	fi
+	if use clustering; then
+		myconf+=( "--with-clustering=${EPREFIX}/usr" )
+	else
+		myconf+=( "--without-clustering" )
+	fi
+	if use dwarf; then
+		myconf+=( "--with-dwarf=${EPREFIX}/usr" )
+	else
+		myconf+=( "--without-dwarf" )
+	fi
+	if use elf; then
+		myconf+=( "--with-elf=${EPREFIX}/usr" )
+	else
+		myconf+=( "--without-elf" )
+	fi
+	if use fft; then
+		myconf+=( "--with-fft=${EPREFIX}/usr" )
+	else
+		myconf+=( "--without-fft" )
+	fi
+	if use java; then
+		myconf+=( "--with-java-jdk=$(java-config -O)" )
+	else
+		myconf+=( "--without-java-jdk" )
+	fi
+	if use opencl; then
+		myconf+=( "--with-opencl=${EPREFIX}/usr" )
+	else
+		myconf+=( "--without-opencl" )
+	fi
+
+	use sionlib && myconf+=( "--with-sionlib=${EPREFIX}/usr" )
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	mkdir -p "${D}/$(python_get_sitedir)/" || die
+	mv "${ED}/usr/libexec/pyextrae" "${D}/$(python_get_sitedir)/" || die
+	python_optimize "${D}/$(python_get_sitedir)/pyextrae"
+
+	#super-duper workaround
+	mkdir -p "${ED}/usr/share/doc/${PF}" || die
+	mv "${ED}/${T}/example" "${ED}/usr/share/doc/${PF}/examples" || die
+	mv "${ED}/${T}/tests" "${ED}/usr/share/doc/${PF}/" || die
+
+	if use doc ; then
+		mv "${T}/docs"/* "${ED}/usr/share/doc/${PF}/" || die
+		mv "${T}/man" "${ED}/usr/share/" || die
+		docompress -x "/usr/share/doc/${PF}/html"
+	fi
+	docompress -x "/usr/share/doc/${PF}/examples"
+	docompress -x "/usr/share/doc/${PF}/tests"
+
+	find "${ED}" -name '*.a' -delete || die
+	find "${ED}" -name '*.la' -delete || die
+}
--- a/sys-cluster/extrae/metadata.xml
+++ b/sys-cluster/extrae/metadata.xml
@@ -18,9 +18,10 @@ process). Extrae generates trace files that can be later visualized with <pkg>sy
 	<use>
 		<!--<flag name="aspectj">Enable support for tracing Java through <pkg>dev-java/aspectj</pkg> (experimental)</flag>-->
 		<flag name="boost">Search for boost</flag>
-		<flag name="doc">Generates the documentation of this instrumentation package</flag>
+		<flag name="clustering">Enable <pkg>sys-cluster/clusteringsuite</pkg> support</flag>
 		<!--<flag name="cuda">Enable support for tracing CUDA calls on nVidia hardware and needs to point to the CUDA SDK installation path. This instrumentation is only valid in binaries that use the shared version of the CUDA library.</flag>-->
 		<!--<flag name="cupti">CUPTI is used to instrument CUDA calls</flag>-->
+		<flag name="doc">Generates the documentation of this instrumentation package</flag>
 		<flag name="dwarf">Build with <pkg>dev-libs/libdwarf</pkg></flag>
 		<!--<flag name="dyninst">Build with dyninst</flag>-->
 		<flag name="elf">Build with <pkg>virtual/libelf</pkg></flag>
@@ -44,6 +45,7 @@ process). Extrae generates trace files that can be later visualized with <pkg>sy
 		<flag name="sampling">Enable PAPI sampling support</flag>
 		<!--<flag name="spectral">This package enables support for on-line spectral analysis.</flag>-->
 		<flag name="single-mpi-lib">Produces a single instrumentation library for MPI that contains both Fortran and C wrappers. Applications that call the MPI library from both C and Fortran languages need this flag to be enabled.</flag>
+		<flag name="sionlib">Enable support for <pkg>sys-cluster/sionlib</pkg></flag>
 		<flag name="smpss">Enable support for tracing SMP-superscalar</flag>
 		<!--<flag name="synapse">This library is a front-end of the MRNet library</flag>-->
 		<flag name="xml">Enable support for XML configuration</flag>
--- a/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.6-r1.ebuild
@@ -22,7 +22,6 @@ IUSE="+cxx debug doc +fortran +mpi +ompi +openmp +parutils +pthreads python"
 PATCHES=( "${FILESDIR}/respect-flags.patch" )

 RDEPEND="
-	${PYTHON_DEPS}
 	mpi? ( virtual/mpi )
 	ompi? (
 		sys-libs/libomp
@@ -30,7 +29,10 @@ RDEPEND="
 	)
 	openmp? ( sys-libs/libomp )
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+"
 BDEPEND="doc? ( app-doc/doxygen )"
 S="${WORKDIR}/${PN}"

@@ -59,7 +61,7 @@ src_configure() {

 	local myconf=(
 		--disable-mic
-		--prefix="${EPREFIX}/usr"
+		--prefix="${T}/prefix/usr"
 	)

 	#custom configure?
@@ -78,25 +80,34 @@ src_configure() {
 }

 src_compile() {
+	export VARTEXFONTS="${T}/fonts"
 	default
-	use doc && doxygen -u doxy && doxygen doxy || die
+	if use doc ; then
+		doxygen -u doxy || die
+		doxygen doxy || die
+	fi
 }

 src_install() {
-	sed -e "s|\${PREFIX}|${D}/usr|g" -i mf/common.defs || die
-	sed -e "s|\$(PREFIX)|${D}/usr|g" -i src/utils/Makefile || die
-	sed \
-		-e "s|\$(PREFIX)|${D}/usr|g" \
-		-e "s|\${PREFIX}|${D}/usr|g" \
-		-i mf/RealMakefile || die
-
+	mkdir -p "${T}/prefix/usr/share/doc/${PF}" || die
 	default

-	use doc && dodoc -r doc/html
+	mv "${T}/prefix/usr/examples" "${T}/prefix/usr/share/doc/${PF}/" || die

-	mv "${ED}/usr/examples" "${ED}/usr/share/doc/${PF}/" || die
+	#move 64 bit libraries in lib64
+	libs64=( "${T}"/prefix/usr/lib/*64* )
+	if [[ ${#libs64[@]} -gt 0 ]]; then
+		mkdir "${T}/prefix/usr/lib64" || die
+		for l in "${libs64[@]}" ; do
+			mv "${l}" "${T}/prefix/usr/lib64/" || die
+		done
+	fi
+
+	rsync -ravXHA "${T}/prefix/usr" "${ED}/" || die
 	docompress -x "/usr/share/doc/${PF}/examples"
-	docompress -x "/usr/share/doc/${PF}/html"
+
+	use doc && dodoc -r doc/html
+	use doc && docompress -x "/usr/share/doc/${PF}/html"

 	#TODO: build shared libs
 	#find "${ED}" -name '*.a' -delete || die
--- a/sys-fs/dwarfs/dwarfs-0.5.4-r1.ebuild
+++ b/sys-fs/dwarfs/dwarfs-0.5.4-r1.ebuild
@@ -33,7 +33,7 @@ RDEPEND="${PYTHON_DEPS}
 		app-arch/libarchive
 		app-arch/zstd
 		app-arch/lz4
-		app-arch/xz-utils
+		app-arch/xz-utils[static-libs]
 		app-arch/snappy
 		dev-cpp/sparsehash
 		dev-cpp/gflags
@@ -86,6 +86,7 @@ src_install(){
 }

 pkg_postinst(){
+	elog "Suggest to enable USE 'threads' globally if you have multicore machine"
 	elog "Since version 0.4.1 GGC builds has been fixed. Now both Clang and GCC are working very well"
 	elog "You may find more information in the"
 	elog "${HOMEPAGE}"
--- a/sys-libs/safeclib/safeclib-3.6.0_p20210407-r2.ebuild
+++ b/sys-libs/safeclib/safeclib-3.6.0_p20210407-r2.ebuild
@@ -47,6 +47,8 @@ src_prepare() {
 }

 src_configure() {
+	export VARTEXFONTS="${T}/fonts"
+
 	if use modules ; then
 		set_kvobj ko
 		econf "${myconf[@]}" --disable-wchar
@@ -87,12 +89,15 @@ src_install() {
 	cd "${S}-lib" || die
 	default
 	einstalldocs
-	use doc && dodoc -r doc/.

-	# wcsstr towupper towlower manpages collide with sys-apps/man-pages
-	rm "${ED}/usr/share/man/man3/towlower.3" || die
-	rm "${ED}/usr/share/man/man3/towupper.3" || die
-	rm "${ED}/usr/share/man/man3/wcsstr.3" || die
+	if use doc ; then
+		dodoc -r doc/.
+
+		# wcsstr towupper towlower manpages collide with sys-apps/man-pages
+		rm "${ED}/usr/share/man/man3/towlower.3" || die
+		rm "${ED}/usr/share/man/man3/towupper.3" || die
+		rm "${ED}/usr/share/man/man3/wcsstr.3" || die
+	fi
 }

 src_test() {
--- a/www-servers/hinsightd/Manifest
+++ b/www-servers/hinsightd/Manifest
@@ -1 +1,2 @@
 DIST hin9-v0.9.0.tar.gz 65320 BLAKE2B c1348bc5afffa8804494f6ae228f54874d25cc5f40c17ee2a36f23104286f96f5d616cdc3e98de0854cf7d4b18165a2b70600b32f58024b679d213b2156c1f18 SHA512 60a1ff72d1abf57d8f764ebb77ab77f7069b40bfdbb5bb1c95324b366d1052378ffe36198112a595e08238622654a9c1e1d89679924883f8ff42b98ca7cf139e
+DIST hin9-v0.9.1.tar.gz 64851 BLAKE2B ca646af3b2a752f2b0ba2eec983f807d148b302a7a2db627117686dea3d16811829a1f89a3347708c775d8141372dd91ca46c79c32684b9366b703eb7018706e SHA512 175bbb25bd8be5052bcda96b709b33a996945c63f71249750ab11a46bafdb425818437023a882858e34692abc341d99141954ca31f6296383b26f617e76ac11a
--- a/www-servers/hinsightd/files/hinsightd-default-config.patch
+++ b/www-servers/hinsightd/files/hinsightd-default-config.patch
@@ -0,0 +1,12 @@
+diff --git a/workdir/main.lua b/workdir/main.lua
+index 4d516c6..08dd597 100644
+--- a/workdir/main.lua
+++ b/workdir/main.lua
+@@ -2,6 +2,7 @@
+ 
+ --redirect_log (logdir.."debug.log")
+ --redirect_log (NULL, "ffffffff")
+redirect_log (logdir.."debug.log")
+ 
+ function printf (...)
+   io.write (string.format (...))
--- a/www-servers/hinsightd/files/hinsightd-redefine-directories.patch
+++ b/www-servers/hinsightd/files/hinsightd-redefine-directories.patch
@@ -1,5 +1,5 @@
 diff --git a/src/hin/conf.h b/src/hin/conf.h
-index c4f7f4c..29b9375 100644
+index c4f7f4c..23b0714 100644
 --- a/src/hin/conf.h
 +++ b/src/hin/conf.h
@@ -2,9 +2,9 @@
@@ -21,8 +21,8 @@ index c4f7f4c..29b9375 100644
 #define HIN_HTTPD_MAX_DEFLATE_SIZE 0
 -#define HIN_HTTPD_POST_DIRECTORY "/tmp"
 -#define HIN_HTTPD_CACHE_DIRECTORY "/tmp"
-+#define HIN_HTTPD_POST_DIRECTORY "/var/tmp/hinsightd"
-+#define HIN_HTTPD_CACHE_DIRECTORY "/var/tmp/hinsightd"
+#define HIN_HTTPD_POST_DIRECTORY "/var/tmp/hinsightd/"
+#define HIN_HTTPD_CACHE_DIRECTORY "/var/tmp/hinsightd/"
 #define HIN_HTTPD_CACHE_CLEAN_ON_EXIT 1
 #define HIN_HTTPD_CACHE_TMPFILE 0
 #define HIN_HTTPD_CACHE_MAX_SIZE 64 * 1024 * 1024
--- a/www-servers/hinsightd/files/init.d.sh
+++ b/www-servers/hinsightd/files/init.d.sh
@@ -14,7 +14,7 @@ RUN_USER="hinsightd"
 extra_commands="checkconfig reload"

 command=$RUN_FILE
-command_args="--config $CFG_FILE --logdir $LOG_DIR --cwd $CWD_DIR --pidfile $PID_FILE --tmpdir $TMP_DIR"
+command_args="--config $CFG_FILE --logdir $LOG_DIR/ --cwd $CWD_DIR/ --pidfile $PID_FILE --tmpdir $TMP_DIR"
 pidfile="$PID_FILE"
 command_args_background="--daemonize"
 command_user="$RUN_USER:$RUN_USER"
--- a/www-servers/hinsightd/hinsightd-0.9.1.ebuild
+++ b/www-servers/hinsightd/hinsightd-0.9.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit fcaps lua-single systemd cmake
+
+DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals"
+HOMEPAGE="https://gitlab.com/tiotags/hin9"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"
+else
+	SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v${PV}/hin9-v${PV}.tar.gz"
+	S="${WORKDIR}/hin9-v${PV}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+IUSE="+openssl"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+BDEPEND="
+	dev-util/ninja
+	dev-util/cmake
+	virtual/pkgconfig
+"
+
+RDEPEND="
+	${LUA_DEPS}
+	acct-user/hinsightd
+	acct-group/hinsightd
+	sys-libs/liburing
+	sys-libs/zlib
+	openssl? ( dev-libs/openssl )
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/hinsightd-redefine-directories.patch"
+	"${FILESDIR}/hinsightd-default-config.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_OPENSSL=$(usex openssl)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	newbin "${BUILD_DIR}/hin9" hinsightd
+	newinitd "${FILESDIR}/init.d.sh" hinsightd
+	systemd_dounit "${FILESDIR}/hinsightd.service" # not tested
+
+	insinto /etc/hinsightd
+	newins "${S}/workdir/main.lua" hinsightd.lua
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/logrotate.d.sh hinsightd
+
+	keepdir /var/www/localhost/htdocs
+	keepdir /var/log/hinsightd
+	keepdir /var/tmp/hinsightd
+}
+
+pkg_postinst() {
+	fcaps CAP_NET_BIND_SERVICE /usr/bin/hinsightd
+}
--- a/www-servers/hinsightd/hinsightd-9999.ebuild
+++ b/www-servers/hinsightd/hinsightd-9999.ebuild
@@ -5,21 +5,29 @@ EAPI=7

 LUA_COMPAT=( lua5-{1..4} )

-inherit git-r3 fcaps lua-single systemd
+inherit fcaps lua-single systemd cmake

 DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals"
 HOMEPAGE="https://gitlab.com/tiotags/hin9"
-EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"
+else
+	SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/v${PV}/hin9-v${PV}.tar.gz"
+	S="${WORKDIR}/hin9-v${PV}"
+	KEYWORDS="~amd64"
+fi

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""

-IUSE="" #+openssl
+IUSE="+openssl"
 REQUIRED_USE="${LUA_REQUIRED_USE}"

 BDEPEND="
 	dev-util/ninja
+	dev-util/cmake
 	virtual/pkgconfig
 "

@@ -29,25 +37,25 @@ RDEPEND="
 	acct-group/hinsightd
 	sys-libs/liburing
 	sys-libs/zlib
-	dev-libs/openssl
+	openssl? ( dev-libs/openssl )
 "

 DEPEND="${RDEPEND}"

 PATCHES=(
 	"${FILESDIR}/hinsightd-redefine-directories.patch"
+	"${FILESDIR}/hinsightd-default-config.patch"
 )

-#src_configure() {
-#}
-
-src_compile() {
-	cd build
-	ninja || die
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_OPENSSL=$(usex openssl)
+	)
+	cmake_src_configure
 }

 src_install() {
-	newbin "${S}/build/hin9" hinsightd
+	newbin "${BUILD_DIR}/hin9" hinsightd
 	newinitd "${FILESDIR}/init.d.sh" hinsightd
 	systemd_dounit "${FILESDIR}/hinsightd.service" # not tested

--- a/www-servers/hinsightd/metadata.xml
+++ b/www-servers/hinsightd/metadata.xml
@@ -17,6 +17,6 @@
 		Full debug information can be toggled per request and outputted to 			console or a log file.
 	</longdescription>
 	<use>
-		<!--<flag name="openssl">Enable tls encryption with openssl</flag>-->
+		<flag name="openssl">Enable tls encryption with openssl</flag>
 	</use>
 </pkgmetadata>
				`@@ -0,0 +1 @@`
				`DIST v20.12.tar.gz 14640631 BLAKE2B 94693d3117343b3a4632aa0a1ef8492b9a895bb5e4567c358966d4defe379e5b50367b59d1e74d8beb5d9c105e760b1e618e78ab60806ed829ead44ccee02363 SHA512 c2fabe2d983ad2626d2fe92c91fc2a944d4eb3a10c627ea877a498814fdebe957ac55665623dee2ea30591ed6ce9e70d708073d007d60769c65a2e84714e8c62`
				`@@ -0,0 +1 @@`
				`DIST kaidan-0.7.0.tar.xz 516684 BLAKE2B 6ee2f6696b1fca2ec564563e13c621f63edc8696d4b14ec22157adef611d5ba9d2d522bd960d1becc16a720851263503251d5a1f850af409daf439165a23839f SHA512 89389db3dfbc6acfae252c6fad2492a997760495f9a55d6f56bbf0f49832fcbff35548ba89dc3f24e6ff05b0c4b1ee0242566ca1c7f662fc096b13b37f99af94`
				`@@ -0,0 +1 @@`
				`DIST vips-8.10.6.tar.gz 19532428 BLAKE2B ccc3fd55a8231a1efb65e12acc5b749c9331ce95fcdce6a95a3b3a6cb26da1846da68a44c16c71837ec7f4de0c14f60cf4b5605ab05b70209ae607ae257d0ec9 SHA512 e3e623ad7b44dfb65078c49d2694d94bb11294300630d9e3c53ff1f9e9aaf58d196881d52c191b4604d9f63453199b7da3601425ffc9554f1c25cf08d630ef8b`
				`@@ -0,0 +1 @@`
				`DIST clusteringsuite-2.6.9-src.tar.bz2 8081023 BLAKE2B d53e08a51e0a5a2d487bc4413c19d802804b7ae79b5f1e7c466ba2c37e36d90864a4629f51a98ca5caa83f4cc0a3ca8c74f5652c044c08591c65f3b50acf13d2 SHA512 80903e3d2c018e8ed23874715f7ffc1706ac5d9dcd0826c75bb07c973c28fa9755d4c130021abd6e969e983fbe23463be7361bb29b6d1ab04596ba4f987b1b6a`