Merge updates from master

2026-07-19 20:13:01 -04:00 · 2020-08-13 09:05:34 +00:00
parent f289ad793b def2c0c60e
commit c86564523f
9 changed files with 40 additions and 106 deletions
--- a/app-portage/version/Manifest
+++ b/app-portage/version/Manifest
@@ -1,3 +1,4 @@
+DIST version-0.10.0_alpha.tar.gz 43842 BLAKE2B c16d5524c6ffe860e4bef69702299f52dc32adae9f9966ccdcd45a8fdf000ed784eeb9eb109d1b7c91084f4120a64552b2aee14deec955ea0c773aee31077b2a SHA512 d7a0231e8519b298411bd2c63d7cea847381968b5db6be902507c9be7eb275a206d5c64cede284ab819397ffe647944c95069ee0dc8725e66ee2c02ef4bc8cfb
 DIST version-0.6.1_alpha.tar.gz 24986 BLAKE2B a78b7b1a5a2aec26afba6916483a40ac17c2aafae45511d3ba35bf28ec8466e1b696f235e1d3d54c83bffa5e9f974c7f2cd8f188e637d8b315e876d91741fae2 SHA512 ff68c7cfec5c59a1cfb8a600a1a439e7bdacba464c27e114f6fc0879caaf66cf04447e8dfff5c4afc02808fd19677f979520121b00c2d1f0a4995c5adade728d
 DIST version-0.6.2_alpha.tar.gz 35658 BLAKE2B 89be24ecf24ac711045711f65303eb2deae9cccaf8d1fbc28c8f07e4d1fff3234e5ffdb0686de05fa29becca9d4eba2875307a4842f0f1aa66a8910d74f984cc SHA512 1fbb9295209e58babe1039ded6295024db040b4c5775f405be4af5e49035d9d968f322d919b055567340998828d04bafab7a140d98807d4a0d8eeedda7ed2dba
 DIST version-0.9.0_alpha.tar.gz 41858 BLAKE2B 801f5c820484fb54cb4c030f20d2c287fd7054ac363065fe534b3d1e300a1078f49ca3770b3bec966aa161e3b4005934f4f4ed8ba8eecaedd17930e00561fd85 SHA512 bcba979bbf4016582d74c7fcc5882ea6e0e20a8884a398e4e87697fd3b0b44829f9b2e513aaa6f2f313cc0f319a48810795c640128b0f934310352d68803ca90
--- a/app-portage/version/version-0.10.0_alpha.ebuild
+++ b/app-portage/version/version-0.10.0_alpha.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MYPV="${PV/_alpha/-alpha}"
+
+DESCRIPTION="A command line function for package version  management."
+HOMEPAGE="https://github.com/azaeldevel/octetos-version"
+SRC_URI="https://github.com/azaeldevel/octetos-${PN}/archive/${MYPV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+DEPEND="dev-libs/octetos-core"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/octetos-${PN}-${MYPV}"
+
+src_prepare() {
+	default
+	eautoreconf -fi
+}
+src_configure() {
+	econf --with-portage
+}
--- a/dev-libs/octetos-coreutils/Manifest
+++ b/dev-libs/octetos-coreutils/Manifest
@@ -1,2 +1,3 @@
 DIST octetos-coreutils-0.3.0_alpha.tar.gz 56341 BLAKE2B f6eccfef565a3303939fefd45d9d0d10847032eb747ba9dc4fdca0f6d43aaf27aa6fc08273b89299cf071a5b0087c67a8eabecbba6542ab1b1ed7b9862397ebc SHA512 155fbf160edb48ad763e17ef2051b3b2e4b16c3bfda8156377d37d2d03710e7c7b933fbc02dfcba9deecedd844c770e2d116a3a1ff9535b407978a98e89bccdf
 DIST octetos-coreutils-0.4.0_alpha.tar.gz 56491 BLAKE2B b9438147acff96b81cacc21e59837c1f39c06c46ae4775ea3c6341f4168bde949bc348944807abc0b39b0936a61a871fd50852ac25c6e7af913597f7cc57035c SHA512 020830eced735604ce1fbdc2c1f54524c423b151319dcf161616f7654e04f0adf6a7726450f76bbbe4fc7eaa241d44c98a961b9157c277e3080dbdbea5de2093
+DIST octetos-coreutils-0.4.0_alpha2.tar.gz 56491 BLAKE2B b9438147acff96b81cacc21e59837c1f39c06c46ae4775ea3c6341f4168bde949bc348944807abc0b39b0936a61a871fd50852ac25c6e7af913597f7cc57035c SHA512 020830eced735604ce1fbdc2c1f54524c423b151319dcf161616f7654e04f0adf6a7726450f76bbbe4fc7eaa241d44c98a961b9157c277e3080dbdbea5de2093
--- a/dev-libs/octetos-coreutils/octetos-coreutils-0.4.0_alpha2.ebuild
+++ b/dev-libs/octetos-coreutils/octetos-coreutils-0.4.0_alpha2.ebuild
@@ -10,7 +10,7 @@ MYP="${PN}-${MYPV}"

 DESCRIPTION="Similar to coreutils but is a C ++ API."
 HOMEPAGE="https://github.com/azaeldevel/octetos-coreutils"
-SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz"
+SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
--- a/net-im/biboumi/Manifest
+++ b/net-im/biboumi/Manifest
@@ -1,4 +1,3 @@
-DIST biboumi-8.4.tar.xz 142576 BLAKE2B 3be5f8caf406c480a2750d76eacfe9191bccd8bd0fc2ba0ffe6352bf6f6527ab60f16eb25c9820c063af6c9ff4f1b125eb8d51d53bae4392a0d276e7ad488087 SHA512 69f7a47aaf2729a6bffb047201305cef4b87da952aa103d82e715585bf7b2e97fca8159ced1d74c4b01508c874c0db274d7b8349d1579ee3e69fc0ced2c260c2
 DIST biboumi-8.5.tar.xz 142576 BLAKE2B 0e9284aa757f43a8436a7df5f78962663ca8cbf9b9a24dd5ea9c978e3240274b6f817b00169b478332f28b5f50a96833e10b7a3feec5e16b96638ec94daeb843 SHA512 36aa8c66a720faa8d9f0bd76fcd4ee382b7d21f6822de2a03582d03e8e7e440a4a08b1ff21e876e70e6b5b1012973c9936d85faecf4781a5d78e7d8b206c3ef6
-DIST biboumi-9.0_pre20200419.tar.bz2 150555 BLAKE2B 6c73abcd62c7448cfc990c7228b37c0eda57d05ee987ef5c9661ed2bf8b8376e253e9507c03151d7334b5bff7c8e6807188e5e806473deb79d96fb81212cfb1f SHA512 b86485c0aae5cca6b5909eec2159c9b52069aade3e399721826c02f297b6f3d57e0ddcab9df4f6aa32b0219ccfbf1c7c63c1f51e4b8ab051b6d1f4dbbb34789e
+DIST biboumi-9.0-rc1.tar.xz 161008 BLAKE2B f1cf02d714a03633bcc8737d319f1c1c232b17edd6961ae9478189e85773b0cf28844e2d6173a63704353a371506cf1f4bc72a032434199e19d85a2383e9e261 SHA512 893d01e0b9d9606920b0cdecb45dec8a01b56701413d4633805db3dd5c32cd3bd2342c31d043beb34ac73c664dd968adc1f5e90a555369d8e6c78c4034bd1f20
 DIST biboumi-9.0_pre20200509.tar.bz2 153874 BLAKE2B 1ed805ebf5af1c82e350accf3375926c27c396880cedc7bceb7aa7066ac9b2958968562416dc9a9a56433e67db2dd47639f259c1a06ce939e082cfef68e0ea18 SHA512 52784f313da1bf0cfc61b7ad6e2feb5c86d55ee940026334713beb79f756e45fd78b3c1913e057ce59d8ab6db6b74de8d5bd8c866aef8ce02a56a4acc6ddcd83
