9 files changed, 231 insertions, 45 deletions
diff --git a/dev-cpp/drogon/Manifest b/dev-cpp/drogon/Manifest
index 417978ecd4ac..6888f11ce791 100644
--- a/dev-cpp/drogon/Manifest
+++ b/dev-cpp/drogon/Manifest
@@ -1 +1,3 @@
 DIST drogon-1.7.5.tar.gz 500398 BLAKE2B 9956542206119abd3fa8f2be61a59e09127c1c57019082a372b08e9e04f20d1361ae439118593078db13397e7c925ee5f904ff186dbb51c89f4e7245f4647f98 SHA512 8be77961026d13b55dbfcc2e43972b4fb8f1cd9a6bfb8098d5bdfc8b60ff67c2d3ede4bdb5815614a8233dc184cbf3aa363a9d33eed96b9f748544e20b15f2c7
+DIST drogon-1.8.0.tar.gz 519707 BLAKE2B 94a557641f957172ced0e5b6f023040201cdc78c6bdda10375a6093a8fd4cabd1d6f7a798d4e9d3df83f9c76eb0412e102cee841744cf61f796ab0ba485e58ba SHA512 a834d937e3719059223d9bf19d777dbc92eaf09c5c9c44b5a742bfefcbcd95a146a6568cef8c058050fb87e330f221434ffe784dfa29a49de12b031f86ab1a33
+DIST trantor-1.5.6-test.pem 2949 BLAKE2B cd413aea981b8ec279ede073f8a19702ee1fa7bbe1c56177368dba7dda00bef2fef439eb9ee7f4d7be78834a6ab87cdbeb2f196d8bc0d7e9ce91b19c4484f1ea SHA512 4c73bc66102989a5c6706a1874940512b9d643383e943f2dea2cd1fafbfad3089da84fd08a3758261127fe756fe1f732790c589d77bcf94fa223202f38ef5852
diff --git a/dev-cpp/drogon/drogon-1.8.0.ebuild b/dev-cpp/drogon/drogon-1.8.0.ebuild
new file mode 100644
index 000000000000..dfc208f1e6e4
--- /dev/null
+++ b/dev-cpp/drogon/drogon-1.8.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PEM_V="1.5.6"
+
+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
+	test? ( https://raw.githubusercontent.com/an-tao/trantor/v${MY_PEM_V}/trantor/tests/server.pem -> trantor-${MY_PEM_V}-test.pem )
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+brotli doc examples mariadb postgres redis sqlite +ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-cpp/trantor-1.5.6:=
+	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:3 )
+	ssl? ( dev-libs/openssl:= )
+	elibc_Darwin? ( sys-libs/native-uuid )
+	elibc_SunOS? ( sys-libs/libuuid )
+	!elibc_Darwin? ( !elibc_SunOS? (
+		sys-apps/util-linux
+	) )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( CONTRIBUTING.md ChangeLog.md README.md README.zh-CN.md README.zh-TW.md )
+
+src_unpack() {
+	default
+	# the cert is in the trantor submodule normally, but we unbundle that
+	if use test; then
+		mkdir -p ${P}/trantor/trantor/tests || die
+		cp -v "${DISTDIR}"/trantor-${MY_PEM_V}-test.pem \
+			${P}/trantor/trantor/tests/server.pem \
+			|| die "could not copy test certificate"
+	fi
+}
+
+src_prepare() {
+	cmake_comment_add_subdirectory "trantor"
+
+	use examples && DOCS+=( "${S}/examples" )
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DBUILD_DOC=$(usex doc)
+		-DBUILD_EXAMPLES=NO
+		-DBUILD_POSTGRESQL=$(usex postgres)
+		-DBUILD_MYSQL=$(usex mariadb)
+		-DBUILD_SQLITE=$(usex sqlite)
+		-DBUILD_REDIS=$(usex redis)
+		-DBUILD_TESTING=$(usex test)
+		-DBUILD_BROTLI=$(usex brotli)
+		$(cmake_use_find_package ssl OpenSSL)
+		$(cmake_use_find_package doc Doxygen)
+	)
+	use doc && HTML_DOCS=( "${BUILD_DIR}/docs/drogon/html/." )
+
+	cmake_src_configure
+}
+
+src_install() {
+	docompress -x /usr/share/doc/${PF}/examples
+	cmake_src_install
+}
diff --git a/dev-cpp/edencommon/Manifest b/dev-cpp/edencommon/Manifest
index e2ab224a0ac1..9a665e574a61 100644
--- a/dev-cpp/edencommon/Manifest
+++ b/dev-cpp/edencommon/Manifest
@@ -3,3 +3,4 @@ DIST edencommon-0_pre20220815.tar.gz 142456 BLAKE2B 64e2b8e155e56ff50ca348ae53f3
 DIST edencommon-2022.08.15.00.gh.tar.gz 142467 BLAKE2B e3d72f1ae5845db2c18003202ca6360cc9496c3544eff2cad8eee486098dae3649bc54a0b7b9ea57fb72a1669a1f4307a017a85693499ca353f553f0de79dc6b SHA512 211a6f0e22b662e743cc944b7bc3d9ad63c1e4dd55b515db958fdfc04463357caef39ad43a9089417ac61929a8f32375f2fd673a113c04a162e94f6419737e81
 DIST edencommon-2022.08.22.00.gh.tar.gz 143598 BLAKE2B af33b9369c694a4649d27dfe66bae6a7442ff2cc241046b05dc71c98375dbfed9386ee3ef6f4f0f19252435e9579164c0826e4996078b43005de5ad751166ba9 SHA512 079ca724c7ce276586180940369709cabab187aac3e2e80cdec024b4ae9687158cd7888fa413a4e008dc68b725e690b0b0308a69c86c3bde036abfdcd2eaa168
 DIST edencommon-2022.08.29.00.gh.tar.gz 143430 BLAKE2B a66bae35413097140b24c9313b12d55d52cbd98396ff1afacc751eb9752d4116ab19aeb9320dead5500189d74b4d91fdc09d9648fc6b5fbb55a706328488e7ef SHA512 6622c5de2dbff96717a345c82aaf9335745ed57262bb55c7a6704a68259ce81376ff0a2e9f3818ed1c1f08434da704f31fd4e3d8c48dd13646f0202e7564b2c7
