gentoo auto-resync : 09:10:2023 - 06:05:11

7 files changed, 120 insertions, 3 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index ec086cbe55ce..e65c5c532538 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libmaa/Manifest b/dev-libs/libmaa/Manifest
index 63c0a8219890..1fca8536e784 100644
--- a/dev-libs/libmaa/Manifest
+++ b/dev-libs/libmaa/Manifest
@@ -1,4 +1,7 @@
 AUX libmaa-1.3.2-libtool.patch 1213 BLAKE2B 4c3602dbaf602f586d72faf704a447c46b9f41953945f434e451917b4ed25254f016ee2a408db043fcf84ba0b4ca9e4d80b4ddadb75814f588af4eee378adcfe SHA512 76715ea800a0577bd0defa713d06ff9155f4d58c40f6d7931e7c5f7c973877aca9f831c0e4e98d56e91189c388b85ead34e0e9686a4c1a561373c69290cfafc9
+AUX libmaa-1.4.7-makefile-respect-flags.patch 721 BLAKE2B fc05763eb4e5ca7ea46d18ecfea34150131f17158f9bce81fa0286576dac5e63bc55d0cc2f745c848c90643f2edfe350ebf31c63940986f5c040cfb6c3f2c974 SHA512 bfc79a469e63103cc4b9083edfbb72ef5c6d5d261ed4d7e28a0de7f52f0680fa2157592b64061707a674fcf30d8902e97b49de3079cf024636f806a92210153b
 DIST libmaa-1.3.2.tar.gz 287198 BLAKE2B 62432f7f21e353c68a0e9b8f843a5a5acafba5c0cc8e745b07596d7dcaaf9adf723342474b95895fbe1cf003d87d856892ea52196808937b4befdc50ce6d0155 SHA512 dde91e8bf1c08515ff4662282d16a03b18a1dfb16eb7b95be980ba398ed1e65d8cd88e58d454e03a03f48a5ecca8bf23b4ebaf475a98630a9178318c12a1b176
+DIST libmaa-1.4.7.tar.gz 173728 BLAKE2B 1201fedf56a92b150f04eedebd3aaf11a63e057b2cc67a3c5402c6a76c7aa5e2c40d7298138f9b510f6c94bc3a67835586ad97b53adf04dd837f404e43dea620 SHA512 6aa0ec6de92d9512152116a2698f5e7d3166631832968d2b7942b8564a4d61ef6eaf304d863e682758636e55a0c5d26fde49db028b18c160abb2286683e8478b
 EBUILD libmaa-1.3.2-r1.ebuild 704 BLAKE2B a485b490e1a52fc87462949d0f09004b373c22e05861ccacb376f04fa88abdfe7e78d75870dfa95d78db0d2f9d59e9b0f4e0789b73481f1a6ee5ed74a3ae048d SHA512 8eb8277da68be7dad44db07c16bd5d66040abcf47f0ab93914d568084e861c355441ab9f08bd4576efeef3b82082f661e66d918fbefcb58d7f2d6c960f078e95
