gentoo resync : 01.10.2021

5 files changed, 201 insertions, 9 deletions

diff --git a/media-libs/libsixel/Manifest b/media-libs/libsixel/Manifest
index d9ab811c74f4..687fba548253 100644
--- a/media-libs/libsixel/Manifest
+++ b/media-libs/libsixel/Manifest
@@ -1,3 +1,6 @@
+AUX libsixel-meson.patch 1904 BLAKE2B d4e4b4b800e8c8e847893b7f80369f71b2cb99ae4fdbf7ecf8a7eae05efd4e74d5e84d6f3eb8a63eeb0abd998404819bed8d084cf98bbb79faab3877512cb713 SHA512 3c853f577c569f2228d63ed9b63ca8cdc23313b5d76b890186ae7d0741e18f1707f5470cad88daf849f8972d42a9100480e354bbfc80e8be030467cac364a58a
+DIST libsixel-1.10.3.tar.gz 4272940 BLAKE2B f65d9a3bdd54917f5746b7b1650dfca7084c64b505ea9cae07863c476d1189114d9fb303ec01d8fa209542e891f1d359ec6dbdc9babc4313b06b709813fab020 SHA512 ef16f9ccecec8289728ec84ce9f24145648f8a38184c1ec3df8ead3499c6cf7d3e0a0c738f8bfcb1093e16ee8ae7ce5e46d3890707c8104752ce4ab7eb3bc7ac
 DIST libsixel-1.8.6.tar.gz 4791628 BLAKE2B 5fa197d0d759eecd4040c4c1101e6d85fb9af7405ccdff75be571b3ac6b2b0aab6415bc3fdbb37157795f89190fcc1d0fea1bdf705e83a34762e2b05f5588c69 SHA512 460a5d46bada705b4a7ec2e250e2bde7f4b8ba155281fa5a102d1121f79c1c79145f042cd1f4bf93a2fc29e784e89afd539e963470663fc659d4fe72ea49fdaf
