gentoo resync : 18.11.2017

4 files changed, 53 insertions, 2 deletions

diff --git a/media-gfx/icoutils/Manifest b/media-gfx/icoutils/Manifest
index 9505b00bf672..866bcefb97ea 100644
--- a/media-gfx/icoutils/Manifest
+++ b/media-gfx/icoutils/Manifest
@@ -4,10 +4,12 @@ DIST icoutils-0.31.0.tar.bz2 559836 SHA256 a895d9d74a418d65d39a667e58ae38be79c9e
 DIST icoutils-0.31.1.tar.bz2 573484 SHA256 26e29d3c78f25d4cdf402501ac0414c51a9a092daebf6c9dee3b837dee693093 SHA512 47fe41429cee73b6aff90e2b385b621314700dedfe09989318e439b19a484d806a9428652008be2db70598ba1337e860fba30b6d8104525f9e0bcbb4dc61dc56 WHIRLPOOL 893fbbf7f4dd1ebb06c14d22baf0ac1c126941688ac451b4976e1d0d505056714361f8ab99e2c8f080e20b0d1a8670e375cc2f663ab2bb8861e0af1152fb7504
 DIST icoutils-0.31.3.tar.bz2 593403 SHA256 d4651de8e3f9e28d24b5343a2b7564f49754e5fe7d211c5d4dd60dcd65c8a152 SHA512 3c25dfff0d947ad4688e57871888b7d03ecc1d5aaf2dd957bbfd5d034cbde03238a03446a719b637d2f0c309af424359435d98bddfbdf1ea9d4c08bb23f154d8 WHIRLPOOL 4c0d34484d956f8817b25ed87e36d868ad35ec74d49ad02b4503c3029ab0253b8bbf38b5687f965fe609b4e6d42a1be1da8debe2f8ec5e168136fe7833e341ab
 DIST icoutils-0.32.0.tar.bz2 593699 SHA256 17234d6e922f5dcd2dc8351a4b3535a2f348bb9b92c17ca3e438132147019ca6 SHA512 35fb584611edefe4445784e61e9cc10bdc039fc4106b7dca7faf66ca1a252ad6dc6e3511b4a5aba744ba74b51315a757addce2f8d5b20a1d7e38886e3eecd878 WHIRLPOOL 2d19d75271c0cd4abae9d80671e8422f33a8e95c4252323292c8d89eaebd1a3442e2f37c680a2068b5a740b77003fb8479c00f6d21647b6116ae8f31577ff46e