-MISC metadata.xml 787 BLAKE2B ea09adf2db0d3ad48fd100b3fdf9a8abb516fc9ce75e3503e5a6e5098f5beaded6195ff2c1dd987e92628657c9aee5d54cc2d71038658eab5150562a87f7ca32 SHA512 670545afb3368a782110664a5d3d463be36d4f1ea5ef09430f612ebbdd65456d35d72cba0023e7316358f555224c3c7024a37c07a276e05a5a67c4c937375060
+EBUILD libmaa-1.4.7.ebuild 1969 BLAKE2B 775dd48340a509e1df2768745aaaafec89014b6da31c2dbf5379abd971ce4ff61253478486cc4b2b14993c6b4bf51ad26651caa979c475556ad06d90fdc5bf85 SHA512 5511e987ab747f0e284e40c71ee26cb6ef6e6dca56a6c10cde5c568dd23ad61349fa7b56bfca32c630b849d347e3e76f79aac6c4b252f01882ff63ccce177667
+MISC metadata.xml 840 BLAKE2B 1b6d7a53d405f83b7065c47069d08bfa5ac8d2c6b5a3db0ee0c8355c8706140240bd92cc62138386fb06a861c2ce880c0eac792aab08b46d8691861954e19972 SHA512 3bdd87f4dc481f96e76615c38a5d92ff100b91de0cab5fc40f818eba8a16fa222e8fff496716394a29ba74d74d8177e661e42efb51fdaf33cc040c01ac2debe8
diff --git a/dev-libs/libmaa/files/libmaa-1.4.7-makefile-respect-flags.patch b/dev-libs/libmaa/files/libmaa-1.4.7-makefile-respect-flags.patch
new file mode 100644
index 000000000000..67ee4d846c6a
--- /dev/null
+++ b/dev-libs/libmaa/files/libmaa-1.4.7-makefile-respect-flags.patch
@@ -0,0 +1,21 @@
+Per mk-configure(7), Makefiles should use CFLAGS0 and CPPFLAGS0 for their
+own flags. This allows setting CFLAGS and CPPFLAGS ourselves during the build
+without clobbering important settings/definitions like MAA_MAJOR.
+--- a/maa/Makefile
++++ b/maa/Makefile
+@@ -22,11 +22,11 @@ arg.o arg.os: ${.OBJDIR}/arggram.c arg.c
+ ${.OBJDIR}/arggram.c: arggram.txt
+ 	awk -f ${SRCDIR_maa}/arggram2c < ${SRCDIR_maa}/arggram.txt > $@
+ 
+-CFLAGS +=	-DMAA_MAJOR=${MAA_MAJOR}
+-CFLAGS +=	-DMAA_MINOR=${MAA_MINOR}
+-CFLAGS +=	-DMAA_TEENY=${MAA_TEENY}
++CFLAGS0 +=	-DMAA_MAJOR=${MAA_MAJOR}
++CFLAGS0 +=	-DMAA_MINOR=${MAA_MINOR}
++CFLAGS0 +=	-DMAA_TEENY=${MAA_TEENY}
+ 
+-CPPFLAGS +=	-I. -I${.OBJDIR}
++CPPFLAGS0 +=	-I. -I${.OBJDIR}
+ 
+ #MAN =		maa.1
+ 
diff --git a/dev-libs/libmaa/libmaa-1.4.7.ebuild b/dev-libs/libmaa/libmaa-1.4.7.ebuild
new file mode 100644
index 000000000000..b0222209b7b2
--- /dev/null
+++ b/dev-libs/libmaa/libmaa-1.4.7.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing toolchain-funcs
+
+DESCRIPTION="Library with low-level data structures which are helpful for writing compilers"
+HOMEPAGE="http://www.dict.org/"
+SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/4"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-util/mk-configure"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.7-makefile-respect-flags.patch
+)
+
+src_configure() {
+	local jobs="$(makeopts_jobs)"
+	unset MAKEOPTS
+
+	export MAKEOPTS="-j${jobs}"
+	export MAKE=bmake
+
+	MAKEARGS=(
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		NM="$(tc-getNM)"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+		RANLIB="$(tc-getRANLIB)"
+		STRIP="$(tc-getSTRIP)"
+		#SIZE="$(tc-getSIZE)"
+
+		# Don't use LD, use the compiler driver instead
+		LDCOMPILER=yes
+
+		CFLAGS="${CFLAGS}"
+		CXXFLAGS="${CXXFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+
+		# Our toolchain already handles these
+		MKPIE=no
+		USE_SSP=no
+		USE_RELRO=no
+		USE_FORT=no
+
+		# No -Werror
+		WARNERR=no
+
+		INSTALL="${INSTALL:-${BROOT}/usr/bin/install}"
+
+		# Don't calcify compiler settings in installed files
+		MKCOMPILERSETTINGS=yes
+
+		PREFIX="${EPREFIX}/usr"
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		INFODIR="${EPREFIX}/usr/share/info"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		MANDIR="${EPREFIX}/usr/share/man"
+
+		MKFILESDIR="${BROOT}/usr/share/mk-configure/mk"
+		BUILTINSDIR="${BROOT}/usr/share/mk-configure/builtins"
+		FEATURESDIR="${BROOT}/usr/share/mk-configure/feature"
+	)
+
+	mkcmake "${MAKEARGS[@]}" -j1 configure || die
+}
+
+src_compile() {
+	mkcmake "${MAKEARGS[@]}" all || die
+}
+
+src_test() {
+	mkcmake "${MAKEARGS[@]}" test || die
+}
+
+src_install() {
+	mkcmake "${MAKEARGS[@]}" DESTDIR="${ED}" install
+
+	rm "${ED}"/usr/share/doc/${PF}/LICENSE || die
+
+	dodoc doc/libmaa.600dpi.ps
+
+	# don't want static or libtool archives, #401935
+	find "${D}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
diff --git a/dev-libs/libmaa/metadata.xml b/dev-libs/libmaa/metadata.xml
index bab7ac2ea3f4..010f65db9531 100644
--- a/dev-libs/libmaa/metadata.xml
+++ b/dev-libs/libmaa/metadata.xml
@@ -13,5 +13,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">dict</remote-id>
+		<remote-id type="github">cheusov/dictd</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index e1945afd8c0c..decf9f27a831 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -2,6 +2,6 @@ AUX protobuf-c-1.3.0-no-build-tests.patch 1020 BLAKE2B adda0e4764283d00093709bc9
 AUX protobuf-c-1.4.0-include-path.patch 8092 BLAKE2B d1abcadbaf41789a882427cbae6d34e481f4bb66af95d95f0e33909bf25978b6adf80ba33094688e8a56ab51a7c0ee2b7aaba02ec591c286e824358ce671c212 SHA512 162b23bfd165c1dadaeb0f6c9eddc68819b5454c856def2d7a09d50d5694eaf5174ee6402197ff0d2e4465eb8f3130e0ef009f7f4d6de9fdbbd7af5fcf937ffb
 AUX protobuf-c-1.4.1-protobuf-22.patch 17194 BLAKE2B 711d3913f391775501f823af7ffd25fb5bffe748d255d88ebab7be406b2165e57d3197d15d3f08774745c4615a9a54fb8b051d3e801563a1ceeca1b8a5101175 SHA512 745e012a553c84a379a1c047147ba4fc9b06882561876a594546144d88d79cac9ff4327480a67808949957d158b5bc18aa7f94960856d07da43b2027d76a3067
 DIST protobuf-c-1.4.1.tar.gz 513596 BLAKE2B b5e87a3154863581b81790a26b6b522c2b3ad138e966053f20c6264b4a7677d6c5bff8e27faa7c6cfa9e982b72b06e2f518a3def9f6db13241c3cb3ee9afc8f6 SHA512 190a4aa5c607853e6bf860b0974deb21e4f7f6209e810251eaca9612b59ea676779b0ca217fb1572914ffb8de3315a7d24f162b14d447ee671a9adc5b1271e41
-EBUILD protobuf-c-1.4.1-r1.ebuild 1195 BLAKE2B 0bddbe7339106f394a4988a67a6e629b9d316174ae0f6fe21615444dc90928a59d7558c55bfddfa179e844ed620eebd916b776fe187d7de224bbdf18a937f946 SHA512 5eaf81919773b7b17434769c47d8c03604efffe4a5ecce6acb9bfb7bba157fb2abada46f721da74f74fffde8d68fd44c1b4c131d5862eec9c0e4a7c6dec9915a
+EBUILD protobuf-c-1.4.1-r1.ebuild 1193 BLAKE2B 3d04c781f2ce6143052487716b3fea40a43521f164556a09c911956ee14e19703a24ad3c3be9c11a0c3e59fb9b36e33874d4e1f522613d7daabc531457e5c7f8 SHA512 51654716ddf6c08acff79697a563ae0324e24b6bca2204c5cb8f2dde02daebe287070e099710909ab14317e650508df49627e35811ab52c56dfe2b2beea48512
 EBUILD protobuf-c-1.4.1.ebuild 1147 BLAKE2B a0250ab24396e95117b93fd1ca36bfba7d253f8f02e726278e45c695bdecef2b994b70c43328e60e649a4c3974915994ffe00b0c7840be8511ef044695b6ffa7 SHA512 a0555be30fe6a76d3a2d19b991730b0b028729e011219062a561cb73e89cf4c721a45cc3d2c3f72c2541116b81d09ecb3b05e5680b5bb9f727a8584d512c5865
 MISC metadata.xml 259 BLAKE2B 650e53279ca9375b8dcdec83d1065b370b820ee770225c753fc93d8600781aa4c191fe2a8016e34f5a24b4f9a94b922bc48eb75550c25a2d85672674866c0b62 SHA512 12f8cbcc9bac27c99a9a80b6f9ae803a8cde6b765ce0487a08cf76e83347bf0ac9793d50cc00d692a6069906d0e98af684c7b060262ec95f57621850ca47677c
diff --git a/dev-libs/protobuf-c/protobuf-c-1.4.1-r1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.4.1-r1.ebuild
index edb57577cfd9..b41bc50791b2 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.4.1-r1.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.4.1-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD-2"
 # Subslot == SONAME version
 SLOT="0/1.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"