-EBUILD libsixel-1.8.6.ebuild 1137 BLAKE2B f800ad1ab44e827da2e31649859649d7a119d06b518ca303d31e5120e3ac2f342d914a389dbb53d3ce28987fa5e3ad5e990cfb4af4818d6262c4e7559b611d5c SHA512 e2e3b502296827210a9d3cb78b87bb4abdc1857fe00ac72c4a969d31c2af18651421095a16172402a64f92183457f120c36da5fdfbe81a0ca605a782b5c71a5b
-MISC metadata.xml 330 BLAKE2B 6739740b8d95b47ed49d70df517c040a6212a1e1d92d3e7b36e66f307600a04e30753f8ac2b80938fa2794dbba6fad4df42236f652ad653e30240a1a7d55a221 SHA512 70fe7c89c127d2998ecbda005ac12b2354bb931fc9e2143721f053f564a3fb59bdae5c8be8dc55ed7a6c849e395380f0e8fd6220ea8346b234a9563c63f09683
+EBUILD libsixel-1.10.3.ebuild 1845 BLAKE2B 3116f815a2d0d65348ec55b8cd3671c7597f11c3fe71544edbae36a00468d8150e310c47e4ae9d8853545c513ceabad73676c4959a4fb760e7d0d8706667b224 SHA512 6f93b274645512e86da7f2187543937bf9417a1676e48b99f9dd181a56332012d206b8d4dc2370eac91a2d4c555b780a34319028a105f05b73adacb726965d97
+EBUILD libsixel-1.8.6.ebuild 1848 BLAKE2B 65ebce0c43773581673555da29d7ada4e2bcafb8b2d98dd6e311b1cd9ead95d1a8d52bcc2739b5c1410c2ab776403909bcea1a7198e664d9739db6cabf920f73 SHA512 4a006fd05ba3b344d387dea8c59e6895c28f515094c84bee22fc4479c320964faf768a926bbaee008103fb74fe4b5285e97b31ff61e1e2b12db045508ab548e9
+MISC metadata.xml 387 BLAKE2B 71825e6924d15781b4c819089beabe6b4279b8f408452e97c5121d2892d8539f95205d2c869dc1259b3aecb0e8d7a1389548b44bca7637994afe16da0abcc8d3 SHA512 4481aef804960b1205090e2453f878fc059b009d1548f1a8b28653919443b73cd030b9020b3d0707d98623f39a82775d36f5111ccb1bd65f1f9128183915faa4
diff --git a/media-libs/libsixel/files/libsixel-meson.patch b/media-libs/libsixel/files/libsixel-meson.patch
new file mode 100644
index 000000000000..b912288e2e66
--- /dev/null
+++ b/media-libs/libsixel/files/libsixel-meson.patch
@@ -0,0 +1,65 @@
+--- a/meson.build
++++ b/meson.build
+@@ -27,7 +27,7 @@
+     #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+     __attribute__((deprecated)) void test(void) {}
+ ''')
+-  conf_data.set('HAVE_DIAGNOSTIC_DEPRECATED_DECLARATIONS', true)
++  conf_data.set('HAVE_DIAGNOSTIC_DEPRECATED_DECLARATIONS', 1)
+ endif
+ 
+ c_args = [
+@@ -101,24 +101,24 @@
+ python2_installation = pymod.find_installation('python2', required: get_option('python2'))
+ 
+ if get_option('libcurl').enabled() and curl_found.found()
+-  conf_data.set('HAVE_LIBCURL', true)
++  conf_data.set('HAVE_LIBCURL', 1)
+   libsixel_deps += [curl_found]
+ endif
+ 
+-if get_option('jpeg').enabled() and jpeg_found
+-  conf_data.set('HAVE_JPEG', true)
++if get_option('jpeg').enabled() and jpeg_found.found()
++  conf_data.set('HAVE_JPEG', 1)
+   libsixel_deps += [jpeg_found]
+ endif
+ 
+-if get_option('png').enabled() and png_found
+-  conf_data.set('HAVE_PNG', true)
++if get_option('png').enabled() and png_found.found()
++  conf_data.set('HAVE_PNG', 1)
+   libsixel_deps += [png_found]
+ endif
+ 
+ loaders = ['stb-image']
+ 
+ if get_option('gd').enabled() and gd_found.found()
+-  conf_data.set('HAVE_GD', true)
++  conf_data.set('HAVE_GD', 1)
+   libsixel_deps += [gd_found]
+   loaders += ['gd']
+ 
+@@ -132,19 +132,19 @@
+ 
+   foreach f : gd_funcs
+     if cc.has_function(f, dependencies: gd_found)
+-      conf_data.set('HAVE_DECL_@0@'.format(f.to_upper()), true)
++      conf_data.set('HAVE_DECL_@0@'.format(f.to_upper()), 1)
+     endif
+   endforeach
+ endif
+ 
+ if get_option('gdk-pixbuf2').enabled() and gdkpixbuf2_found.found()
+-  conf_data.set('HAVE_GDK_PIXBUF2', true)
++  conf_data.set('HAVE_GDK_PIXBUF2', 1)
+   libsixel_deps += [gdkpixbuf2_found]
+   loaders += ['gdk-pixbuf2']
+ endif
+ 
+ if have_getopt_long
+-  conf_data.set('HAVE_GETOPT_LONG', true)
++  conf_data.set('HAVE_GETOPT_LONG', 1)
+ endif
+ 
+ configure_file(output: 'config.h', configuration: conf_data)
diff --git a/media-libs/libsixel/libsixel-1.10.3.ebuild b/media-libs/libsixel/libsixel-1.10.3.ebuild
new file mode 100644
index 000000000000..d9e158874cf4
--- /dev/null
+++ b/media-libs/libsixel/libsixel-1.10.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_OPTIONAL="1"
+
+inherit bash-completion-r1 distutils-r1 meson
+
+DESCRIPTION="A lightweight, fast implementation of DEC SIXEL graphics codec"
+HOMEPAGE="https://github.com/libsixel/libsixel"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="curl gd gtk jpeg png python test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="curl? ( net-misc/curl )
+	gd? ( media-libs/gd )
+	gtk? ( x11-libs/gdk-pixbuf:2 )
+	jpeg? ( virtual/jpeg:0 )
+	png? ( media-libs/libpng:0 )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-meson.patch )
+
+src_prepare() {
+	default
+	if use python; then
+		cd python || die
+		distutils-r1_src_prepare
+		cd - >/dev/null || die
+	fi
+}
+
+src_configure() {
+	emesonargs=(
+		$(meson_feature curl libcurl)
+		$(meson_feature gd)
+		$(meson_feature gtk gdk-pixbuf2)
+		$(meson_feature jpeg)
+		$(meson_feature png)
+		$(meson_feature test tests)
+		-Dbashcompletiondir="$(get_bashcompdir)"
+	)
+	meson_src_configure
+	if use python; then
+		cd python || die
+		distutils-r1_src_configure
+		cd - >/dev/null || die
+	fi
+}
+
+src_compile() {
+	meson_src_compile
+	if use python; then
+		cd python || die
+		distutils-r1_src_compile
+		cd - >/dev/null || die
+	fi
+}
+
+src_install() {
+	meson_src_install
+
+	cd images || die
+	docompress -x /usr/share/doc/${PF}/images
+	docinto images
+	dodoc egret.jpg map{8,16}.png snake.jpg vimperator3.png
+	cd - >/dev/null || die
+
+	if use python; then
+		cd python || die
+		distutils-r1_src_install
+		cd - >/dev/null || die
+	fi
+}
diff --git a/media-libs/libsixel/libsixel-1.8.6.ebuild b/media-libs/libsixel/libsixel-1.8.6.ebuild
index ad139ad3d010..0cb049507e88 100644
--- a/media-libs/libsixel/libsixel-1.8.6.ebuild
+++ b/media-libs/libsixel/libsixel-1.8.6.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
+PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_OPTIONAL="1"
 
-inherit bash-completion-r1
+inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="A lightweight, fast implementation of DEC SIXEL graphics codec"
 HOMEPAGE="https://github.com/saitoha/libsixel"
@@ -12,15 +14,30 @@ SRC_URI="https://github.com/saitoha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT public-domain"
 SLOT="0"
 KEYWORDS="amd64 ~ia64 x86"
-IUSE="curl gd gtk jpeg png static-libs"
+IUSE="curl gd gtk jpeg png python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="curl? ( net-misc/curl )
 	gd? ( media-libs/gd )
 	gtk? ( x11-libs/gdk-pixbuf:2 )
 	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	png? ( media-libs/libpng:0 )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	default
+	if use python; then
+		cd python || die
+		distutils-r1_src_prepare
+		cd - >/dev/null || die
+	fi
+}
 
 src_configure() {
 	econf \
@@ -32,6 +49,20 @@ src_configure() {
 		$(use_enable static-libs static) \
 		--with-bashcompletiondir=$(get_bashcompdir) \
 		--disable-python
+	if use python; then
+		cd python || die
+		distutils-r1_src_configure
+		cd - >/dev/null || die
+	fi
+}
+
+src_compile() {
+	default
+	if use python; then
+		cd python || die
+		distutils-r1_src_compile
+		cd - >/dev/null || die
+	fi
 }
 
 src_test() {
@@ -42,8 +73,15 @@ src_install() {
 	default
 	use static-libs || find "${ED}" -name '*.la' -delete || die
 
-	cd images
+	cd images || die
 	docompress -x /usr/share/doc/${PF}/images
 	docinto images
 	dodoc egret.jpg map{8,16}.png snake.jpg vimperator3.png
+	cd - >/dev/null || die
+
+	if use python; then
+		cd python || die
+		distutils-r1_src_install
+		cd - >/dev/null || die
+	fi
 }
diff --git a/media-libs/libsixel/metadata.xml b/media-libs/libsixel/metadata.xml
index 457207a9bc18..3bd897a7c985 100644
--- a/media-libs/libsixel/metadata.xml
+++ b/media-libs/libsixel/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">saitoha/libsixel</remote-id>
+		<remote-id type="github">libsixel/libsixel</remote-id>
 	</upstream>
 </pkgmetadata>