--- a/net-im/biboumi/biboumi-8.4.ebuild
+++ b/net-im/biboumi/biboumi-8.4.ebuild
@@ -1,98 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake fcaps
-
-DESCRIPTION="XMPP gateway to IRC"
-HOMEPAGE="https://biboumi.louiz.org/"
-SRC_URI="https://git.louiz.org/biboumi/snapshot/biboumi-${PV}.tar.xz"
-
-LICENSE="ZLIB"
-SLOT="0/8"
-KEYWORDS="~amd64"
-IUSE="+idn logrotate postgres +sqlite +ssl systemd udns"
-
-DEPEND="
-	dev-libs/expat
-	virtual/libiconv
-	sys-apps/util-linux
-	sqlite? ( dev-db/sqlite )
-	postgres? ( dev-db/postgresql:* )
-	idn? ( net-dns/libidn )
-	udns? ( net-libs/udns )
-	ssl? ( dev-libs/botan:2 )
-	!ssl? ( dev-libs/libgcrypt )
-	systemd? ( sys-apps/systemd )
-"
-BDEPEND="app-text/pandoc"
-RDEPEND="
-	${DEPEND}
-	acct-user/biboumi"
-
-DOCS=( README.rst CHANGELOG.rst )
-
-# Allow biboumi to run an identd on port 113.
-FILECAPS=( cap_net_bind_service+ep usr/bin/biboumi )
-
-src_prepare() {
-	cmake_src_prepare
-
-	if ! use systemd; then		# Don't install biboumi.service.
-		sed -i '/DESTINATION lib\/systemd\/system/d' CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_BOTAN="$(usex ssl)"
-		-DWITH_LIBIDN="$(usex idn)"
-		-DWITH_SYSTEMD="$(usex systemd)"
-		-DWITH_UDNS="$(usex udns)"
-		-DWITH_SQLITE3="$(usex sqlite)"
-		-DWITH_POSTGRESQL="$(usex postgres)"
-
-		-DWITHOUT_SYSTEMD="$(usex systemd no yes)"
-		-DWITHOUT_UDNS="$(usex udns no yes)"
-		-DWITHOUT_POSTGRESQL="$(usex postgres no yes)"
-	)							# The WITHOUT_* is really needed.
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	# The man page is not generated by the build system.
-	mkdir "${S}/man" || die
-	pandoc --standalone --to=man "doc/biboumi.1.rst" \
-		   --output="${S}/man/biboumi.1" || die
-}
-
-src_install() {
-	cmake_src_install
-
-	if ! use systemd; then
-		newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	fi
-
-	if use logrotate; then
-		insinto etc/logrotate.d
-		if use systemd; then
-			newins "${FILESDIR}/${PN}.logrotate.systemd" "${PN}"
-		else
-			newins "${FILESDIR}/${PN}.logrotate.openrc" "${PN}"
-		fi
-	fi
-
-	diropts --owner=biboumi --group=biboumi --mode=750
-	if use sqlite; then
-		keepdir var/lib/biboumi
-	fi
-	keepdir var/log/biboumi
-
-	insinto etc/biboumi
-	insopts --group=biboumi --mode=640
-	doins conf/biboumi.cfg
-}
--- a/net-im/biboumi/biboumi-9.0_pre20200419.ebuild
+++ b/net-im/biboumi/biboumi-9.0_pre20200419.ebuild
@@ -5,11 +5,11 @@ EAPI=7

 inherit cmake fcaps

-MY_COMMIT="2ef41e1afca824acc0cd0ac9a714016459a24d25"
+MY_PV="${PV/_/-}"

 DESCRIPTION="XMPP gateway to IRC"
 HOMEPAGE="https://biboumi.louiz.org/"
-SRC_URI="https://lab.louiz.org/louiz/biboumi/-/archive/${MY_COMMIT}/biboumi-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+SRC_URI="https://git.louiz.org/biboumi/snapshot/biboumi-${MY_PV}.tar.xz"

 LICENSE="ZLIB"
 SLOT="0"
@@ -33,7 +33,7 @@ RDEPEND="
 	${DEPEND}
 	acct-user/biboumi"

-S="${WORKDIR}/${PN}-${MY_COMMIT}"
+S="${WORKDIR}/${PN}-${MY_PV}"

 DOCS=( README.rst CHANGELOG.rst doc/user.rst )

@@ -58,7 +58,6 @@ src_configure() {
 		-DWITH_POSTGRESQL="$(usex postgres)"

 		-DWITHOUT_SYSTEMD="$(usex systemd no yes)"
-		-DWITHOUT_UDNS="$(usex udns no yes)"
 		-DWITHOUT_POSTGRESQL="$(usex postgres no yes)"
 	)							# The WITHOUT_* is really needed.

--- a/www-apps/uwebsockets/Manifest
+++ b/www-apps/uwebsockets/Manifest
@@ -1,2 +1,2 @@
 DIST uwebsockets-18.10.0.tar.gz 265369 BLAKE2B 1ddd16f1793144c4e89681c2eae56e66db711fe94d17120222bf652df9616376fd1194baa0b7b10a89f6551ad1b62998c9993681b60ac5924e9b28500737fe46 SHA512 93d97ac45aabad5be4b8a5ba91e04c360e83a82e9d781aebeb5b325b8f11d2f25fb4d07dbce105978b947f7324d06d2e3877d07c14482961feed4171529248d1
-DIST uwebsockets-18.9.0.tar.gz 265223 BLAKE2B c7112040e699eeba4aaa753637a4039597979962c6e4815c2f10af993dd0724e5c18c99d3438e3efec5a18878be33cfd7eb641489a4d3546c92c3ad8e7551647 SHA512 c34f7ace7ab5c077ce5f6cc3fbc38323ad34ccf639a77c4b82ee0905ac2910b584140333d9a7afeb53596619baa15ba890ba25c34c3dbcb49e646f9ecff1f362
+DIST uwebsockets-18.11.0.tar.gz 267042 BLAKE2B 2cc0a6a7d798ac3c66967afa8b3cdfeda0396f0020a89c7d8c3184c2e8f1090d01372c235ebe5145d171f6d43684ad5dbef6b245f9c617a58b7ee229eeac1123 SHA512 a7300091115c1b08130ff697ba23ee16d0473943e49d219357bddc6708e2e629832856514cded3e7f27b2da36fc33d1e6ad0675006490812bdae123a20a660f4
--- a/www-apps/uwebsockets/uwebsockets-18.11.0.ebuild
+++ b/www-apps/uwebsockets/uwebsockets-18.11.0.ebuild