gentoo resync : 22.01.2021

3 files changed, 11 insertions, 12 deletions

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index f62082adbe3b..51d9e08839a1 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,7 +1,7 @@
 AUX missing_atomic_include.patch 319 BLAKE2B 8b122e0f1b61cbe98413b21f90c97826fc75b64c4c12f70b2a3048d4c14151f9f790e5c55fbea6eed518f9bdae57e2620b2be15351d86ae339fd4e38925aa57b SHA512 05f3f392f115d918aae78bb6c82b7461212a26bab826e02b686ad03f8c3f8e4fe0b1c1b89e2982e8912922ef987596501ef4145474e2745bf89487e9ba6134db
 DIST inkscape-1.0.1.tar.xz 32051632 BLAKE2B d17ae49c42908e24aade2216f5adaf56b14ac830decfa2c07ea711c034d144251d5c039f516934a6d004b48165ab3a70d40a7cb7e658ae5e97ef37b392a7d556 SHA512 70145e02fe7c3ffbfa3dcea690bfe3315131fb9a507c70bcdc1d0db394d207e3bd04d7cc86c3b625597bddfd2b6e09a03841aece6d2ffb6517fe1c619193ec96
-DIST inkscape-1.0.tar.xz 31935616 BLAKE2B 096ef6ccfd519118acffa3b15302a2d92f94976f37cf58c1fdab79abb64a2de14d02e1199364c71265a332f57809603ec1b6f4f34b90e910376e1cbc5c6d1cb8 SHA512 37c18079eb926fd6874deee95e4008bae165c5e52d05cb53bbc8f4a48eedd0e0ab6b3e5dfbb23709169187bfe8eb5aa44d576268667f2566a2cd4dd5426554f0
-EBUILD inkscape-1.0-r1.ebuild 3989 BLAKE2B ff43d507d1449c91a185b1f5dd05f5dc7ff1598f4056a8dec9211efc5325b3a18774874d6d5d1de3dfb145663dfcb7cb955bf47c146b3c8c51ede525be68f01d SHA512 04b37cb020dddc1e7eadaac23942a554b4eed376dacaeef4c71566753777d86a46ffcb3e3d4f2cb71f17e2a1cfb46e8cf94f028f6d6bef590bcbc24a3b26ac0f
-EBUILD inkscape-1.0.1.ebuild 4135 BLAKE2B 17ba7be899418b0802a142db3352ff523dc38dd368672950eac23fee784203e82ae97f9739f4069fd67cd54a290768df32bddeb283f0c1a66bccbe5f090e7631 SHA512 a9cd26ffc148f05b02a6662c0aa25e346eda064e790abf8a240589a1f4bf64f25dbdec2ec76c62feb7c95a2f25d25f00636fe197a53ba73e87e3de59af5b51d0
+DIST inkscape-1.0.2.tar.xz 32421620 BLAKE2B c3f9c37b15343ba0955a6d06810aef5fb9e035a240f99579301b8cd93858a62b5ed1a3ff528a9642ec74b8900305495236cf7f4c672864369a4e33dca3b34bd4 SHA512 f4fbc627c0f07db11194715c505b771a60af29a9a7f8be0232e4f7eb6b1c5814c3f160c2003d64ec62aeb92ef44174320a47aa6b6abc7a67cc27c996cba9522d
+EBUILD inkscape-1.0.1.ebuild 4131 BLAKE2B 7f0f16514898019220b8e924cc773a27ee870d80f396000999f943ba51ebe06ca79865ffdb6b6893e24d048234dfca72f8cfafd28825997c3cfe746583e47763 SHA512 57b7272b22d9f6f5719415b1570d46839a4635693d043316b0ad53d20165f399da9d905478fa62fa2970e0afafdeba28962b3fa3e8141928a08fee62cd0ca230
+EBUILD inkscape-1.0.2.ebuild 4098 BLAKE2B 93e7513b2661039ef925503dc3bce84c4a28646b981d5d7f10329c494975a11d57c7800b78cc46ee3e36720b8576770e75066cdc48efebad1e856e35b57febe7 SHA512 6135c8c41600e97c25773b322e33db9851100e064105461f83be958893311e0fb8365aa6a5eca7bda2083e27898496567e334d32dd5fbcba44c035742c0406f1
 EBUILD inkscape-9999.ebuild 4052 BLAKE2B 3381b7768c38b2015cdbce053cf58ba0ddf6ae11ff942e41ac892cb26a0fac21f6afa1e6a189a95782250b300e009f466ebe81ed3e7944a9bcff7c179ddef33b SHA512 e3aac077bba4efd085083d8c55b62e5b501270091ad20ca688509c66fde8e6e48a415d083eb40cc936532c108d43c3231de0ebb5070e05c289de452d9fe307a4
 MISC metadata.xml 983 BLAKE2B 5b149700a92f0f4e8a07a643eb004ee6669a668a8a04dd74f13883c858bd2457f8a7f193f64313bf3203fa628484e502a0252272ae8f665a9ebe661589f3637d SHA512 7ab0de464a4dece17f9421bf44a660590c4d453447603a57568a092f90a0005e751cd599ca0923152fc101558c46c479dc65c13a8727b6071a43b1703b459b1e
diff --git a/media-gfx/inkscape/inkscape-1.0.1.ebuild b/media-gfx/inkscape/inkscape-1.0.1.ebuild
index ebd89f20c15d..01a5f16bfc2d 100644
--- a/media-gfx/inkscape/inkscape-1.0.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://inkscape.org/gallery/item/21571/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
 openmp postscript spell static-libs svg2 visio wpg"
 
diff --git a/media-gfx/inkscape/inkscape-1.0-r1.ebuild b/media-gfx/inkscape/inkscape-1.0.2.ebuild
index 53bd4516401d..ed4d6019f5e0 100644
--- a/media-gfx/inkscape/inkscape-1.0-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,20 +10,16 @@ inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
 
 DESCRIPTION="SVG based generic vector-drawing program"
 HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://inkscape.org/gallery/item/18460/${P}.tar.xz"
+SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms
 openmp postscript spell static-libs svg2 visio wpg"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-PATCHES=(
-	"${FILESDIR}/missing_atomic_include.patch"
-)
-
 BDEPEND="
 	dev-util/glib-utils
 	>=dev-util/intltool-0.40
@@ -102,7 +98,7 @@ DEPEND="${COMMON_DEPEND}
 
 RESTRICT="test"
 
-S="${WORKDIR}"/${P}_2020-05-01_4035a4fb49
+S="${WORKDIR}"/${P}_2021-01-15_e86c870879
 
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
@@ -155,4 +151,7 @@ src_install() {
 	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
 		python_optimize "${ED}"/usr/share/${PN}/extensions
 	fi
+
+	# Empty directory causes sandbox issues, see bug #761915
+	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
 }