gentoo resync : 04.01.2018

9 files changed, 82 insertions, 520 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 604435f95818..eae43e50e71a 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 3bf58427294b..3511dcd34267 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -11,12 +11,9 @@ AUX gimp-2.8.22-cve-2017-17789.patch 1245 BLAKE2B 14d519b8b024e51b452806b4acb6f0
 AUX gimp-2.9.6-underlinking.patch 653 BLAKE2B eee76b9aeff7da49c102b44899df7e3a5dd8e62b8d135c5400ac5c5c114524834070e8f5c97076022fec3b68098433f8433c82dddf0c41803c41cce3d9b3d552 SHA512 3ed27297af495828d9394d7bdd067d416733ae7a3665784ee37b19273d002a585fcb22f30ec6db93164b0f0c7220af6020984820da4c78a356b2ae71fb9e61c3
 AUX gimp-2.9.8-cve-2017-17784.patch 1087 BLAKE2B 2398e735ccd7b0a5cc393f297b60d4a51038aeb146779268f78fb2f0a24ef912468510de2a0f640c5f905fe9959581686f55bccc022633b6f2a3a93ab3f12848 SHA512 5bc928860b2f2b53cc72c9c3caf6a532cf7e61b02e0716ee99a5166a07b01bdd46edfeae7bf6e333ce14ca11b5fcb963cbd42005e02f914d909431bf201dc6d5
 DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
-DIST gimp-2.9.6.tar.bz2 25472593 BLAKE2B 2f860f2ad085024b5bc7fc14a9db57d63b5c5f8b714239ef4b65d21c04d61ddff2233ea5d0fd0110655005ca31f60a25feaace38d34ceb7c8ed6d3e255fe7738 SHA512 c874daedb00fbfa4156f0e244b217e221b047cb3bd22a81fb190a5d9d774212dc7802ec215151c6dc87136148bf9f84ca23a0a6340681a53c39b5fa71b2ded89
 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
 EBUILD gimp-2.8.22-r1.ebuild 5207 BLAKE2B 6a023d3beaeee22a66f49e4d5d56d63472ac3f45997787c5458edc36658add3719e442d0e4f2ae16b3c07b7c77fa04e244a07b4b458879bd034f8241793254dc SHA512 f7085aa8760438d03b08dbf42c409ce0f8ea1e3690b7d5158c4c7b6b8ae35e492b92b65007c819b253d86b4a71655ac995410bb53a170cfe026878c951a5752c
 EBUILD gimp-2.8.22.ebuild 4760 BLAKE2B 99f573094528e2c4b4424c9f4867db83c16910fb1d2c8a9b27c15a797330c06596c1a2b4fb7487ea2feac80c9b873060d70919c69024b944e883772d4e2f763f SHA512 4911218b41c0b0f21af7fb8e0b31f2958d41dce51f8764bd92f8c4604a54b7e79528c819b5c464186af7c3f9890a5afc77d6ac85caaa47820d8010481c23a3e4
-EBUILD gimp-2.9.6.ebuild 5334 BLAKE2B 814390cfa05d733a4a79efdd4e93f92dca9c2ad37024681221aa9f2b8df791789a22108b5ad34757f4186ee275a6d0c0fe301bf7b50c7808fe650fe5da5767d3 SHA512 bb8602bffe9a22b3ddd24ffcc6d08cb0dcf9f8f64052b77f0d948521c60a06ad87fbf0bdc4c0000d146e19d300fc2e76cf01e425b5a63ad15c9b20cb8c0ae960
 EBUILD gimp-2.9.8-r1.ebuild 5787 BLAKE2B 98e530afd8152b5ca02b36cfb4de7dfaa8155e922946dfb4873912bb393dd249c31918674fb9c45538a6b4305ddafcde5b8cc2e90f65a83498b3f905ed02956e SHA512 0d89258666c4c370038d714679ddde5fccfb403b58fbed794c0a7f0928d5e93e3e671f6daec31888100743424d311585d0f29c09a1c9915b6284d5d2c0986244
