gentoo auto-resync : 19:08:2023 - 15:38:48

8 files changed, 82 insertions, 4 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 286ef617441b..d2bdaf62230d 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/mecab/Manifest b/app-text/mecab/Manifest
index 1ee152db798f..95b33c20c5d5 100644
--- a/app-text/mecab/Manifest
+++ b/app-text/mecab/Manifest
@@ -1,5 +1,7 @@
 AUX mecab-0.98-iconv.patch 302 BLAKE2B 3644a66b1bdf9099ff0258a057c930c1b2e065836b0e6332211e4d04efbbf39da1de2788d90143826a1c9d887fcb63042e533864e746b7c385baea485cb93490 SHA512 c0dcaa8637f1c16a33bd4dd4007225a4f1ed3f0eebcda28dc7d92ec0a66ea16b5bdd956fb3a904af8070ce0ac2d6c9090b602b4705e73fac1100a845b3a756ce
+AUX mecab-0.996-clang-16-binary_function.patch 532 BLAKE2B 74aafcdb73e954ca2c409c6644444f1039fae3cf652bdfd16e1c2306c884dab7d22243303db7308a53933621bf4f0f81045c816ae9feff6776010651ed96a652 SHA512 d5cfbd9e419883a8f87d0409392a217bc5e93ea6d16d413b3ffff2d662c70170a5075b36cd3a8178c57753f9e511e9fcfa189d5321cb60735432d967a5c664d7
 AUX mecab-0.996-clang-16-register.patch 3285 BLAKE2B ce5fc8bb953c617ad614216949e96961e264b588a34269495082bc44fe89c23bef06cc42c39579ca02004fa923621c32b859e481c7b09d87a065df49a539f662 SHA512 e79c294bf29c1bf5cf356aa70461000f0ed999c43d0069ae95716bb4fea5280f2415f911828b7510b114ad7952247dd68bbffacfec65dcbd77b22f8fc2a2d662
 DIST mecab-0.996.tar.gz 1398663 BLAKE2B 97ea18a00c6f2284c994681631b84a572d244b741c8e30b5fdf5404b2bf80fdd4c724c803999955e36ee252e59e6644716dbdca55a6ffb2e4de52193d7f777bd SHA512 aca6d16f411b9ba9b6687242246aeb28ede6d6c6a9122d4a32da9d8e76e79b5f4af2c8e3b13ad9462b34e9d2994cbd9bbbedebac45609684db9b703da999577f
 EBUILD mecab-0.996-r1.ebuild 1266 BLAKE2B 9fd202ec8988294d00cefb3cf5a17f45aacb306c8ac308f4c3f775a2ef2c33c64107993784481c545f829110e00c6f1aecf4ca69d746c519d166de634dbac1a1 SHA512 909e9336e764789c9aa9a8bb6d51095b0719e8c7b240529539615be3836e350133450eb6934815cf20d00fb30ec2cbf8f867c20cba3c5145fef3834ea7bc3598
+EBUILD mecab-0.996-r2.ebuild 1331 BLAKE2B f1cdbb10dad1f31e957bb086e5ddbb6c24a2c045e65d8ce010fda379106b73df7bcce41d2d54c6bdb54e3b5548920e81cd28feeb2bb16be07585cd34cfad3fd2 SHA512 64eff42945a3c4588f81a8d2c9cc70c8a13f678b58e9f5d9058c9d75e0690aa6125ebf891f4362645b51d986b988e9329240320552fb79e24cc659d98362eded
 MISC metadata.xml 413 BLAKE2B e30f9d8b15a3ab4419d79cdafa6615e9d7d353b62732b4e5bb819396f22ad951d485317b1da5d36f7e471fed9037d6efc9753e7e0f26e0c6b73b4501f50e1fc9 SHA512 99d12f9ea78a09e7b4230b8520a18d3d8c8d8d99cf77703c8a0bdcf7df63f3de64e8cdf30df7d046f5e5f98d2113abcca9c25de7671edda51da1a4e6fbc530bd
