gentoo resync : 15.06.2021

4 files changed, 162 insertions, 1 deletions

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 3ed90f329bcd..e2318ae5d247 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,3 +1,7 @@
 DIST leptonica-1.80.0.tar.gz 13926793 BLAKE2B 1c8916acbea7411038c27ad422f7ac8d5769680ae0554a50da332676de4abdd3c6dfab69dfa4abc3525f3aa298062f4f2315548bda9d120e91abf6ffb5b41e1c SHA512 f8062a169b7ac558c8818615e534c0dcb5db48924af4d3106d0e0929e9b2f03347bdeaae45f80bded0b2aed135bb133f775244c8c752891ca4948b5d6b21e147
+DIST leptonica-1.81.0.tar.gz 14056128 BLAKE2B 21a6be10d8579746855b6c12785ecd75ce475cc24601ddd2b71ac79aee1a82dd96d26a0b779feae6b0a4028fca4556accd6a208525999c457250a6fcd0e0a5cf SHA512 e6e530a490337941018393ffc69ca45a92fecdee290c6de63f7656207228c19e474ec2e9291591cee85c782edbc46d51d69692871e425ed2367a7dd679dc7771
+DIST leptonica-1.81.1.tar.gz 14056320 BLAKE2B 09a3859d8d2bbef4ea5d450c81dd5af1c95752501e4b40779a57d099eb30934fbfe4099ab2d7abadf518af25cbd3c36269261c9c6d3850a44a2b16c2eb795801 SHA512 3c24e30eab21b634094543a722172553e35d928b3a50bfe78e9b0123cd16d710b4be8714acaac87344b22292b460d6ffb06b05a8e7f3df060544a2bbf3f8a7d2
 EBUILD leptonica-1.80.0.ebuild 2037 BLAKE2B 118a97e20f0951c04290529e17865b3e527b717dad7686b098dd92cbae65d05cf306c781e0b0328e49145740804f81ccc3e9b5a45ed4bf2db37b949484feb7a0 SHA512 697d321bc53a898e0ce098a76c6b124f20745df63263ce75c11a9d113cc1074ec00961012deaee93010b966924e0418e8c04efc1669816897937b40d8f9805e7