-EBUILD gimp-2.9.8.ebuild 5297 BLAKE2B 9db3e9ccbc2fcd4f5e01b176483152e8164085f0ea866a71ddd7de50896cb55df92bb4282c78050bd891a4e2442ef2f4567be8b18ef88130e19a340880f2a7d2 SHA512 8924f968092c523b92926b652e021c7b21e0345bd25a44d6a390d09b4d234cb33556f0d19313f60e64d19f703014438f42268fa58ed4147af5d3758f92d9e0ea
 EBUILD gimp-9999.ebuild 5399 BLAKE2B 21f8e5d29e2d23ddda03b6eefb25fe96689d9e48a0412270b5020f20fe1fb2e26b43a3e00930843364387a41f429b64c3c954ec6dfca640dcb7ac7b1bee635d9 SHA512 a1990254a48dc25e0f47591f500b6605bbbe8abc3d2558a7a72d078ac28698f71f95b0ba4eac28131ea2d3e064d4c64f8741693dc37d5bef517c101092e43616
 MISC metadata.xml 388 BLAKE2B 2e779c672c788e3631b0532be9a6081767215bf9687cb2546c92d3c6f4a00d8e8f6e32cca607019847200ed416336f752cfbfaf43b2f600b4bea63eb985e63d5 SHA512 e3a626ac39cea422d1b4660731048d764c4b6f1985e09577865f0047ecbc61c8677d6f15626dbbc03ceb3cb18887ba58747df5d91f5f4b2126afb9ad12eaccb0