+DIST edencommon-2022.09.05.00.gh.tar.gz 143447 BLAKE2B 732963333a663b76c445076392f59de46dec6a94d8bec75252952c88eb748b3f9a62e9d10134c8c33525ad0b3c2c3d235b96bc65500de9a63d1042f1f7c9c528 SHA512 2110446ef109fc151d2d0d2d7eead283ced5ddc4ef4af3bea66d6aebf26c141a636bb03ee9e3f35ce7440373cb37858b748c39ddd14588513373ac7801600897
diff --git a/dev-cpp/edencommon/edencommon-2022.09.05.00.ebuild b/dev-cpp/edencommon/edencommon-2022.09.05.00.ebuild
new file mode 100644
index 000000000000..5c158b468234
--- /dev/null
+++ b/dev-cpp/edencommon/edencommon-2022.09.05.00.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# These must be bumped together:
+# dev-cpp/edencommon
+# dev-cpp/folly
+# dev-util/watchman
+
+inherit cmake
+
+DESCRIPTION="Shared library for Watchman and Eden projects"
+HOMEPAGE="https://github.com/facebookexperimental/edencommon"
+SRC_URI="https://github.com/facebookexperimental/edencommon/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="llvm-libunwind"
+
+RDEPEND="
+	dev-cpp/gflags:=
+	dev-cpp/glog:=[gflags]
+	dev-cpp/folly:=
+	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	!llvm-libunwind? ( sys-libs/libunwind:= )
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/gtest
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DIR="$(get_libdir)/cmake/${PN}"
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/folly/Manifest b/dev-cpp/folly/Manifest
index 52b8ed055ebc..cee34716d5ed 100644
--- a/dev-cpp/folly/Manifest
+++ b/dev-cpp/folly/Manifest
@@ -5,3 +5,4 @@ DIST folly-v2022.08.08.00.tar.gz 3684846 BLAKE2B 462c183effea452ca706a7a14ebba82
 DIST folly-v2022.08.15.00.tar.gz 3691439 BLAKE2B 96ba34a18b51ea91aacd2bbcdbfef855a8924004850534ef342799d1c36d6ece04b77100b8901053fd3d0a997d1764ffdfd5bcd60928b4a4f8c9480f5a6d8ee6 SHA512 72d8d29a1f26f5af33d13e1d2f7ed5ce439bc7345daecc3ed1d30e33b802e0aa4f1ca59fae16db25079e55da14f60cd6a548f0f31eef48abad49b71baa6e6307
 DIST folly-v2022.08.22.00.tar.gz 3693126 BLAKE2B 1d28c114068d6d37bb0d57fddc9ab22438efc967aba810ba463b2e63c451a7d66152c5ec5b42d10879ed3d44467af5548d98998c52080b10f82aabfaec5f8b85 SHA512 b042a25c4e114d7098dbba94699a472e94a9074fe0814b1c5417e5bf995b69a22704613ae2a863d4e098511b0b8cc38c2e7c172a02b7bf772e238edcfe967c9e
 DIST folly-v2022.08.29.00.tar.gz 3696645 BLAKE2B c1ff618be8b6a73bf0a1249212cf904ac472711086e54da73dd631ecf002761e30496e8631d6591f51e279b736ae9b3fe50959de6b1f86f01f9d6bc08fe675fc SHA512 1437a1314e26624715a0bb781049e19300eb3a67648287b319c55ce0dfbc867a09bd9d2f0cece6fc75fc62b21899aa94b464ae49c12687be7c94fdf0c7b95790