+DIST icoutils-0.32.1.tar.bz2 594036 SHA256 a9ed0fdb93e35708d9d07d0433ee1d71e07683404fa8d6e9d8aaeb6506a13fbf SHA512 e235cbf0e30f7833babd3aba182cf32b8b76ee757d0d44597c21567a6f960943ec187423727cc33016f6b4d4b0367b9bee7da9dc12807551b38bb4fbe14c37f6 WHIRLPOOL f308471e87c82b0112f6ce21ef4253149f77a70c2f2f8433064c2214ca3f1d92f7c36acc6c7e3bcc5573af57b6ed7fc2cc15a20f3380d203d8d7fd8d88ad1a74
 EBUILD icoutils-0.31.0.ebuild 985 SHA256 9ac55e0707db7dc81de616d82884017ae6dbd052a06fa335be8d2fb0b8caa9e2 SHA512 917a7ad7167a16b4c661d0849d7dc443c409d1e0909e2c48cbcbb11d9a3aa8ed150da4ff47969f2f51268d83efc73518e17856ea8a39cf11000f8d6ca3b9923f WHIRLPOOL b05414c6de045088374ba9dffdc185b75611258022f1993e215a411c9bf19124316f5f02bd53eb703fedd51db9801fca56112ae30b7f3a2653081f4c05e4e73c
 EBUILD icoutils-0.31.1.ebuild 988 SHA256 4aa408e2a5f0e354d37d2bbfe1c09cb0576b1409a51b55089b21718e6cb022c5 SHA512 45be7bd50364f423c1cedefebf6e80afd854899f7f85084c0819ed9d3d7103c48c93243d9e80ae60992c80d6d428cc3da28120107f249b0b7152dd09120de326 WHIRLPOOL 0611443f25d876a47f8a6ad40b48461ff52e1cba51b5448def5f04366e2cca56ddfe5fabbe358c462a7010287612d6cd7edadb7fbeeef5ebe4d0b9a372f36e2f
 EBUILD icoutils-0.31.3.ebuild 1019 SHA256 1c1ac361c9ca3cebad4228447b15a3afdc6a562c094419fa0dc8248c8a111ad9 SHA512 0cd637de98d94afca95ed61ccf7bdb1ef331cc19eef08c7c13a568013a5cb3aa90b3c15c8c399b4ced503cf6d82b2a6b4bc41f55bf46caf3c69b501ae32b4bc7 WHIRLPOOL 2d780fe994f11b002c7b429dd7e5271cce9e56a5d5fc2827cc15e2ded4967884f5edf690b70d0220aad67aa3fa357cf33b9a033a69bff4de4ed858f53e753320
 EBUILD icoutils-0.32.0.ebuild 1023 SHA256 d6f586ea2b04aa48121f2ffe4e1f50c9f1e59e64cfdd286983b27e868d7f734a SHA512 6d61698ff5051941507c585158f03fcf1809f5b98f48be1d3a5b704fb803faf9ae8943bd9ee9a78a0078c4d2641a1faf99be7d339cd601aec4c70fc3568e38d2 WHIRLPOOL d820e349279a80a7cef2f09e19e679091acdb1a121d0c1cbc07037015172c39ea23a7462f45b161be07d65bf79e0727cef8f6eaaf6fbfed416e2a00b4e3e2882
+EBUILD icoutils-0.32.1.ebuild 1026 SHA256 06c0f6d088c7f26ce3778246bd553e5f986bace7221bfc5795263197467d5592 SHA512 57f6adc89ece356040261ca24dea89b79e5c11489f901547e12a0f7c9e4939e6a082d903e86da3aa3ec6f6a0a464fec9c3f9276eef48003d186a3c3f7e274b96 WHIRLPOOL 58eaec854f1b35ab84c19bc2e44c8c26511b7d9b25e479975ee6fa9e96926f1b1d255f5a49ce80e0a8bc905490b7e43d5e9b4f67b4e54bdac498e90d2a3a8576
 MISC ChangeLog 2510 SHA256 16bb342dc64591f7a55a8eccb53a4437aa5de0c0d54683639d5f619f65b40b1c SHA512 3a3eb3226ac14a51798e9d5eccba44b0e008158487423fd6d0b4ac2a07ca2972d6a1700c8cb9a2f3952e7f789222ae8e7399e20fd97ebb421e06ca776ec36648 WHIRLPOOL b213562329abab32308e7ff7f3b621b30c09547095128af9da2bbe6e29d5729c3dc2ae7caafb2d0a1efb10bd86651de4b6e3e834a636e25574a77ae5f1132be5
 MISC ChangeLog-2015 4903 SHA256 b54828e070b7eac9017d1ec4e59e82ac0bb4d05c4b0357d48e72e9ac3ef958e2 SHA512 106efa193f846b6a13e0e7f7756998843cbba042c7c8b957e49c1b496360a74bcd517dc31a2088feebdf707adb6bce3591eb70433965aff89f0eeb065d322383 WHIRLPOOL 55ff0ac9c4a5ad4921d90ff0ce1c42a47c7a3ad110d05a91089e42f32101043f71651df828e95c0c08294849708bd0f1187c2cdf346fdc0bca583e2fe3a4d95c
 MISC metadata.xml 243 SHA256 cd3f53e40471c5030fe79b91a8d0dab307792eddd4b2d5e9ba9b6fb2425060b4 SHA512 3b619672a798fcaa808248ae187a6e6253bf1f693d2d9808ffb5b60d4d909130299512b623f7c9dbe6971ad15af7dbb6dd51e4b80f512abe0966dc46861fb775 WHIRLPOOL 0b98ded4f5352f03b68d62d5ed07b1f1b4fa09a6c4a39952fd28d589aad820b458a95ded468af6e3134bc10d4fe45d6acc46254ac3f9c8a891aa341d9810340f