diff --git a/media-gfx/gimp/gimp-2.9.6.ebuild b/media-gfx/gimp/gimp-2.9.6.ebuild
deleted file mode 100644
index b0e4b3d055e4..000000000000
--- a/media-gfx/gimp/gimp-2.9.6.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator virtualx autotools eutils gnome2 multilib python-single-r1
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
-
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
-
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
-RDEPEND=">=dev-libs/glib-2.40.0:2
-	>=dev-libs/atk-2.2.0
-	>=x11-libs/gtk+-2.24.10:2
-	dev-util/gtk-update-icon-cache
-	>=x11-libs/gdk-pixbuf-2.31:2
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/pango-1.29.4
-	xpm? ( x11-libs/libXpm )
-	>=media-libs/freetype-2.1.7
-	>=media-libs/harfbuzz-0.9.19
-	>=media-libs/gexiv2-0.10.6
-	>=media-libs/libmypaint-1.3.0[gegl]
-	>=media-libs/fontconfig-2.2.0
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.30
-	>=media-libs/gegl-0.3.20:0.3[cairo]
-	>=dev-libs/glib-2.43
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	aqua? ( x11-libs/gtk-mac-integration )
-	gnome? ( gnome-base/gvfs )
-	virtual/jpeg:0
-	jpeg2k? ( media-libs/jasper:= )
-	>=media-libs/lcms-2.7:2
-	mng? ( media-libs/libmng )
-	openexr? ( >=media-libs/openexr-1.6.1 )
-	pdf? ( >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 )
-	>=media-libs/libpng-1.6.25:0
-	python?	(
-		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
-	)
-	>=media-libs/tiff-3.5.7:0
-	>=gnome-base/librsvg-2.40.6:2
-	webp? ( >=media-libs/libwebp-0.6.0 )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	net-libs/glib-networking[ssl]
-	x11-libs/libXcursor
-	sys-libs/zlib
-	app-arch/bzip2
-	>=app-arch/xz-utils-5.0.0
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	sys-apps/findutils
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19
-	doc? ( >=dev-util/gtk-doc-1 )
-	>=sys-devel/libtool-2.2
-	>=sys-devel/automake-1.11
-	dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-underlinking.patch  # from 629304
-	eapply_user
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
-	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
-
-	gnome2_src_prepare
-
-	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
-	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-}
-
-src_configure() {
-	local myconf=(
-		GEGL=${EPREFIX}/usr/bin/gegl-0.3
-		GDBUS_CODEGEN=${EPREFIX}/bin/false
-
-		--enable-default-binary
-		--disable-silent-rules
-
-		$(use_with !aqua x)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_enable altivec)
-		--with-appdata-test
-		--without-webkit
-		$(use_with jpeg2k libjasper)
-		$(use_with postscript gs)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_with mng libmng)
-		$(use_with openexr)
-		$(use_with webp)
-		$(use_with pdf poppler)
-		$(use_enable python)
-		$(use_enable smp mp)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_with udev gudev)
-		$(use_with wmf)
-		--with-xmc
-		$(use_with xpm libxpm)
-		$(use_enable vector-icons)
-		--without-xvfb-run
-	)
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		addwrite "${nv}"
-	done
-	addwrite /dev/dri/  # bug #574038
-	addwrite /dev/ati/  # bug 589198
-	addwrite /proc/mtrr  # bug 589198
-
-	export XDG_DATA_DIRS=${EPREFIX}/usr/share  # bug 587004
-	gnome2_src_compile
-}
-
-_clean_up_locales() {
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
-	done
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	prune_libtool_files --all
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(get_version_component_range 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	_clean_up_locales
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.9.8.ebuild b/media-gfx/gimp/gimp-2.9.8.ebuild
deleted file mode 100644
index 725c600acc67..000000000000
--- a/media-gfx/gimp/gimp-2.9.8.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator virtualx autotools eutils gnome2 multilib python-single-r1
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
-
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm"
-
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
-RDEPEND=">=dev-libs/glib-2.40.0:2
-	>=dev-libs/atk-2.2.0
-	>=x11-libs/gtk+-2.24.10:2
-	dev-util/gtk-update-icon-cache
-	>=x11-libs/gdk-pixbuf-2.31:2
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/pango-1.29.4
-	xpm? ( x11-libs/libXpm )
-	>=media-libs/freetype-2.1.7
-	>=media-libs/harfbuzz-0.9.19
-	>=media-libs/gexiv2-0.10.6
-	>=media-libs/libmypaint-1.3.0[gegl]
-	>=media-libs/fontconfig-2.2.0
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.38
-	>=media-libs/gegl-0.3.24:0.3[cairo]
-	>=dev-libs/glib-2.43
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	aqua? ( x11-libs/gtk-mac-integration )
-	gnome? ( gnome-base/gvfs )
-	virtual/jpeg:0
-	jpeg2k? ( media-libs/jasper:= )
-	>=media-libs/lcms-2.8:2
-	mng? ( media-libs/libmng )
-	openexr? ( >=media-libs/openexr-1.6.1 )
-	pdf? ( >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 )
-	>=media-libs/libpng-1.6.25:0
-	python?	(
-		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
-	)
-	>=media-libs/tiff-3.5.7:0
-	>=gnome-base/librsvg-2.40.6:2
-	webp? ( >=media-libs/libwebp-0.6.0 )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	net-libs/glib-networking[ssl]
-	x11-libs/libXcursor
-	sys-libs/zlib
-	app-arch/bzip2
-	>=app-arch/xz-utils-5.0.0
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( virtual/libgudev:= )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5.10.0
-	dev-libs/appstream-glib
-	sys-apps/findutils
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19
-	doc? ( >=dev-util/gtk-doc-1 )
-	>=sys-devel/libtool-2.2
-	>=sys-devel/automake-1.11
-	dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply_user
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
-	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
-
-	gnome2_src_prepare
-
-	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
-	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-}
-
-src_configure() {
-	local myconf=(
-		GEGL=${EPREFIX}/usr/bin/gegl-0.3
-		GDBUS_CODEGEN=${EPREFIX}/bin/false
-
-		--enable-default-binary
-		--disable-silent-rules
-
-		$(use_with !aqua x)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_enable altivec)
-		--with-appdata-test
-		--without-webkit
-		$(use_with jpeg2k libjasper)
-		$(use_with postscript gs)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_with mng libmng)
-		$(use_with openexr)
-		$(use_with webp)
-		$(use_with pdf poppler)
-		$(use_enable python)
-		$(use_enable smp mp)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_with udev gudev)
-		$(use_with wmf)
-		--with-xmc
-		$(use_with xpm libxpm)
-		$(use_enable vector-icons)
-		--without-xvfb-run
-	)
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		addwrite "${nv}"
-	done
-	addwrite /dev/dri/  # bug #574038
-	addwrite /dev/ati/  # bug 589198
-	addwrite /proc/mtrr  # bug 589198
-
-	export XDG_DATA_DIRS=${EPREFIX}/usr/share  # bug 587004
-	gnome2_src_compile
-}
-
-_clean_up_locales() {
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
-	done
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	prune_libtool_files --all
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(get_version_component_range 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	_clean_up_locales
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index dfaec5610cd4..599e286e2e07 100644
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -3,7 +3,6 @@ AUX optipng-0.7.6-cve-2017-1000229.patch 903 BLAKE2B d193e4c62813e40b653699d17b4
 AUX optipng-0.7.6-cve-2017-16938.patch 878 BLAKE2B 8ad045b58d4e9072576b50c2f3b2052bc9e877ccfa367a039af27071a999deeadc48c418c5b5b5911022c08a212abb96f486dcf3860da7d74ae2a0978f82de9c SHA512 ea3e0e4823b6acb88f06cb56934147c147b98776f501c09a170f05a0b94355dd08539bb2c3ee69d47293028770df6134c3c648d091e14d5362f360961ee9c468
 DIST optipng-0.7.6.tar.gz 2202237 BLAKE2B f113027ff12f2fc97bd4dc43b8e62f5af8f86e251b43c0f86ffbd59366b329d1fc2a58103aa349cb18fb0c9d2e5f051517439c02aeb44ee435c6fff0c75efb7a SHA512 d31d7494c23413d87b601a706cc2faf82923156a818da66e0bfad11741aed065db8f1b0c088d2abd66899ac192408c05f594295ded2684c4549c5f03b140a184
 DIST optipng-0.7.7.tar.gz 2329555 BLAKE2B af3e1c806522282ccbf9325c0b49f61a30d24b8e2db2dd8ec316a312d0dea595cbb6e8b5b38ef5ea90f1efe14244b81f85f88e11e7334fdd4b91b43b6dae8e7d SHA512 c33b7650143ab39944d2c066e07e10273c37024c5bfe7c00475bfb513af96afa081ff388164845d426d3bce624c0282dee574fa150e963f18d3683d821030280
-EBUILD optipng-0.7.6-r1.ebuild 1335 BLAKE2B 9d40e9ec7e7d8cd7f96cf82676c48bb32f4eac2eca8c7a7d67eb2419994827ae0dc2b28b02a12265034b98de08100e849d0fba2ba414237165dca3fc096a4f65 SHA512 fde34b5fcd172711ee57f55cd93c8d60eb44086a09974aac5cea7b104a3a7c961a1840a38934aaa0a6182fdc2d8be01372d420af5f30054f298ebd565c0c09f5
 EBUILD optipng-0.7.6-r2.ebuild 1418 BLAKE2B 01607a670df74745d7b553a9893e2f27edea8fccfcec222040bb0e3d6fef6595979e82867f3d01145262f89ecd2246aaa5e7d4224e7f590208626047587814b3 SHA512 55936ab0aa173ba316e322a4a11d036dfa63ff198c8d694cbef1f4acbce6e4b86a65d06f9af336a58f2b61f8346292868aa219a876ae2f022e3924c31aeb72f0
 EBUILD optipng-0.7.7.ebuild 1290 BLAKE2B 9368bfe4ca4a47ca16d9fa2f2fd87f4f0632e1a38f31fcd0a8eb1aca11ad67e5b810f7c2756df799d3bfce6a82540dd5c8b248d25b00ebf4bf6ac03b48cd7106 SHA512 717f73a6d115dec2fea332d108986f9a0772466f36a9ccba1b52114df7d9376fc05a808b3e8c0a5d810ba38ec96d0d5480141e497288dfbbb7d5d61682d92f61
 MISC metadata.xml 326 BLAKE2B aa1da3dfcfd0faa4d1bcc901659c15b3ce974eace4d7b1317c7fcfdac13939ca4e0ed9d58eb46e7921caefe63475fcffe3193ad138506c9e16b0d8d9abb73bb8 SHA512 57810d8957812cf02573aff451fb8248944bd100beaa06412deb4b5622161fca2ee466ad80050d68e94acf5e2e7963c6fa657416996c0503da6ac88f1f00efdb
diff --git a/media-gfx/optipng/optipng-0.7.6-r1.ebuild b/media-gfx/optipng/optipng-0.7.6-r1.ebuild
deleted file mode 100644
index 9039ea4f1538..000000000000
--- a/media-gfx/optipng/optipng-0.7.6-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Compress PNG files without affecting image quality"
-HOMEPAGE="http://optipng.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="sys-libs/zlib
-	media-libs/libpng:0"
-DEPEND="${RDEPEND}
-	sys-apps/findutils"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.5-estonian.patch
-	epatch "${FILESDIR}"/${PN}-0.7.6-cve-2017-1000229.patch  # bug 637936
-
-	rm -R src/{libpng,zlib} || die
-	find . -type d -name build -exec rm -R {} + || die
-
-	# next release is almost a complete rewrite, so plug this compilation
-	# problem in anticipation of the much (c)leaner(?) rewrite
-	sed -i \
-		-e 's/^#ifdef AT_FDCWD/#if defined(AT_FDCWD) \&\& !(defined (__SVR4) \&\& defined (__sun))/' \
-		src/optipng/osys.c || die
-
-	tc-export CC AR RANLIB
-	export LD=$(tc-getCC)
-}
-
-src_configure() {
-	./configure \
-		-with-system-libpng \
-		-with-system-zlib \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake -C src/optipng
-}
-
-src_install() {
-	dodoc README.txt doc/*.txt
-	dohtml doc/*.html
-	doman src/${PN}/man/${PN}.1
-
-	dobin src/${PN}/${PN}
-}
diff --git a/media-gfx/replicatorg/Manifest b/media-gfx/replicatorg/Manifest
index cfd47a4d1559..8e210e70e0a8 100644
--- a/media-gfx/replicatorg/Manifest
+++ b/media-gfx/replicatorg/Manifest
@@ -1,6 +1,6 @@
 AUX replicatorg 52 BLAKE2B 165fed22febafa650c6a20085cf6709b9c93132068fb4af0208ee79c46923d0c7a1bf783d5eaa51ee85a3c53579c6a18d5c823a1b5bd7feaf3bdd9fcf751de71 SHA512 93e5c726d4252d1ebe9d8283d1bb9c0857c8a8385f35762a9ca972fb79fd9723b60faa39e2553cdf1da790405bbc74863e72da26c27081ed96d5d9ca4715c095
 DIST replicatorg-0037-linux.tgz 52627038 BLAKE2B 04a11093da4c7ef57dce25648518d5a6233a95eb6733d128fdd1e6c16c1c2dae7314c00d3e151aaad92fe66687cad27f6c203a494a3235be7c1f9ab9cf8f20a4 SHA512 9fabfe64a6ff6c059abe66404349739cd74bcc244a4f37d020d506fd82d318f5103daeb289f615fe47203c43ea8842487acbe21b6cdbb9cdb4d9b20bfbfd845c
 DIST replicatorg-0040-linux.tgz 45962287 BLAKE2B 9aae435b150d96129be027658a3fd65ffc2f3335ecb40e219bff8919c9d14625ee059e899f576a8580d6fffdcea59e1d9e096377068a378a302ac82bd782df9c SHA512 c2be8679ebcb722a01f46bbd5a3dd771ebda0eb5e5546627f9064b412be0e5ae0b63f9d44dc7f03d9b3fb862c45dbe09edfb15018a075f39ca57d725ca804205
-EBUILD replicatorg-37-r2.ebuild 1995 BLAKE2B 247b4b39a40c7867576632d0d0f952fe4388ec04dd4a77f51d143b15b57321c0b064bbfda60f3e6d03f55c679aabf1e0f8ede55944cb6fb2b59d1b906f7d248a SHA512 e68d2355e6608a9aeef6bb92b972d609ddff5b5b8edc6bc2f505595a9b9233575af1c91b2bb9c044136e70347a2c4992c980cf6ea6c9eb481e1413791aefde3f
-EBUILD replicatorg-40-r1.ebuild 1984 BLAKE2B 92c5d6f7c98b27f7c66dcaa934a0bcb1dccc7d384a2ca3168fe7f4eb46c9678a5f1f71895873c482cd6b0844a48ef86847c62431474118f03a4559555078243f SHA512 199bbb57d3b687ab95f5a5e9a3d979f270ea088b9b74144d7fdb65876d662140dab0c4de7d58f94bd22b3c1d601ef7b6b2dd19218e3ee4dd3d9bbc380036ce2e
+EBUILD replicatorg-37-r2.ebuild 2513 BLAKE2B 4a48f8bd936b4e58fd2714b2d315aef5fea419f4cad3381658dca9a6df5d50f5d2ad9bc5d71e33ccc0edf818d15206a37ec3e4ea5614ebc8557c4a695c7b7c80 SHA512 21b131ff2316c73790abfdbaa2ba8dd24c8b50c0e26c2a3a2b73fcab5113c48f7ae96adfc81f572956a947db07334e102a0dfe679b786a93a97e7de547fe4e19
+EBUILD replicatorg-40-r1.ebuild 2502 BLAKE2B 46685a706d79ba17799caf7ec36362e3f1c3a86ad15bb4fac28f41431a017d4dbf8de0bb50cd9c36f5fd82da1a4f1ed552ff241c64c3f832d46e5ec80fba1d4d SHA512 1140a53c0135d7916fed6c930576bb886c4a19b6ef558bd5fde212d9502bc6e80f6c4685135659698cbd44d070d809c1e1af130521951226abf73ca7abe2f166
 MISC metadata.xml 651 BLAKE2B 632ffdf62dcc19c95406d96667fb4f73fcb1d745840031227c31c4476f20207f93fc9f93eab8ed2730b4c36859e9443af33a1a95df6178a51616805265186bab SHA512 7174fd352ffee5c45009306a23db9dbe613c8045483df7ddefd6cb465161904d6055951c9d3b2a89cfff33726ac4601dd72f25a0b5331ec14b1e88602f181c7c
diff --git a/media-gfx/replicatorg/replicatorg-37-r2.ebuild b/media-gfx/replicatorg/replicatorg-37-r2.ebuild
index fbb7b8981eab..d2ec0905f939 100644
--- a/media-gfx/replicatorg/replicatorg-37-r2.ebuild
+++ b/media-gfx/replicatorg/replicatorg-37-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+EAPI=6
 
-inherit eutils versionator user
+inherit versionator user
 
 MY_P="${PN}-00${PV}"
 
@@ -11,45 +11,30 @@ DESCRIPTION="ReplicatorG is a simple, open source 3D printing program"
 HOMEPAGE="http://replicat.org/start https://github.com/makerbot/ReplicatorG"
 SRC_URI="https://replicatorg.googlecode.com/files/${MY_P}-linux.tgz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
 IUSE=""
 
-COMMON_DEPEND="dev-java/oracle-jre-bin"
+COMMON_DEPEND="dev-java/oracle-jre-bin:*"
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+QA_WX_LOAD="
+	/opt/replicatorg/skein_engines/slic3r_engines/linux/lib/vrt/f319e78215d06c9bbdc612ed9aef7e56/SSLeay.so
+	/opt/replicatorg/skein_engines/slic3r_engines/linux/lib/vrt/80ccae99bc6b1afe192d6aa7724673cf/SSLeay.so"
+QA_TEXTRELS="
+	/opt/replicatorg/skein_engines/slic3r_engines/linux/lib/vrt/f319e78215d06c9bbdc612ed9aef7e56/SSLeay.so
+	/opt/replicatorg/skein_engines/slic3r_engines/linux/lib/vrt/80ccae99bc6b1afe192d6aa7724673cf/SSLeay.so
+	/opt/replicatorg/lib-i686/libj3dcore-ogl.so
+	/opt/replicatorg/lib-i686/libj3dcore-ogl-cg.so"
+
 pkg_setup() {
 	enewgroup replicator
 }
 
-pkg_postinst() {
-	elog "Replicatorg requires Sun/Oracle JRE and will not work with OpenJDK."
-	elog
-	elog "Ensure that your user account has permissions to access serial port,"
-	elog "if you plan to connect directly to a 3d printer rather than using"
-	elog "a flash card. Printing directly from replicatorg is preferred."
-	elog
-	elog "The replicator printer will likely show up in /dev as ttyACM0."
-	elog "You may want to autoload the cdc_acm kernel module."
-	elog
-	elog "Note that replicatorg includes its own version of skeinforge."
-	elog "There doesn't seem to be a simple way to depend on an external"
-	elog "version."
-	elog
-	elog "Replicatorg users should add themselves to the replicator group"
-	elog "to avoid upstream warnings about not being able to modify shared"
-	elog "skeinforge scripts."
-	elog
-	chmod -R g+w "${ROOT}"/opt/replicatorg
-	chown -R root:replicator "${ROOT}"/opt/replicatorg
-	chmod 0755 /opt/replicatorg
-}
-
 src_install() {
 	dodir \
 		/opt/replicatorg \
@@ -61,7 +46,8 @@ src_install() {
 
 	dobin "${FILESDIR}"/replicatorg
 
-	/bin/cp -R --preserve=mode \
+	insinto /opt/replicatorg/
+	doins -r \
 		docs \
 		examples \
 		lib \
@@ -71,8 +57,7 @@ src_install() {
 		scripts \
 		replicatorg \
 		skein_engines \
-		tools \
-		"${D}"/opt/replicatorg/
+		tools
 
 	insinto /usr/share/replicatorg
 	doins -r \
@@ -80,5 +65,28 @@ src_install() {
 		license.txt \
 		readme.txt \
 		todo.txt
+}
 
+pkg_postinst() {
+	elog "Replicatorg requires Sun/Oracle JRE and will not work with OpenJDK."
+	elog
+	elog "Ensure that your user account has permissions to access serial port,"
+	elog "if you plan to connect directly to a 3d printer rather than using"
+	elog "a flash card. Printing directly from replicatorg is preferred."
+	elog
+	elog "The replicator printer will likely show up in /dev as ttyACM0."
+	elog "You may want to autoload the cdc_acm kernel module."
+	elog
+	elog "Note that replicatorg includes its own version of skeinforge."
+	elog "There doesn't seem to be a simple way to depend on an external"
+	elog "version."
+	elog
+	elog "Replicatorg users should add themselves to the replicator group"
+	elog "to avoid upstream warnings about not being able to modify shared"
+	elog "skeinforge scripts."
+	elog
+
+	chmod -R g+w "${EROOT%/}"/opt/replicatorg
+	chown -R root:replicator "${EROOT%/}"/opt/replicatorg
+	chmod 0755 /opt/replicatorg
 }
diff --git a/media-gfx/replicatorg/replicatorg-40-r1.ebuild b/media-gfx/replicatorg/replicatorg-40-r1.ebuild
index 2653c8696e89..217806f00c47 100644
--- a/media-gfx/replicatorg/replicatorg-40-r1.ebuild
+++ b/media-gfx/replicatorg/replicatorg-40-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+EAPI=6
 
-inherit eutils versionator user
+inherit versionator user
 
 MY_P="${PN}-00${PV}"
 
@@ -11,45 +11,30 @@ DESCRIPTION="ReplicatorG is a simple, open source 3D printing program"
 HOMEPAGE="http://replicat.org/start https://github.com/makerbot/ReplicatorG"
 SRC_URI="https://replicatorg.googlecode.com/files/${MY_P}-linux.tgz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS=""
-
 IUSE=""
 
-COMMON_DEPEND="dev-java/oracle-jre-bin"
+COMMON_DEPEND="dev-java/oracle-jre-bin:*"
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+QA_WX_LOAD="
+	/opt/replicatorg/skein_engines/slic3r_engines/linux/lib/vrt/f319e78215d06c9bbdc612ed9aef7e56/SSLeay.so
+	/opt/replicatorg/skein_engines/slic3r_engines/linux/lib/vrt/80ccae99bc6b1afe192d6aa7724673cf/SSLeay.so"
+QA_TEXTRELS="
+	/opt/replicatorg/skein_engines/slic3r_engines/linux/lib/vrt/f319e78215d06c9bbdc612ed9aef7e56/SSLeay.so
+	/opt/replicatorg/skein_engines/slic3r_engines/linux/lib/vrt/80ccae99bc6b1afe192d6aa7724673cf/SSLeay.so
+	/opt/replicatorg/lib-i686/libj3dcore-ogl.so
+	/opt/replicatorg/lib-i686/libj3dcore-ogl-cg.so"
+
 pkg_setup() {
 	enewgroup replicator
 }
 
-pkg_postinst() {
-	elog "Replicatorg requires Sun/Oracle JRE and will not work with OpenJDK."
-	elog
-	elog "Ensure that your user account has permissions to access serial port,"
-	elog "if you plan to connect directly to a 3d printer rather than using"
-	elog "a flash card. Printing directly from replicatorg is preferred."
-	elog
-	elog "The replicator printer will likely show up in /dev as ttyACM0."
-	elog "You may want to autoload the cdc_acm kernel module."
-	elog
-	elog "Note that replicatorg includes its own version of skeinforge."
-	elog "There doesn't seem to be a simple way to depend on an external"
-	elog "version."
-	elog
-	elog "Replicatorg users should add themselves to the replicator group"
-	elog "to avoid upstream warnings about not being able to modify shared"
-	elog "skeinforge scripts."
-	elog
-	chmod -R g+w "${ROOT}"/opt/replicatorg
-	chown -R root:replicator "${ROOT}"/opt/replicatorg
-	chmod 0755 /opt/replicatorg
-}
-
 src_install() {
 	dodir \
 		/opt/replicatorg \
@@ -61,7 +46,8 @@ src_install() {
 
 	dobin "${FILESDIR}"/replicatorg
 
-	/bin/cp -R --preserve=mode \
+	insinto /opt/replicatorg/
+	doins -r \
 		docs \
 		examples \
 		lib \
@@ -71,8 +57,7 @@ src_install() {
 		scripts \
 		replicatorg \
 		skein_engines \
-		tools \
-		"${D}"/opt/replicatorg/
+		tools
 
 	insinto /usr/share/replicatorg
 	doins -r \
@@ -80,5 +65,28 @@ src_install() {
 		license.txt \
 		readme.txt \
 		todo.txt
+}
 
+pkg_postinst() {
+	elog "Replicatorg requires Sun/Oracle JRE and will not work with OpenJDK."
+	elog
+	elog "Ensure that your user account has permissions to access serial port,"
+	elog "if you plan to connect directly to a 3d printer rather than using"
+	elog "a flash card. Printing directly from replicatorg is preferred."
+	elog
+	elog "The replicator printer will likely show up in /dev as ttyACM0."
+	elog "You may want to autoload the cdc_acm kernel module."
+	elog
+	elog "Note that replicatorg includes its own version of skeinforge."
+	elog "There doesn't seem to be a simple way to depend on an external"
+	elog "version."
+	elog
+	elog "Replicatorg users should add themselves to the replicator group"
+	elog "to avoid upstream warnings about not being able to modify shared"
+	elog "skeinforge scripts."
+	elog
+
+	chmod -R g+w "${EROOT%/}"/opt/replicatorg
+	chown -R root:replicator "${EROOT%/}"/opt/replicatorg
+	chmod 0755 /opt/replicatorg
 }