-MISC metadata.xml 518 BLAKE2B 59db99ac81e5c10275950d5c67e1c85c61c48f9eef84d533606a26beb1f3b6b3c1eb844a163687376a74dcd9561dfc91f6b85df4202a20ecf3c58f8e1201b88e SHA512 2a34197102a9d9d90faa90aa2f19e78e8a848e779ad3ad0f1bdb7d3d9d91572749ce2351c402403a0281019af1b59e0fd19c4e1809bd00836cede17647391773
+EBUILD leptonica-1.81.0.ebuild 2043 BLAKE2B e1369630fd7ff85619ab25ed5a17435358165fd23a9f3dd488e4d2f5fd786fc0d9360b2032738c4bda57d48b39465cdf4cb83bec6d62ad91573f7b5167a041f4 SHA512 e2c8a8912cc0ebbdd51ff9f459be8c697988ce6f64f529c8652b0ad3da1cd101860e6da91af4d2b0e3de649cf7597f7543209e1abfe9d31b7b2b4defbe78420a
+EBUILD leptonica-1.81.1.ebuild 2043 BLAKE2B e1369630fd7ff85619ab25ed5a17435358165fd23a9f3dd488e4d2f5fd786fc0d9360b2032738c4bda57d48b39465cdf4cb83bec6d62ad91573f7b5167a041f4 SHA512 e2c8a8912cc0ebbdd51ff9f459be8c697988ce6f64f529c8652b0ad3da1cd101860e6da91af4d2b0e3de649cf7597f7543209e1abfe9d31b7b2b4defbe78420a
+MISC metadata.xml 605 BLAKE2B 3c47d84994e9f22d37cfcb6a44497f2ceff828f8f130dce86038f1452c21403349636474aa78c39283d7d5a47183018e2d1f39546f0ecccb12ab7e169f15608c SHA512 0b78929d92cca2ee68c6174088e7c8abaa11dfde1af747fa52a9d1833e6319d8e5df0b060f627b6f6ef6707ac1440eb124091ac1eb05d47d35f7d9eb1cc7a893
diff --git a/media-libs/leptonica/leptonica-1.81.0.ebuild b/media-libs/leptonica/leptonica-1.81.0.ebuild
new file mode 100644
index 000000000000..cc3881a79ba7
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.81.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="C library for image processing and analysis"
+HOMEPAGE="http://www.leptonica.org/"
+SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
+# N.B. Tests need some features enabled:
+REQUIRED_USE="test? ( jpeg png tiff zlib )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+	png? (
+		media-libs/libpng:0=[${MULTILIB_USEDEP}]
+		sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	)
+	tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( media-libs/tiff:0[zlib] )"
+
+DOCS=( README version-notes )
+
+src_prepare() {
+	default
+	elibtoolize
+
+	# unhtmlize docs
+	local X
+	for X in ${DOCS[@]}; do
+		awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
+			"${X}.html" > "${X}" || die 'awk failed'
+		rm -f -- "${X}.html"
+	done
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--enable-shared \
+		$(use_with gif giflib) \
+		$(use_with jpeg) \
+		$(use_with jpeg2k libopenjpeg) \
+		$(use_with png libpng) \
+		$(use_with tiff libtiff) \
+		$(use_with webp libwebp) \
+		$(use_with webp libwebpmux) \
+		$(use_with zlib) \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_enable utils programs)
+}
+
+multilib_src_test() {
+	default
+
+	# ${TMPDIR} is not respected. It used to be but it lead to issues
+	# and there have been long debates with upstream about it. :(
+	rm -rf /tmp/lept/ || die
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# libtool archives covered by pkg-config
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/leptonica/leptonica-1.81.1.ebuild b/media-libs/leptonica/leptonica-1.81.1.ebuild
new file mode 100644
index 000000000000..cc3881a79ba7
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.81.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="C library for image processing and analysis"
+HOMEPAGE="http://www.leptonica.org/"
+SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
+# N.B. Tests need some features enabled:
+REQUIRED_USE="test? ( jpeg png tiff zlib )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+	png? (
+		media-libs/libpng:0=[${MULTILIB_USEDEP}]
+		sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	)
+	tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( media-libs/tiff:0[zlib] )"
+
+DOCS=( README version-notes )
+
+src_prepare() {
+	default
+	elibtoolize
+
+	# unhtmlize docs
+	local X
+	for X in ${DOCS[@]}; do
+		awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
+			"${X}.html" > "${X}" || die 'awk failed'
+		rm -f -- "${X}.html"
+	done
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--enable-shared \
+		$(use_with gif giflib) \
+		$(use_with jpeg) \
+		$(use_with jpeg2k libopenjpeg) \
+		$(use_with png libpng) \
+		$(use_with tiff libtiff) \
+		$(use_with webp libwebp) \
+		$(use_with webp libwebpmux) \
+		$(use_with zlib) \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_enable utils programs)
+}
+
+multilib_src_test() {
+	default
+
+	# ${TMPDIR} is not respected. It used to be but it lead to issues
+	# and there have been long debates with upstream about it. :(
+	rm -rf /tmp/lept/ || die
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# libtool archives covered by pkg-config
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/leptonica/metadata.xml b/media-libs/leptonica/metadata.xml
index 78be582d1df7..b5b2f1a097eb 100644
--- a/media-libs/leptonica/metadata.xml
+++ b/media-libs/leptonica/metadata.xml
@@ -13,4 +13,7 @@
 		containing software that is broadly useful for image
 		processing and image analysis applications.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">danbloomberg/leptonica</remote-id>
+	</upstream>
 </pkgmetadata>