+DIST folly-v2022.09.05.00.tar.gz 3707503 BLAKE2B 417df2b8e5dc21b6bffa815b265f85321c93c5d841ca0be77da46c32d6c75dc135a86ec37d8d6a6c3e2b95d8ccfe73e30739713c97e43f4cd3ba18c8a9d3dbde SHA512 5ab206606c3e8b0930e098bc86406edd1b66e99bfa5b3bdcd93bfc054c83fae5271b4257a03a2e18d9f1f789bf64088de2e0c3bbd0a9618ef4281e748da0ccba
diff --git a/dev-cpp/folly/folly-2022.09.05.00.ebuild b/dev-cpp/folly/folly-2022.09.05.00.ebuild
new file mode 100644
index 000000000000..fcc47d18f6a8
--- /dev/null
+++ b/dev-cpp/folly/folly-2022.09.05.00.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# These must be bumped together:
+# dev-cpp/edencommon
+# dev-cpp/folly
+# dev-util/watchman
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="An open-source C++ library developed and used at Facebook"
+HOMEPAGE="https://github.com/facebook/folly"
+SRC_URI="https://github.com/facebook/folly/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="llvm-libunwind test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-arch/bzip2
+	app-arch/lz4:=
+	app-arch/snappy:=
+	app-arch/xz-utils
+	app-arch/zstd:=
+	dev-cpp/gflags:=
+	dev-cpp/glog:=[gflags]
+	dev-libs/boost:=[context]
+	dev-libs/double-conversion:=
+	dev-libs/libaio
+	dev-libs/libevent:=
+	dev-libs/libfmt:=
+	dev-libs/libsodium:=
+	dev-libs/openssl:=
+	>=sys-libs/liburing-2.2:=
+	sys-libs/zlib
+	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	!llvm-libunwind? ( sys-libs/libunwind:= )"
+# libiberty is linked statically
+DEPEND="${RDEPEND}
+	sys-libs/binutils-libs
+	test? ( dev-cpp/gtest )"
+BDEPEND="test? ( sys-devel/clang )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2022.07.04.00-musl-fix.patch
+)
+
+pkg_setup() {
+	[[ ${BUILD_TYPE} == binary ]] && return
+
+	if use test && ! tc-is-clang ; then
+		# Always build w/ Clang for now to avoid gcc ICE
+		# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106230
+		#if [[ $(gcc-major-version) -eq 12 ]] ; then
+		#	return
+		#fi
+
+		## Only older GCC 11 is broken
+		#if [[ $(gcc-major-version) -eq 11 && $(gcc-minor-version) -ge 3 && $(gcc-micro-version) -ge 1 ]] ; then
+		#	return
+		#fi
+
+		ewarn "Forcing build with Clang due to GCC bug (because tests are enabled)"
+		#ewarn "(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104008)"
+
+		export CC=${CHOST}-clang
+		export CXX=${CHOST}-clang++
+	fi
+}
+
+src_configure() {
+	# Fragile when changing compilers
+	export CCACHE_DISABLE=1
+
+	# TODO: liburing could in theory be optional but fails to link
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+
+		-DBUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# - timeseries_histogram_test.TimeseriesHistogram.Percentile|HHWheelTimerTest
+		# Long-standing known test failure
+		# TODO: report upstream
+		# - HHWheelTimerTest.HHWheelTimerTest.CancelTimeout
+		# Timeouts are fragile
+		-E "(timeseries_histogram_test.TimeseriesHistogram.Percentile|HHWheelTimerTest.HHWheelTimerTest.CancelTimeout)"
+	)
+
+	cmake_src_test
+}
diff --git a/dev-cpp/trantor/Manifest b/dev-cpp/trantor/Manifest
index d9b9f8508a4d..b79498b2c271 100644
--- a/dev-cpp/trantor/Manifest
+++ b/dev-cpp/trantor/Manifest
@@ -1,2 +1 @@
-DIST trantor-1.5.5.tar.gz 106134 BLAKE2B 52af020c2b862532f5a473b7714654d5a1ea93415059aa3675e0c48d630a1b5ef43782a60ca1d09752c1ef9b90dfec19155af39673e25eb0c99dfc40a9dc0ddb SHA512 41068dcefcaf55908735126375b65a83a7d7085f30d5eb14e8d73fa255405ec77164c34b9ef0e5e6da3aeae3e66b9d57d4fca8901d63d4414bf8e857bd25dcd4
 DIST trantor-1.5.6.tar.gz 109719 BLAKE2B 5465f1cddd014a9dee4dd1ea1f8e6f36a1eef3a16424305ff2102fb489838260b415d92e43d72a3fe99db924946987e8e8c64f6720488c2e9e0f42b1b031ca0a SHA512 9c9827b1640fa23f2941c6c10ffe692d4207595de1cb149f94140c0f20d4fe6c45e3efcc50d464bd40aff80443dfe3bdd8db263302755ab8f639a920e497c0b3
