gentoo resync : 08.07.2021

7 files changed, 140 insertions, 7 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 726940899368..067bb833b3e2 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/brewtarget/Manifest b/app-misc/brewtarget/Manifest
index 73341b62455f..059e8c57e4e8 100644
--- a/app-misc/brewtarget/Manifest
+++ b/app-misc/brewtarget/Manifest
@@ -1,5 +1,5 @@
 AUX brewtarget-2.3.1-no-compress-docs.patch 907 BLAKE2B a499cb28522e16199e42fa72421f17bb676116d6ae96b26a456f2b3a0f1baa343d782e4a51f88b6b37b50ac8be26909dbdd64ad8243a284d1be65cd8da995be7 SHA512 4c746583fa5e5e37e1a03b657115dd992aa44f8cffcf181e79c1321abd782d557906dbb5f5d2c9fbdee13c823597cf3403ea42e3fb5317922f97c925a0909ccf
 AUX brewtarget-2.3.1-no-qtwebkit.patch 4904 BLAKE2B f3040fa2a08467154a7e664107eb957775b75e3ecfb5c62476c068f95c5f773226ebad9e9afcb9b793066aeb1f98c2511c0c627ac92573896840718bf70cc063 SHA512 eb476d7558f35448e77019dd66e966b652b04f5acca370e45638ed78ba9ff374fd69e498e294cc843d2e8d264469dc891d8f8bac7aeb20792bd0e513542540d4
 DIST brewtarget_2.3.1.orig.tar.xz 9449200 BLAKE2B 00eda709c6665b2353380d013d55a59068d79f70368e843296f43d2f947c741ed526d4f6820f18c4d5e96866274bce76b2235cc50595882f58f397f651858bf3 SHA512 2ff29496df6df1b4507594905f5b3cdedd472a3e767c5f5dda00d306d092a7bec6f9d67350a830416f0ab457553339ba2f9dd2ea8476ed1dfa7dd4c49adda086
-EBUILD brewtarget-2.3.1-r1.ebuild 1347 BLAKE2B 4af5828ad8d0f8c10dc03ac1ec1dfc9635224b3b1820452f105c97de260d993fbb2c3741337f20745b21e44177bb26be516f1855cd288d0b6353d689965b9d58 SHA512 3f12d16ee2c379b0700ed7a3466d4567446ad6eb7a00fe1b7755a33d3a4c314ba729e5802ea9eb6ab7107c238fc85d0e73ec77bced8f3479c017a1ceb8a9fe3f
+EBUILD brewtarget-2.3.1-r1.ebuild 1344 BLAKE2B 21b9301f66b3dfa5e34b1f4bebe3ce77091fe6d3facb990ad347049f45222db903eb7c16af3b018059d4fb51c74574479fcfa1a407ce029ba97049bacce1855c SHA512 cf3dfaa1cf7f6fdbd073181d98b1f0afeadb0389058da62e606ea1359014083f4906557ad5d743edf0378c5a09fc4e0c4167dbf0c60e663206bd60430a94d56e
 MISC metadata.xml 333 BLAKE2B 610f70294511d47c0df2cbd259fbe558b6f90350f619984e732bc1d3b3977c22fff55ab110da945164baa76ccc4c39bcbf347e29fea175ce3f390c41f4fbc86e SHA512 e51f8f143455d51148898350c95b321226c7bd931a585234bce000cf1b2f2762b465f2af764288cc4ddde13abf825f8571e4a6ed7f9e73fbb315030d51cb45aa
diff --git a/app-misc/brewtarget/brewtarget-2.3.1-r1.ebuild b/app-misc/brewtarget/brewtarget-2.3.1-r1.ebuild
index 03780974f84b..bbae6d873d61 100644
--- a/app-misc/brewtarget/brewtarget-2.3.1-r1.ebuild
+++ b/app-misc/brewtarget/brewtarget-2.3.1-r1.ebuild
@@ -1,10 +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
 
 PLOCALES="ca cs da de el en es et eu fr gl hu it lv nb nl pl pt ru sr sv tr zh"
