gentoo resync : 04.08.2018

4 files changed, 21 insertions, 18 deletions

diff --git a/media-libs/libsixel/Manifest b/media-libs/libsixel/Manifest
index 3ac83f91764d..e568035b0ccc 100644
--- a/media-libs/libsixel/Manifest
+++ b/media-libs/libsixel/Manifest
@@ -1,5 +1,5 @@
-DIST libsixel-1.7.3.tar.gz 4766335 BLAKE2B 5e546d31f9d66f5121301abe009677d05fbc1444e8a25a1feb6f9fed646a4bc543492376302b663569e0ddca99b665d5c81d9d35aa07349935b727ad581fb517 SHA512 f7b6b9748389f140ce2f6cf0eeb74ab5063c21455c72013a7e066981439bb1ada7b3e9b68a7b3b57c49205271f32ffb8d6d002a4f2af45b1381dd015873b4e91
 DIST libsixel-1.8.1.tar.gz 4777791 BLAKE2B de96029990acc00e0c5fa81e6f892153000a93841b8e152ecc2ae3db0e7ca1dbe5063fdbf69f79f23c82095b253206c7bea0f638ed7536ebcf3d0d23a1137965 SHA512 af38b47aac443bfb443aa7b12041ecc1496722afbc861ad8572e90c34c7c1ed4ee04241d5d5f3abb7d8be945fac2a1f718494c4fbd023a6a7b9f6d912f90554c
-EBUILD libsixel-1.7.3.ebuild 1110 BLAKE2B 4ad85bd3aa3f0ef0811367bf4eb8ad40f677d4c0524d58a41628715bf2d075fb69e95ca7733156bbd3659b98d33f4c0ad3c14b610adbdf17d243d9cc61bfddc8 SHA512 08fe560db4fc76c1d2c70a0b7eacc3e48fffac3a4ef9ebf19e44c2735cc5473808b104792c07c80d7c60fc7c95eecabf7623a40d2fb2bbce96cf0caf830a108c
-EBUILD libsixel-1.8.1.ebuild 1035 BLAKE2B 38ef663569cf8809639588d1a1cc4943ac06f4ac12bbb6e156556df93ad266c47bee6d953f7df8c5aed158b47bd0ed012fea48914c33bf889336062f04bfb224 SHA512 8d0b96674b65d4890eb1eca590d08f10a15ec5dc1c72bced54c10a22f933ac5322a7a6219b7cda5616b46b80ddff61da39201dc47be3ec7ebf1d278befb15cd0
-MISC metadata.xml 306 BLAKE2B 9fb9f3186df0538ebf4d1ec03e7404f798f36c2763e048d4b4026156d75b0597e58a4412235e1d7c44b0fc9ea54665fdfcb248374818ab086e4741345469013d SHA512 5fe5ae6f4593b3c990ded3a3d96dc2149729b00bb0a0d13a936c68c61515a79efe90672a6f0b13023b1dbb3fb00e6698ca16751932bfc09af84fb5b4c5ef1dd1
+DIST libsixel-1.8.2.tar.gz 4778776 BLAKE2B a43ff76e271b27337fa4144bd89170f33bfae535696f5107cc77b3adef370e89d9da950746621ec7002b201f68dba873f99463d8b2183c319b62f2574f0562a3 SHA512 f0287b7b7a190f0f964e27fc65aa816a78c09de5e50045a25eb05f9b430c74f779a7d5eb591b3430a82a06621d53719bf115bcdd0b99acc9afe3cb9ab6fde271
+EBUILD libsixel-1.8.1.ebuild 1139 BLAKE2B 4f136743257e39dd162a1c59a7e5151f84f5edce48ab90feb5f8a8a69f8e4265125e0d91c7c3ed99adaba0b9a6e31673e09c1434e5375599c3a01ba518a2368e SHA512 132dba0ec708a69bc6992fea0f6efe2cd3aa69372f68a32f50ee7119b89d414a1634882b4956d09dec63a71a4d03c2287acef923c6ddcbd0bd894c99c102771a
+EBUILD libsixel-1.8.2.ebuild 1142 BLAKE2B c13f2c30518874b308dd758672367445567292105224bb959f782284444437277e1b354a8f3f04530fcd437f8a09a635189aefbd0b74b53158bd4ddc05dcc367 SHA512 604e91d30ace2de226d6973239a5f3e8d67ab97189c46844f85a4d6357a93c5c3e0afc77a675bf4ecfc9396f193995b5731968b6ce3841c1ebf43ba67e1b887f
+MISC metadata.xml 329 BLAKE2B 607583721c17ebb8bd03d4142860d189cba164b08acbb5471a06172a0b3eb58a141f3daf6cc5cf96b7830699d9528bb60ee5214bc376a0514103e01ec8df4fec SHA512 018b8cb5c0a19e397914b799dedae30e20aab765ad58098529a45cc2aa14bd695abbd75b09efd0eb957da1dcc99b0ea04bf07f167047095288b033f82c4e4b92
diff --git a/media-libs/libsixel/libsixel-1.8.1.ebuild b/media-libs/libsixel/libsixel-1.8.1.ebuild
index 12cd9a6cec32..05da6156753c 100644
--- a/media-libs/libsixel/libsixel-1.8.1.ebuild
+++ b/media-libs/libsixel/libsixel-1.8.1.ebuild
@@ -7,12 +7,12 @@ inherit bash-completion-r1
 
 DESCRIPTION="A lightweight, fast implementation of DEC SIXEL graphics codec"
 HOMEPAGE="https://github.com/saitoha/libsixel"
-SRC_URI="https://github.com/saitoha/libsixel/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/saitoha/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE="curl gd gtk jpeg png"
+KEYWORDS="amd64 ia64 x86"
+IUSE="curl gd gtk jpeg png static-libs"
 
 RDEPEND="curl? ( net-misc/curl )
 	gd? ( media-libs/gd )
@@ -29,6 +29,7 @@ src_configure() {
 		$(use_with gtk gdk-pixbuf2) \
 		$(use_with jpeg) \
 		$(use_with png) \
+		$(use_enable static-libs static) \
 		--with-bashcompletiondir=$(get_bashcompdir) \
 		--disable-python
 }
@@ -39,6 +40,7 @@ src_test() {
 
 src_install() {
 	default
+	use static-libs || find "${ED}" -name '*.la' -delete || die
 
 	cd images
 	docompress -x /usr/share/doc/${PF}/images
diff --git a/media-libs/libsixel/libsixel-1.7.3.ebuild b/media-libs/libsixel/libsixel-1.8.2.ebuild
index 3d8e5d2dbd83..c05386adb4e3 100644
--- a/media-libs/libsixel/libsixel-1.7.3.ebuild
+++ b/media-libs/libsixel/libsixel-1.8.2.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit bash-completion-r1 ltprune
+inherit bash-completion-r1
 
 DESCRIPTION="A lightweight, fast implementation of DEC SIXEL graphics codec"
 HOMEPAGE="https://github.com/saitoha/libsixel"
-SRC_URI="https://github.com/saitoha/libsixel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/saitoha/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT public-domain"
 SLOT="0"
-KEYWORDS="amd64 ia64 x86"
+KEYWORDS="~amd64 ~ia64 ~x86"
 IUSE="curl gd gtk jpeg png static-libs"
 
 RDEPEND="curl? ( net-misc/curl )
@@ -40,7 +40,7 @@ src_test() {
 
 src_install() {
 	default
-	prune_libtool_files
+	use static-libs || find "${ED}" -name '*.la' -delete || die
 
 	cd images
 	docompress -x /usr/share/doc/${PF}/images
diff --git a/media-libs/libsixel/metadata.xml b/media-libs/libsixel/metadata.xml
index b9a0f9f649b5..c6ef4c2f75ec 100644
--- a/media-libs/libsixel/metadata.xml
+++ b/media-libs/libsixel/metadata.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hattya@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">saitoha/libsixel</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>hattya@gentoo.org</email>
+		<name>Akinori Hattori</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">saitoha/libsixel</remote-id>
+	</upstream>
 </pkgmetadata>