diff --git a/dev-cpp/trantor/trantor-1.5.5.ebuild b/dev-cpp/trantor/trantor-1.5.5.ebuild
deleted file mode 100644
index a75b7b087157..000000000000
--- a/dev-cpp/trantor/trantor-1.5.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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/${PV}"
-KEYWORDS="~amd64"
-IUSE="adns doc +ssl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	adns? ( net-dns/c-ares )
-	ssl? ( dev-libs/openssl )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-src_configure() {
-	local -a mycmakeargs=(
-		"-DBUILD_TRANTOR_SHARED=YES"
-		"-DBUILD_DOC=$(usex doc)"
-		"-DBUILD_TESTING=$(usex test)"
-		"-DBUILD_C-ARES=$(usex adns)"
-		"$(cmake_use_find_package ssl OpenSSL)"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS="${BUILD_DIR}/docs/trantor/html/*"
-
-	cmake_src_install
-}
diff --git a/dev-cpp/trantor/trantor-1.5.6.ebuild b/dev-cpp/trantor/trantor-1.5.6-r1.ebuild
index f28b11d3f4bb..f28b11d3f4bb 100644
--- a/dev-cpp/trantor/trantor-1.5.6.ebuild
+++ b/dev-cpp/trantor/trantor-1.5.6-r1.ebuild