-inherit cmake l10n
+inherit cmake plocale
 
 DESCRIPTION="Application to create and manage beer recipes"
 HOMEPAGE="http://www.brewtarget.org/"
@@ -44,8 +44,8 @@ remove_locale() {
 src_prepare() {
 	cmake_src_prepare
 
-	l10n_find_plocales_changes translations bt_ .ts
-	l10n_for_each_disabled_locale_do remove_locale
+	plocale_find_changes translations bt_ .ts
+	plocale_for_each_disabled_locale remove_locale
 
 	# Tests are bogus, don't build them
 	sed -i -e '/Qt5Test/d' CMakeLists.txt || die
diff --git a/app-misc/piper/Manifest b/app-misc/piper/Manifest
index 8e42c5c27b72..3ad8a3cbb848 100644
--- a/app-misc/piper/Manifest
+++ b/app-misc/piper/Manifest
@@ -1,3 +1,3 @@
 DIST piper-0.5.1.tar.gz 234944 BLAKE2B 1df33ca6e2d0dae95b34f8e3a98c6829a8f113ae68fb60980ff40374090b9272f86d69103c33fe0a4e1b0ac21a84724e7cabccca4ce8dd23d02f6d56e67d072b SHA512 13368521a9c32b2dc3300b129ed3bb07a6204623fa750f8f75ca31d2a3b60f43ae5f5066ef755814960d4890a489bdfd21b0e1b8f456b3445e0ba35ac06bc877
-EBUILD piper-0.5.1-r1.ebuild 1115 BLAKE2B 940d4dbdaed4f45c9f892816a0fe2bd2dd45f0cc5889103cc06ad922747ba465d75adb607a13458e5b992676434a46f0d520a71d928d5ff60ecb4696e6ff484f SHA512 1237242a5741c795dacb069d1e55998853a35e91728182207f7c56d776c54dd7530df37173b2237e52a79749f108e75b301dd5cc6d941d64610a0c8f7688c1b9
+EBUILD piper-0.5.1-r2.ebuild 1119 BLAKE2B cade2791f7d41a13c9b20593c272adfba38d982ff9e7896c2e62d27693ce69ef0efc82d29241f4154c2a7ab7021f16da34a7494a68799ecaea945b7aa3ade531 SHA512 fef823bea58b8f23db95775c66ffec046df43c9669d5c429663b916a5f3db9ec125e1b18c05339bfd97a94a5f1c6137b7c1ac019309530bcb3b21f50a84f7d45
 MISC metadata.xml 619 BLAKE2B b002311b812d313df127db3eb872aa052382550833e5c64f1b575d965958cc266eb2652946491b1a63082403a4740d86ce1672e32fcbea691075acf12596cf67 SHA512 c6ac218834d9b7ac04da0602a64b2f1b56118c9ace6b2769b0d201e8baa6c8984c68984925a0d80b1616546f44fdd742c0edb2c28a20a2c161660481ae6d9b7e
diff --git a/app-misc/piper/piper-0.5.1-r1.ebuild b/app-misc/piper/piper-0.5.1-r2.ebuild
index 594522ebf5c6..b46057798005 100644
--- a/app-misc/piper/piper-0.5.1-r1.ebuild
+++ b/app-misc/piper/piper-0.5.1-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit meson python-single-r1 udev
+inherit meson python-single-r1 udev xdg
 
 DESCRIPTION="GTK configuration application for libratbag"
 HOMEPAGE="https://github.com/libratbag/piper"
diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest
index c3a8c9d03c90..1714e09f3d9d 100644
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@@ -1,7 +1,9 @@
 DIST recoll-1.27.12.tar.gz 3184471 BLAKE2B 60bcdee44259fa7f8b9decb9258ca0dae4edbf0cee1e8b1353cb59418503f0fcea9b439ecd6352500ff5b4cccfae08fc2a3f7f786fbd096cf18fd21fb809705b SHA512 3701dff056b8200f3b3c1bb2acaa69356c0def00959a0b74c14e1d500bd9e05fc81d82ce8b7db59d7e5b85617a8a7197700031aab65b31e005a4fedeaff59e97
 DIST recoll-1.28.5.tar.gz 3261816 BLAKE2B 6bf9daab0f97ee6fdb4033197d3fa3f4296b2df8a57566195fca3bf170fec621c27e7da00a1a5a8493fbbadca103a0db7b8c3051abe95d5c2aedb7c289c050a5 SHA512 df4c7a5e624933ccc7ce257a767a4621728a4dbcdd5b551b47845ed0fcffdd5a6f7f617a466404c5e8d8b62c81e57986e1f21e01d643899755623a2dc597d712
 DIST recoll-1.29.2.tar.gz 3871580 BLAKE2B ae6ef5628dfac67a192a3d133d5b5d8ddec079ac79be2e8aa7e744669ed0478cb41628a0ed46b4ff2364823f367815b1eb4bca0a6e4b56a9e12d4f78c6842473 SHA512 c87fc054a0c34f1b6bcc10a4f2c84268a51df02b8ba84634c51f9396befe5b2b84fc93d363876158c9d117a164613e91d9c63b228fec5e0e07d234c97c4680c5
+DIST recoll-1.31.0.tar.gz 3679099 BLAKE2B 6d02c0e0487ff02957ffc3c824152a14307e5a9ebfd472ffb84d047ce37f170ff7738b0d15ccfd6582840d22d19aa6e509ca50b98fd88d1a3730e58304cdb4b1 SHA512 1a740cdabab158737461ab8f097ece79844e1f0b64285871217049c0619df400d99db18eac8942e1986def555c5ab8364f3320eb403d150b061126cbc3be2116
 EBUILD recoll-1.27.12.ebuild 3477 BLAKE2B 95fa8b50e3e2036c4fb6ef72a69f394f04d5aacb9919d41c33782ae8e9688de7b993f9386b0a96e8b8b1a6ff5a0be8d49f21900b69a939e200131fdf7b439198 SHA512 e33fd31fc1e9ba7bb0eca7fe82237d94a8db3049fbf442de72f49f23bf2f7370d5b5e933a5d23a85bf93628247ee7180e3830da2c98b9b83143af09102cd01fb
 EBUILD recoll-1.28.5.ebuild 3483 BLAKE2B a38aad710cb61005bc5aef38dfafcac4a83e9c7e2016dc98fe41d695891300858cb86ea3e9d601f684a556345bbd4be1a12e42512228f0711d4a493909212440 SHA512 fb3884952862d76eb8406c42ed881bbd4230e8fbce3a79324621807852ab86b32db7eb850b4b431d60e43520548b967ec3c846b851eb8ef42c4345213c614837
 EBUILD recoll-1.29.2.ebuild 3483 BLAKE2B a38aad710cb61005bc5aef38dfafcac4a83e9c7e2016dc98fe41d695891300858cb86ea3e9d601f684a556345bbd4be1a12e42512228f0711d4a493909212440 SHA512 fb3884952862d76eb8406c42ed881bbd4230e8fbce3a79324621807852ab86b32db7eb850b4b431d60e43520548b967ec3c846b851eb8ef42c4345213c614837
+EBUILD recoll-1.31.0.ebuild 3323 BLAKE2B 4528bdf2ebae5ba679acd7fac1d8f1dcf6951ff12aa8cdcf2baec8f132cca304999cf2c7b7de62ce862898133515edc1bd1a809f44497b54c9cab7d8876e2c26 SHA512 b592e129d6f1d91b5ba5a03d7dbde0b424fee04f7815668f59e1de998aea5dbbbece34d85d830ec4f1f2569f9c07ae33cd846d9ce3b8c1ef0303263f8949cf60
 MISC metadata.xml 1412 BLAKE2B c76bff8f2b5483cc9525a1806b7136a7414b4944c54cd1953bacc6a353bd139fb53f0692042d94500308629014f222dad80c9fb79c640d80927a4f3eb31c4775 SHA512 0f0c368749d42f60845b7d81e20bee3cf9fc83e696e6463e42b2c925b230b8fa1da76088a9e41ced0327f6db05beac3127b1739b421143255fda22b3db1a0ba2
diff --git a/app-misc/recoll/recoll-1.31.0.ebuild b/app-misc/recoll/recoll-1.31.0.ebuild
new file mode 100644
index 000000000000..cfe0f694851f
--- /dev/null
+++ b/app-misc/recoll/recoll-1.31.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit linux-info optfeature python-single-r1 qmake-utils
+
+DESCRIPTION="Personal full text search package"
+HOMEPAGE="https://www.lesbonscomptes.com/recoll/"
+SRC_URI="https://www.lesbonscomptes.com/recoll/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="camelcase chm +inotify qt5 session +spell webengine"
+REQUIRED_USE="
+	session? ( inotify )
+	webengine? ( qt5 )
+	${PYTHON_REQUIRED_USE}
+"
+
+DEPEND="
+	dev-libs/xapian:=
+	sys-libs/zlib:=
+	virtual/libiconv
+	chm? (
+		dev-libs/chmlib
+		dev-python/pychm
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		webengine? ( dev-qt/qtwebengine:5[widgets] )
+	)
+	session? (
+		inotify? (
+			x11-libs/libSM
+			x11-libs/libICE
+			x11-libs/libX11
+		)
+	)
+	spell? ( app-text/aspell )
+	${PYTHON_DEPS}
+"
+
+BDEPEND="
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+RDEPEND="
+	${DEPEND}
+	app-arch/unzip
+"
+
+pkg_pretend() {
+	if has_version "<app-misc/recoll-1.20"; then
+		elog "Installing ${PV} over an 1.19 index is possible,"
+		elog "but there have been small changes in the way"
+		elog "compound words are indexed. So it is best to reset"
+		elog "the index. The best method to reset the index is to"
+		elog "quit all recoll programs and delete the index directory"
+		elog "rm -rf ~/.recoll/xapiandb, then start recoll or recollindex."
+	fi
+}
+
+pkg_setup() {
+	if use inotify; then
+		local CONFIG_CHECK="~INOTIFY_USER"
+		check_extra_config
+	fi
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	python_fix_shebang filters
+}
+
+src_configure() {
+	use qt5 && export QMAKE="$(qt5_get_bindir)/qmake"
+
+	local myeconfargs=(
+		$(use_enable camelcase)
+		$(use_enable chm python-chm)
+		$(use_enable session x11mon)
+		$(use_enable qt5 qtgui)
+		$(use_enable webengine)
+		$(use_with inotify)
+		$(use_with spell aspell)
+		--disable-webkit
+		--without-fam
+		--enable-recollq
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake STRIP="$(type -P true || die)" DESTDIR="${D}" install
+	python_optimize
+
+	# html docs should be placed in /usr/share/doc/${PN}/html
+	dodoc -r "${ED}"/usr/share/recoll/doc/.
+	rm -r "${ED}/usr/share/recoll/doc" || die
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	optfeature "XML based documents support" "dev-libs/libxslt[python] dev-libs/libxml2[python]"
+	optfeature "PDF files support" app-text/poppler
+	optfeature "PDF files with OCR support" app-text/tesseract
+	optfeature "MS Word files support" app-text/antiword
+	optfeature "Wordperfect files support" "app-text/libwpd[tools]"
+	optfeature "Lyx files support" app-office/lyx
+	optfeature "GNU Info files support" sys-apps/texinfo
+	optfeature "RAR archives support" dev-python/rarfile
+	optfeature "7zip archives support" dev-python/pylzma
+	optfeature "iCalendar files support" dev-python/icalendar
+	optfeature "Postscript files support" app-text/pstotext
+	optfeature "RTF files support" app-text/unrtf
+	optfeature "TeX files support" dev-text/detex
+	optfeature "DVI files support" virtual/tex-base
+	optfeature "DJVU files support" app-text/djvu
+	optfeature "tags in audio files support" media-libs/mutagen
+	optfeature "tags in image files support" media-libs/exiftool
+	optfeature "Midi karaoke files support" dev-python/chardet
+}