diff --git a/media-gfx/icoutils/icoutils-0.32.1.ebuild b/media-gfx/icoutils/icoutils-0.32.1.ebuild
new file mode 100644
index 000000000000..916e4cc663d8
--- /dev/null
+++ b/media-gfx/icoutils/icoutils-0.32.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit autotools flag-o-matic
+
+DESCRIPTION="Tools to extract and convert images in icon and cursor files (.ico, .cur)"
+HOMEPAGE="http://www.nongnu.org/icoutils/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="nls"
+
+RDEPEND="
+	>=dev-lang/perl-5.6
+	>=dev-perl/libwww-perl-5.64
+	media-libs/libpng:0
+	sys-libs/zlib
+	nls? ( virtual/libintl )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.29.1-{locale,gettext}.patch
+)
+
+src_prepare() {
+	default
+	rm m4/po.m4* || die
+	cp /usr/share/aclocal/po.m4 m4/
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	use !elibc_glibc && use !elibc_musl && use nls && append-libs -lintl
+	econf $(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" mkinstalldirs="mkdir -p" install
+	einstalldocs
+}
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 63fd3cf4d9b2..0fbb069d3aed 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -6,7 +6,7 @@ DIST librecad-2.1.3.zip 26086377 SHA256 f05af030c71192109c1472c6fd24696fcb564b2e
 EBUILD librecad-2.0.3.ebuild 787 SHA256 a087564ddc87dfbba192a6dc0ba64c82377b2f1297e99b6b96426c529c7150c5 SHA512 5d34f9e791018f75a990d378f41c077458411d96ed40729a1b34afe527849e7fc3d245a02941dc95ce1582e3ffb935aec50efc926b57b98d3e5f48e7378b7325 WHIRLPOOL b6126b602a1b4cc6ff70716f6c9f55a2abd47bd8ded819c0d972067ee3a8ed2fe5cf866f870f3e7cccb273c03d35887585ed16a4208dc667beebec87c0e34d01
 EBUILD librecad-2.0.9-r1.ebuild 1374 SHA256 1600c97892b529ba6351b100a154900f48decb9760b2d0a69b497ac72b7e0b7c SHA512 c41f56a05b3f98f10947ec5c648796ad138fd9ae013e7b64045cc3a66ac74e075c962c02cbef5ee5e40f1597927a903fd5a177ebb3c84cd74efd7e4a8e97c2c5 WHIRLPOOL 1804543552d695fc241ecc801ace60ecbceae14949bda17d3acc8acc121fa3faffb085536921b5ef0e6eb2a10f8f3e53c2660b81dfcfdd79c46dcd9ebe92ad7e
 EBUILD librecad-2.1.1.ebuild 1418 SHA256 9429b50129a99a5e3dfa3cb260b6a6ae18506d93ae394297b3c191932efa2f33 SHA512 2080a1913324c030b6f7f3a2e21c96b894ec72ca335dc04c5594061d0a06637e9b40e7fae20920832012a5317baca4987971fe4e7cc86dea6c9cd40e4e2d9ded WHIRLPOOL 9427494ed2a759213afe6cdd7f9292b05832e86a7d724c43e71d13d42c670b65e4945edbaeb585cdcd245a2eeb39802099d07963d07f88acf2e5d5b84e1f7a79
-EBUILD librecad-2.1.3.ebuild 1418 SHA256 28d78c437d1f4c8447c010ed820a65483ee4507b180412a5aa53e98cc91e06e7 SHA512 1eb83f082dd3f88f65106633acca6dfb978c59fa0a7cb50e9353d6d92c737c33015c506de8c4896143b8177bc68dd8ca78cca0ef6fbc5e10aa85afbb8572730a WHIRLPOOL 43e54d3f75f913c3a1d8e3d3dbe2fe94ae43dc75a0d3a507efad37591bb2ed9e65bc449dda7df03112ba66f987cf2b05e1da269bec9e821589f40ff07713e4b7
+EBUILD librecad-2.1.3-r1.ebuild 1418 SHA256 d039a4db724fa66ce5707269c93bb6ee2dfa4b5b613ea34b9eacbd4989cd23ac SHA512 6489a761f0bad291fc536047653edfb527240fd8582428cb4811b3c5197a9e6a51b143dd650541f543ab4b312c71fc8a626248c8569ac1fbb6b5fe302e660761 WHIRLPOOL e16d40fae5532ab15bd262d3c1e4014ca2421531670ee29810bd5ccf61254fb40d43040d380bc4b01427fe436e048b863be632336b731bcf30fdea7c109efb8e
 EBUILD librecad-9999.ebuild 1344 SHA256 9aad45475d3b78580db74de6c15b73b9d2e6266f687f4f19d1de769f3efa5a3b SHA512 722322ffaab726f066da0497261ba9d9f4eedab1f885e1d19b587bfbae5745cfde7399c24767f303a9c76a7d456d7564b3cc9d872b875be2a4cab8c499e6589d WHIRLPOOL 1d501cad46064352011e023664893101b5ec1b2209e154910f28d4fe539f46cfd6d2f28543185491901c7a62d1098426e8d1ab04d465001ac2b23d036b5cfbde
 MISC ChangeLog 4238 SHA256 cc0a3f5a63cb6a1d89c51b51c59c5aa9f87e66c3962de8799b51e9ed4256a045 SHA512 b00eeeb651418d48bef394da12b7d03ce690a4b48dc9af347a9548f093c784be0e9876ad2868442861ba939f3e881f3fcd4ade4ce1a1c66f73950c85975c8ead WHIRLPOOL f1d972276c6dd18bc67720ad2097d90cecd1b26fc3bb4388c3904ed33343bca20a425a2bc634a38c265a9c7ef64af31aec5e5e7a23590a9658f1cbfe6dfeb4cc
 MISC ChangeLog-2015 1255 SHA256 8defefb92b3ae4ff96ed33f893b761807d847860e604cf29f18eb181d83cb8fa SHA512 c33d1fe55743ad6bdca17ea9fc0bcead93f737f94271a05c7cd8b61ce2b099b12b9c1d8b9451f75a7139ad6735f09c8f34461f96855ef4078a3e14312617f2e6 WHIRLPOOL 2d0c89179f9d2ecafb0cd231bdc8f1a7dff078360cccb4497f7286d267aa1ac17bf3bf4ca82f344a1b44de03de9135ae5586ee1ec6340e8cd261fdd30d659132
diff --git a/media-gfx/librecad/librecad-2.1.3.ebuild b/media-gfx/librecad/librecad-2.1.3-r1.ebuild
index 545c5595caca..0c5f0aeb2564 100644
--- a/media-gfx/librecad/librecad-2.1.3.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r1.ebuild
@@ -61,7 +61,7 @@ src_install() {
 	use tools && dobin unix/ttf2lff
 	insinto /usr/share/${PN}
 	doins -r unix/resources/*
-	use doc && insinto html && dodoc -r librecad/support/doc/*
+	use doc && docinto html && dodoc -r librecad/support/doc/*
 	insinto /usr/share/appdata
 	doins unix/appdata/librecad.appdata.xml
 	doicon librecad/res/main/${PN}.png