diff --git a/app-text/mecab/files/mecab-0.996-clang-16-binary_function.patch b/app-text/mecab/files/mecab-0.996-clang-16-binary_function.patch
new file mode 100644
index 000000000000..5776cf5b2aa5
--- /dev/null
+++ b/app-text/mecab/files/mecab-0.996-clang-16-binary_function.patch
@@ -0,0 +1,16 @@
+Dropping usage of binary_function
+--- a/src/dictionary.cpp
++++ b/src/dictionary.cpp
+@@ -65,7 +65,11 @@ int progress_bar_darts(size_t current, size_t total) {
+ }
+ 
+ template <typename T1, typename T2>
+-struct pair_1st_cmp: public std::binary_function<bool, T1, T2> {
++struct pair_1st_cmp {
++  public:
++  using first_argument_type = bool;
++  using second_argument_type = T1;
++  using result_type = T2;
+   bool operator()(const std::pair<T1, T2> &x1,
+                   const std::pair<T1, T2> &x2)  {
+     return x1.first < x2.first;
diff --git a/app-text/mecab/mecab-0.996-r2.ebuild b/app-text/mecab/mecab-0.996-r2.ebuild
new file mode 100644
index 000000000000..078cd4f66a9d
--- /dev/null
+++ b/app-text/mecab/mecab-0.996-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Yet Another Part-of-Speech and Morphological Analyzer"
+HOMEPAGE="https://taku910.github.io/mecab/"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="static-libs unicode"
+
+BDEPEND="
+	dev-lang/perl
+	sys-devel/gettext
+"
+DEPEND="virtual/libiconv"
+RDEPEND="${DEPEND}"
+PDEPEND="
+	|| (
+		app-dicts/mecab-ipadic[unicode=]
+		app-dicts/mecab-naist-jdic[unicode=]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.98-iconv.patch
+	"${FILESDIR}"/${PN}-0.996-clang-16-register.patch
+	"${FILESDIR}"/${PN}-0.996-clang-16-binary_function.patch
+)
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+	sed -i \
+		-e "/CFLAGS/s/-O3/${CFLAGS}/" \
+		-e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
+		configure.in
+	sed -i "s:/lib:/$(get_libdir):" ${PN}rc.in
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with unicode charset UTF-8)
+}
+
+src_install() {
+	default
+	find "${ED}" -name 'Makefile*' -delete || die
+	use static-libs || find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest
index e76b17c372c4..fdfd42bf5c80 100644
--- a/app-text/poppler-data/Manifest
+++ b/app-text/poppler-data/Manifest
@@ -2,5 +2,5 @@ DIST poppler-data-0.4.11-2-extra.tar.xz 3124 BLAKE2B 8ae0cb7613d36e2ceddb77736b0
 DIST poppler-data-0.4.11.tar.gz 4497282 BLAKE2B 01f0f9f3d933f45683a702c4d538d8fc59874512290f199b601c16f98f9b596ff249fbc992574d046931cc80f3685f94733248450d3a54f2f961951cdeda7c39 SHA512 a5b7ace28d1677e12f7500ab6345b277dc22cd48ace8d472c083933416879edf4da4efe8217b0e11f75a3387ed98d832fe50567884095b6c0e09ebd8802b0f32
 DIST poppler-data-0.4.12.tar.gz 4504754 BLAKE2B 0d34ff1fcc9120b5db2baded9d931ca37128106eecdd54892d0256f9736f799d52eacd4017741797432048def914dd13150c6e3bf8d9ea5b8597a799a497d1c7 SHA512 75f201e4c586ba47eb9a48a33ef6663fe353d0694b602feb7db282d73da7f0daffb0ff7e18e4a6cb40324305efa2413df562666939f4214e2dfd7ff00288f3de
 EBUILD poppler-data-0.4.11-r2.ebuild 1096 BLAKE2B 518d5217c0b69325a475dbec051dbddabf129cba01c2811f840b1b427bba9e5d5b5842609b8e73296f68b9d3ce8b9e881c1d3c802340656daac15153f70218fc SHA512 d5016672b571fe4eb579bb0bfedf78ff338d19e62eb19bc4fa0dc5af0e1de6d0c9f2c74c7e9ecb0d3136f6d3400d1cf8f16363ab914dbf14eccb62f20b3cd5ce
-EBUILD poppler-data-0.4.12.ebuild 1117 BLAKE2B 85eec0123fd1947d82848c5ca87988e4ef8cc7448fa4e1ec865b6a601fd7478d0280e257420febdfbf3b6769ecc213604cf00765a663b1e0449abef7beb753a8 SHA512 7b1d5316e5a2788573fed5f4c821c571588e4a4eca2d1e80ae8452ee13de29bddcbf4a481653d1e63729b949e46b3568c9e1d301393e2848f282c50c17e32288
+EBUILD poppler-data-0.4.12.ebuild 1111 BLAKE2B 3847dd9f77300f557e037efafba0a5bd0e8293027f3fe8aaf46459a4665ad9ff3d427f11e45fb15293b76ac778fdd78359c5969ddb22716168210e274c01c55f SHA512 99847c7369b94b6761459b70c3b9f03e9c829fad0a2bb30c88e547339de950809dd0d64ed95ced4d13086a0a3cf90ca00d9dbd020b18f0204bc549cafdaf9c8f
 MISC metadata.xml 256 BLAKE2B 16ea76357721c3ab7d672ade29d27338ddf9da983571e4ca4efe2520c741fc71315d9609b711850b00c19ed4eea848dea0d5b3955eecb401c42c4db257c300bf SHA512 2748afab7ffea0b3ddadf72dc720f7d83a1d76453fa569091abffe834ec187144a47f9365ccb4a97f676dbcfd799a6be92671f283b179fe4589d95486d7fd24d
diff --git a/app-text/poppler-data/poppler-data-0.4.12.ebuild b/app-text/poppler-data/poppler-data-0.4.12.ebuild
index fec8657d0dc2..a04852c9e002 100644
--- a/app-text/poppler-data/poppler-data-0.4.12.ebuild
+++ b/app-text/poppler-data/poppler-data-0.4.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${POPPL
 # AGPL-3+ for the extra files needed by ghostscript, bug #844115
 LICENSE="AGPL-3+ BSD GPL-2 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 src_install() {
 	emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 1e4f35760aed..149bb6873a5c 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -11,6 +11,6 @@ DIST poppler-test-e3cdc82782941a8d7b8112f83b4a81b3d334601a.tar.bz2 5199251 BLAKE
 DIST poppler-test-eea2a4a355eb49ca70d944afd5245b24578af287.tar.bz2 5196899 BLAKE2B 926e148953a703249fa6369254f3aaacd945e0d08effdecec826a0b9c207c9b91d4af8dbeefb0a1a52decb5e941ff6b0f654fbaf15d5ed4d280ae1a7a3542534 SHA512 0c861f95a318f8a966851c7f12524d9311fba1914750527492bb4e5196d5d0be0deae7e3265fff78a5536617130b708285fed5b1edcb85c34ba83ca77226a7cd
 EBUILD poppler-23.05.0.ebuild 4224 BLAKE2B 5601b63a80f51d47cc645d4b5ee9447d3f897045e462941125e6319d8a42c8c2e4222546d0cb767a7142a467a21d1b57a181940943ffad5f3abcc67f812bb10c SHA512 2e4f40d744b86f57d0339df5103449cc6fab31e43d7bb1a4dc689596fd334914b886acc2e21339d8371bacad4a2b0d5f488ff3f12390048c5ba2b4e1288901ab
 EBUILD poppler-23.07.0.ebuild 4318 BLAKE2B 21054f878ab46581b341a7f84d3b68a96d9ed1299d97efb6d6c9a8ca2a029433ce91a59231c2f441126eb2e41c943c1b6aa673ed522d5b5c537222e0ebf8ccf9 SHA512 ad437fa5ebf5e94a0d43c891bc2b201161f9f99028862c4ce5c087b59cba0d5d4f54b116ca993c8fe203f67cdf5cee233d7b143b3ce9d29eab870299a75b336d
-EBUILD poppler-23.08.0.ebuild 4318 BLAKE2B 21054f878ab46581b341a7f84d3b68a96d9ed1299d97efb6d6c9a8ca2a029433ce91a59231c2f441126eb2e41c943c1b6aa673ed522d5b5c537222e0ebf8ccf9 SHA512 ad437fa5ebf5e94a0d43c891bc2b201161f9f99028862c4ce5c087b59cba0d5d4f54b116ca993c8fe203f67cdf5cee233d7b143b3ce9d29eab870299a75b336d
+EBUILD poppler-23.08.0.ebuild 4312 BLAKE2B ade928e558594d2ae2be5107df2901756e4ac84cb834cc11ffc8c283bc8511964ad5a66938e84ff7558129f176c0b7938712939251ea540563ffeb0834b5c777 SHA512 63a005beba9d4d537cf6feb52866d8902a19c2d9f71db51ecd795e8b2067b30f9787f4e181604e8f9ca7e7682b727253863f9638f769c313637c83567d0ff88d
 EBUILD poppler-9999.ebuild 4318 BLAKE2B 21054f878ab46581b341a7f84d3b68a96d9ed1299d97efb6d6c9a8ca2a029433ce91a59231c2f441126eb2e41c943c1b6aa673ed522d5b5c537222e0ebf8ccf9 SHA512 ad437fa5ebf5e94a0d43c891bc2b201161f9f99028862c4ce5c087b59cba0d5d4f54b116ca993c8fe203f67cdf5cee233d7b143b3ce9d29eab870299a75b336d
 MISC metadata.xml 1230 BLAKE2B e537b88babbb0c4ef5355c57c226d1c27b8b058e85c437962afe3610cf7dcdd4fea4a7694e508314cc5111d7bf09dc67881f0268a5cc8c2ce1e569a6f8c7699d SHA512 92b0a2fb9bf788eab1187657485698322cec7623da7b861ed5134089d0f3fc05f42138f734aa78bb811679203af2c6bf0dad7e78a091d5a51ba16a2aac60a227
diff --git a/app-text/poppler/poppler-23.08.0.ebuild b/app-text/poppler/poppler-23.08.0.ebuild
index 5dfdb51b9a97..e358905bc6b8 100644
--- a/app-text/poppler/poppler-23.08.0.ebuild
+++ b/app-text/poppler/poppler-23.08.0.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
 	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	SLOT="0/130"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi