gentoo resync : 16.11.2017

11 files changed, 120 insertions, 107 deletions

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index fa190fd61647..caada6a687a1 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -2,10 +2,8 @@ AUX krita-3.1.4-qt-5.9.patch 722 SHA256 9180d7841675832b2d55f5b18755d926699963fb
 AUX krita-3.2.0-tests-optional.patch 8806 SHA256 839bf01eccee18c6dec2cf2b0ab5d47884648edc7dab872ddd9c0162cb6f30ca SHA512 aeba8043f7a31a24fad6b515608a881b34bffd0f05502ddd7591f8bb7a7c82eae5ec21bcab4c17091255f94422817ca5e89d97836ab0ce9298f29350a1666b34 WHIRLPOOL bc84ebb1803065672285047e76dcea2357b461b83779c138db3ca3462c0ad626b9820ed2dab333087d23709590f82f14ffdb07eb35794e2807a5bcdd10c18b0e
 AUX krita-vc-fix-gcc49-abi.patch 539 SHA256 c2d38b00853df1fccd2b161b53f8b7b65cc81777ef33a6ee6a9e62d6bac76615 SHA512 41e750c336ce2869d5653fd47ce951977af74bd9d8cd0da6fb3d1bcb770759ca531dfe5bcf9f6d1cb4cdb914f7d374b97c9b3a59fa318f121fccf7527654dd2b WHIRLPOOL f47005d4446f5986517b54fc1979138119ffd99edeb7f7f4cf17967e979fe97fe30eb8dca2a71d3d35c02b791de58d63069f18edc35abea4e07775cc5275e45a
 DIST krita-3.1.4.tar.gz 209778186 SHA256 741837b0d12afa795dbbca45d5efc78966f3041dbfb22a268c101c7dc23e82aa SHA512 6695d8d09552de2d98cb4a8fac1aefc6b5e35df50d7b72c088f11a25af54574b303a7445b4a9cb099844cdf0729a185f03fd208ab2f98329123398fd54a374df WHIRLPOOL 9b8819432594d10377ef6db5adaca06193044203ae5b870a2f014171c817dd2ffc251bd20af0a05183251a798d06fc6aa7b33c1a640879af3ac3c01c0e9869e7
-DIST krita-3.3.1.tar.gz 207093337 SHA256 5fb86577753b28b8915ae993c80a417f388977d04159feb69f5afc0e592bfee9 SHA512 b4293e9166a810142f7a5769415f1693d91d1749aa9c4e4ac77686eb705a28522a83242955cbf0f1b64da8c7f1b79a2f3118e04105b3478a090b4fb49baafb7f WHIRLPOOL 571ff3449bb5ab4996bc0dc7712418bf7f1ec4cee905152913b3300155fb7e1447c7b0d5664321878886c4d4557f8ef1a47c7b5a6baa9d255f6181cb4dac80e3
 DIST krita-3.3.2.1.tar.xz 132385220 SHA256 e555e1ba0cf2aef0800a49a98c5517a3f30ba6f5c47572aa410486e8d8117444 SHA512 e10a0a0400cd88889fce8b87afa133450401d9b2482d9442fde3b69eb73e5b6ef6f2ca7109599e11aafaf3de2965319b8a6e10c952e039fa23ded31a1346cb6b WHIRLPOOL acaae575bce5024d89a1ef3a8b3c0fef06d9a33dc94f494ac9b5109df812a962240a3437d0ad7c9cda07aa159c9279bfce2655e17ea003f993081bc3f2bb5aa4
-EBUILD krita-3.1.4.ebuild 2551 SHA256 d56beb770f09e4ddd3907dad4aab1ed3dbb13a0dc36bddf2beca1b64315d6b9c SHA512 74661e02ea49dac6f78a996f839520ebd9e29787293b3585c78c4c5b4faa46f13d31a2dd26765c058f964b925e59fa5ebdf81b95cbc24c7093ae61e84afec022 WHIRLPOOL 629c8eb72b3ebca52674ad569e17558f5337cfbe3e49f551ad4393cc3231d34d1ecfddd187c96ddf47c7088760585b0067d98673e4d01a6bb07835309253e0e3
-EBUILD krita-3.3.1.ebuild 2532 SHA256 e9e620230349be4702b5c5e03410d6ac6911143a93276491538c3236526e459e SHA512 7606da963f518188d2e7b951ffb3095b4e2a69604cfc24ca7251854fab6f0823a6ca54d56eb2d8b4524cb2601ed49fae5ace5c1406ff0d4758d8953535ca09d8 WHIRLPOOL 662c66fcb9c366be39f346612fa879845b5821de9de25c37b9e1e5d1b88bfdc455c0a1ce6562d2821e292fd38891366e17d36c5da437900a0d2e3ce7a1fe0219
-EBUILD krita-3.3.2.1.ebuild 2535 SHA256 3e62e72f0cb829e61731f6ea745788f47ed587dd5b0b3982c990a936d9220c3a SHA512 f7d3ef9eb2e4dfd527b1ebf0f9b281050b6879dc35dfae9d46fd4ea62168f68fd23b70b0e073a1f4b589927cb2fd4dac7cfbe31c45cbe0c8a63e810da3411e7f WHIRLPOOL 88fad7cedced6c8b70d4586d0229e0e2f8905e0a2297fe2f16c0ddeda726f9391538d03969ae2eb4f71f565499c22e23514785e254d2849d388657a51c43b5bb
+EBUILD krita-3.1.4.ebuild 2570 SHA256 6a780583546df4ff2948e806c69c92f28152b463761a797ff67791a53b686d28 SHA512 3665dfbba6eb29710d96de572e9da30f594c2c9c3d415bbfe196dfeafd954fa039d156b336a4cbd0a83c4055311e5e7bf4e1a7fd4e6d0caae3ecc5a009e2e6ed WHIRLPOOL abcfe2f61b7138357ea2c57fb8190b0f731a034264ed68505eedc6eb752c18222e274208cb62387838e400a9f4c53126606abad3067d1b3c218a5bc93af5ed54
+EBUILD krita-3.3.2.1.ebuild 2554 SHA256 fb1d07f7ddae701bc816d1a82aa37331edee1eef24bba3c2a63e462538c2c223 SHA512 ff438723f70b490b27188b40903dc5c6b29ce9753033c8bb0709a5ab6b4e4d43c6cca03c3273fbc4ae4cede9ef2b499229e04d80a0b3e525a2c8a8aa983741da WHIRLPOOL 7b6c6d8cc28471400444b192cc3c652a57192b3a17ce4cf45a9cd3ea56f1d289f575a4b68427192aa284302f6ba5987b712778a7d0879af05ce64c679e84cf2b
 MISC ChangeLog 1347 SHA256 0842c6da6c74f58c2bf65ea5842f75857f7339daaa702947fef7625893487030 SHA512 51fbe12ec66ca91dcb60cb00d8c0563a7d033da26b9ada5188e94bcaac9852648191e700b62ec8a6f40af2773b1b566bc3de394bccf0d96b716dcc8f72a9460e WHIRLPOOL 8b7a12f8c82b8fcad1bb59e9438a722c5da203a386b97b8b8970b09cc3450fa53887f6354c027fbf0802887b678276dddb76db163e3548a6c702637d3105196b
 MISC metadata.xml 569 SHA256 734de7cdb3cd12de975cf7fa2a02370178fbe8ec8c9f6ea3b424f5bff1fed336 SHA512 44b2dc2f5d0e737a780e16f4d88cb3c2ff1dbab8b1878ae3561659c3a191040ef0f0f2ef0e7325b16ca6c149e29d417c10bec18bfcf06d8e847000e1e8279b27 WHIRLPOOL 67a8f8f9c346a040683a568a63cd3230bcf1a9fa613ceebd3d185179d750d8a050c8b1abb96758e5bd27e70c08683c6727d52c266e63fb22292e3619a4283a39
diff --git a/media-gfx/krita/krita-3.1.4.ebuild b/media-gfx/krita/krita-3.1.4.ebuild
index 371f0260e9b5..9802e84cf69e 100644
--- a/media-gfx/krita/krita-3.1.4.ebuild
+++ b/media-gfx/krita/krita-3.1.4.ebuild
@@ -72,6 +72,8 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/calligra-l10n:4[calligra_features_krita(+)]
 "
 
+RESTRICT+=" test"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-vc-fix-gcc49-abi.patch
 	"${FILESDIR}"/${P}-qt-5.9.patch
diff --git a/media-gfx/krita/krita-3.3.1.ebuild b/media-gfx/krita/krita-3.3.1.ebuild
deleted file mode 100644
index 7c6ab717abaa..000000000000
--- a/media-gfx/krita/krita-3.3.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE="color-management fftw +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui '-gles2')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	dev-libs/boost:=
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXi
-	color-management? ( media-libs/opencolorio )
-	fftw? ( sci-libs/fftw:3.0= )
-	gsl? ( sci-libs/gsl:= )
-	jpeg? ( virtual/jpeg:0 )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr
-	)
-	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( $(add_qt_dep qtmultimedia) )
-	raw? ( media-libs/libraw:= )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/calligra:4[calligra_features_krita]
-	!app-office/calligra-l10n:4[calligra_features_krita(+)]
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package color-management OCIO)
-		$(cmake-utils_use_find_package fftw FFTW3)
-		$(cmake-utils_use_find_package gsl GSL)
-		$(cmake-utils_use_find_package jpeg JPEG)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
-		$(cmake-utils_use_find_package raw LibRaw)
-		$(cmake-utils_use_find_package tiff TIFF)
-		$(cmake-utils_use_find_package vc Vc)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-gfx/krita/krita-3.3.2.1.ebuild b/media-gfx/krita/krita-3.3.2.1.ebuild
index 5bac8aa8541e..4fc11b09d793 100644
--- a/media-gfx/krita/krita-3.3.2.1.ebuild
+++ b/media-gfx/krita/krita-3.3.2.1.ebuild
@@ -72,6 +72,8 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/calligra-l10n:4[calligra_features_krita(+)]
 "
 
+RESTRICT+=" test"
+
 PATCHES=( "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch )
 
 src_configure() {
diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index eded45fb3c1f..2554209dfcf3 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1,5 +1,6 @@
+AUX kxstitch-2.0.0-imagemagick-7.patch 3642 SHA256 4e190d213432016cedc07e8f2883353725f8f637326c43b2c8377f46d4cc0bb8 SHA512 f47a5872e2d5da00db3f3f0dd37ce567f7001073b9f273973d4b2ce615e18d8f306dcc4dd38185d65b1b065a569f376bfb3e49e977cc9d72da253268405ec2b8 WHIRLPOOL a4a8774eb1e715f14a340ef9baa69066fa7fe25ed0131afe0ee462c7eaa3627ff1ed8c54811fff6b2de3a0dd2f10ea3e7abb6c2551113364caf48a7eb5d4f01e
 DIST kxstitch-2.0.0.tar.xz 1681648 SHA256 430db19729c907c845d35e2ab3887ace2bc21913ab08ea7471c71c9b84fcc783 SHA512 0ce9ec517659fd9a3163671cdb32d451487aa812355c9abb38cf143192ed49e3e32afc003a0064e9a63303b5de40d8859f92066d886dc06c6d1fe03c8790122f WHIRLPOOL 1c4965e7b536e2d6a2f98855372798c305840238e068465d95c2e2fccb7db419f049ad19d45461ccad544be8c55fcbd47c6cb02fc3c9dd333cbfca8a446e1e53
-EBUILD kxstitch-2.0.0.ebuild 914 SHA256 a3b8eade8dae65c523da3b013db5bdf1d3a5163d4361da61093c879bfa0516c6 SHA512 77511facc7ef6482b6bd6cff08ae82769849715475c1f5c57b62ea8dface2d416f7ac8b7dabb06d77504899771f4a71b37d49cb40edea787de9f799239512dd3 WHIRLPOOL 5225173272599b9e532c2a3dddb7042bd4e4f5752b913d8100ed64f3d69a6e2a2b2a866eff762ce8fb2e97cb7cf2e1af76f451f8d9f340a2354365cea906d691
+EBUILD kxstitch-2.0.0.ebuild 966 SHA256 1c58e2207320009fb8551c247fbed2a78bb0f73625f381a70e0819d16a59e583 SHA512 cc2c291f040c49c5a15e4cc8c5b057121539940a68f6649fad0d6bc895c3dcef774a16fefa2d806985ea6b723ea39c72471d975e9b09ec02aa58885e4f2fe24e WHIRLPOOL ae377ca789bf671e1cc63faa5b55bf21a24314eb8022e58d6ca7366583933e01db19ced49ed75a280a00edecff5ea5029a7950ffc8572dc96236672751e2be6b
 MISC ChangeLog 3189 SHA256 a4360414bdd97125df9a3657117452254935bce9764e36960b8c8279cce83a6b SHA512 fabb40574a345fedb1342c40e75aa6b1af869832f77358d991992d4e87c147a4736d42b118b965ab28c6eb4102b621ae22cee59e27f101e45a4842be13de6f7f WHIRLPOOL e1ba350a97208a125e5303b0d64ca1a0c14b6fad169d399d1b449d46fab2e5190ee132e5ae2c257848a15c760e2930643dc9f248831ca889d8c36e51d1d4d97a
 MISC ChangeLog-2015 371 SHA256 3d3d83251d5f15f7a60f395a148a54b5827fbd45f0bbf3720daa80ad678ec4ae SHA512 2b1ef332ddc40983242e7d9bb3394587de9f855ac0fb8eaf54ca17ae0928a1f8d2ad066ca8fb29898ad493591f54de9c33ec3921cb47593dcff961bb671ae6ae WHIRLPOOL 4c8701fe96150617e149e63748518671fa5cbd24fe0ef61b830256ef0f3068032736db081ca2848088c908432ec21cc4ce384a91d3971e3daa66cea88863b456
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/media-gfx/kxstitch/files/kxstitch-2.0.0-imagemagick-7.patch b/media-gfx/kxstitch/files/kxstitch-2.0.0-imagemagick-7.patch
new file mode 100644
index 000000000000..fe53efba3027
--- /dev/null
+++ b/media-gfx/kxstitch/files/kxstitch-2.0.0-imagemagick-7.patch
@@ -0,0 +1,93 @@
+From 295773f44bfda1227d85edf065a8de14dc889159 Mon Sep 17 00:00:00 2001
+From: Steve Allewell <steve.allewell@gmail.com>
+Date: Wed, 25 Oct 2017 20:57:22 +0100
+Subject: Fix for changes to ImageMagick API for importing images
+
+---
+ src/FlossScheme.cpp    |  4 ++--
+ src/ImportImageDlg.cpp |  9 ++++++---
+ src/MainWindow.cpp     | 10 ++++++----
+ 3 files changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/src/FlossScheme.cpp b/src/FlossScheme.cpp
+index 4c59973..e4cd117 100644
+--- a/src/FlossScheme.cpp
++++ b/src/FlossScheme.cpp
+@@ -38,8 +38,8 @@ Floss *FlossScheme::convert(const QColor &color)
+     Magick::Image image = Magick::Image(1, 1, "RGB", MagickLib::CharPixel, c);
+ #endif
+     image.map(*m_map);
+-    const Magick::PixelPacket *pixels = image.getConstPixels(0, 0, 1, 1);
+-    const Magick::ColorRGB rgb = Magick::Color(*pixels);
++
++    const Magick::ColorRGB rgb = image.pixelColor(0,0);
+ 
+     return find(QColor((int)(255*rgb.red()), (int)(255*rgb.green()), (int)(255*rgb.blue())));
+ }
+diff --git a/src/ImportImageDlg.cpp b/src/ImportImageDlg.cpp
+index d12ca34..79e8c38 100644
+--- a/src/ImportImageDlg.cpp
++++ b/src/ImportImageDlg.cpp
+@@ -305,9 +305,12 @@ void ImportImageDlg::renderPixmap()
+     QProgressDialog progress(i18n("Rendering preview"), i18n("Cancel"), 0, pixelCount, this);
+     progress.setWindowModality(Qt::WindowModal);
+ 
++#if MagickLibVersion < 0x700
+     bool hasTransparency = m_convertedImage.matte();
+-    const Magick::PixelPacket *pixels = m_convertedImage.getConstPixels(0, 0, width, height);
+-
++#else
++    bool hasTransparency = m_convertedImage.alpha();
++#endif
++    
+     for (int dy = 0 ; dy < height ; dy++) {
+         QApplication::processEvents();
+         progress.setValue(dy * width);
+@@ -317,7 +320,7 @@ void ImportImageDlg::renderPixmap()
+         }
+ 
+         for (int dx = 0 ; dx < width ; dx++) {
+-            Magick::ColorRGB rgb = Magick::Color(*pixels++);
++            Magick::ColorRGB rgb = m_convertedImage.pixelColor(dx, dy);
+ 
+             if (hasTransparency && (rgb.alpha() == 1)) {
+                 //ignore this pixel as it is transparent
+diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
+index 9713293..1d22e63 100644
+--- a/src/MainWindow.cpp
++++ b/src/MainWindow.cpp
+@@ -543,7 +543,11 @@ void MainWindow::convertImage(const QString &source)
+ 
+         bool useFractionals = importImageDlg->useFractionals();
+ 
++#if MagickLibVersion < 0x700
+         bool hasTransparency = convertedImage.matte();
++#else
++        bool hasTransparency = convertedImage.alpha();
++#endif
+         bool ignoreColor = importImageDlg->ignoreColor();
+         Magick::Color ignoreColorValue = importImageDlg->ignoreColorValue();
+ 
+@@ -564,8 +568,6 @@ void MainWindow::convertImage(const QString &source)
+         QProgressDialog progress(i18n("Converting to stitches"), i18n("Cancel"), 0, pixelCount, this);
+         progress.setWindowModality(Qt::WindowModal);
+ 
+-        const Magick::PixelPacket *pixels = convertedImage.getConstPixels(0, 0, imageWidth, imageHeight);
+-
+         for (int dy = 0 ; dy < imageHeight ; dy++) {
+             progress.setValue(dy * imageWidth);
+             QApplication::processEvents();
+@@ -577,8 +579,8 @@ void MainWindow::convertImage(const QString &source)
+             }
+ 
+             for (int dx = 0 ; dx < imageWidth ; dx++) {
+-                Magick::ColorRGB rgb = Magick::Color(*pixels++);
+-
++                Magick::ColorRGB rgb = convertedImage.pixelColor(dx, dy);
++                
+                 if (hasTransparency && (rgb.alpha() == 1)) {
+                     // ignore this pixel as it is transparent
+                 } else {
+-- 
+cgit v0.11.2
+
diff --git a/media-gfx/kxstitch/kxstitch-2.0.0.ebuild b/media-gfx/kxstitch/kxstitch-2.0.0.ebuild
index 32222fe706e3..02fe8204fac4 100644
--- a/media-gfx/kxstitch/kxstitch-2.0.0.ebuild
+++ b/media-gfx/kxstitch/kxstitch-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,3 +37,5 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 "
+
+PATCHES=( "${FILESDIR}/${P}-imagemagick-7.patch" )
diff --git a/media-gfx/replicatorg/Manifest b/media-gfx/replicatorg/Manifest
index 5da372e931aa..145c13d7788c 100644
--- a/media-gfx/replicatorg/Manifest
+++ b/media-gfx/replicatorg/Manifest
@@ -1,8 +1,8 @@
 AUX replicatorg 52 SHA256 21422427de3f6da60d984e987d839fbaff0ff51569b6ea9cf78a21a06947b175 SHA512 93e5c726d4252d1ebe9d8283d1bb9c0857c8a8385f35762a9ca972fb79fd9723b60faa39e2553cdf1da790405bbc74863e72da26c27081ed96d5d9ca4715c095 WHIRLPOOL 48f42b60998bc0bb5927e74e24d14b296cf2785163e966ede60c8f14fdc9790cffd930820d91cebd2c2543e171f522f4fa5d191e5ad02db529f2e39730425482
 DIST replicatorg-0037-linux.tgz 52627038 SHA256 304d942cc47933953bd4a74e7c88d6137e5ad0a5c4d0a6d0c51fa703d279f4cd SHA512 9fabfe64a6ff6c059abe66404349739cd74bcc244a4f37d020d506fd82d318f5103daeb289f615fe47203c43ea8842487acbe21b6cdbb9cdb4d9b20bfbfd845c WHIRLPOOL 62fa5629366bb9d5b32537834e2fdabf5ab3514282e7c24aeec4c04f8513fb4367514117089b7d7075c12d79f32ec059d1ef59c0f62803e0dbf34d0dccd3cb20
 DIST replicatorg-0040-linux.tgz 45962287 SHA256 9f614c2f0ae4494c73af84fd07937115d3c739bea638acf226419b80d31d2aad SHA512 c2be8679ebcb722a01f46bbd5a3dd771ebda0eb5e5546627f9064b412be0e5ae0b63f9d44dc7f03d9b3fb862c45dbe09edfb15018a075f39ca57d725ca804205 WHIRLPOOL 2088a517b11938f430a100d6f4e41cd14c6cc7db6954c8ce3475e019cdd2e9cb8833632b841affb88445d5b5ad1f99d8d9d85cb03651020e261aa53b05737059
-EBUILD replicatorg-37-r2.ebuild 1955 SHA256 81a6c55f8f160978ca90aeaa8bf49c7125ed193220737a2c98b954086ced88d4 SHA512 11e90b1b7311a2bb1dafee4d136a2ef6556059bac2e464dfd0fdeec8e9a039951dbd5d5073463440540c402fe04591b4fe91e9b1bccc4964e59cf8e6bbaf2d10 WHIRLPOOL 711d6a4e7e00410118051bc60e973fd7edf0d8a8d3570717aceb41b8a3f279e5c59ac6bba91815a4cafced433cb318ac080c24216cd8b7aee4b91c13bbaee7e4
-EBUILD replicatorg-40-r1.ebuild 1944 SHA256 457a5882fdc5ef88750337672f2865c8eeea8fcae0e537b9365449d6288f7a02 SHA512 55df428e236e89c68e5733e2ae4b80e80e926bd1eb91a70e96c14c19075eeaf091f1368933c95c45050bed6f1db0994c063d5da0ae341f975a9141de8d09c827 WHIRLPOOL 2e9d34a6db1ec19145c4c91c9ad59f65d5447170fa2177402f3ab896767502f39e7c4e7ee3365c768df888e64392756c386d5a047516e9d6591b10b9e14f7cba
+EBUILD replicatorg-37-r2.ebuild 1995 SHA256 19df7a78b84003d4526354eeeb5e0d8388e0f640f67fc94b6d9c2d8093c2f81d SHA512 e68d2355e6608a9aeef6bb92b972d609ddff5b5b8edc6bc2f505595a9b9233575af1c91b2bb9c044136e70347a2c4992c980cf6ea6c9eb481e1413791aefde3f WHIRLPOOL d6ade27011dd20454a917c7183e20241041a10aaa2660d433051fdb7269994229ff6ba54c3c0c3f23fadfb3aaf282931725ebcc6144c45f77fcf58124c7d8971
+EBUILD replicatorg-40-r1.ebuild 1984 SHA256 a14faf500d68a488c7d0ad07df195cd6804027d80b6216a7eee00cf4963ded57 SHA512 199bbb57d3b687ab95f5a5e9a3d979f270ea088b9b74144d7fdb65876d662140dab0c4de7d58f94bd22b3c1d601ef7b6b2dd19218e3ee4dd3d9bbc380036ce2e WHIRLPOOL c8e79786c925cd9d8c7299a6888cf52b3270eb6e6ad07ebe442a55233e35362f4d9a8a3ffe377d57f24ba624a02868f8fd047e18391ac0f6a78a80100e5cf036
 MISC ChangeLog 2930 SHA256 4dd3122ade46c27b3e2fb64a14abfd0fcfb42f6f8aacb5c5a06383c65af7a4b3 SHA512 74b52c2d604228f9d6a3c96a66ac7aa751b6a4abc588d11d0bc9f3ab224a92a744fa7b716b445aa1d65435eac21c87dfa37e32f940567ca812e9dd94b7ec70c4 WHIRLPOOL 5477cd0cc2b862027acaa0a028403ca0ca632f839bba17490b1e29536dd6751498a7f392034dafbfbc43f47674a10cbc709476f32eed8a274208ecf428c04761
 MISC ChangeLog-2015 1647 SHA256 2b3fca08be9eabc35240b81674d9ebedf9f21733cf456d26c5bf4cf2fda85ce3 SHA512 60dd5c3608f7a0ec609aa49f8fe1febfc239adc87c430f3d01b67ccde95b7402ef998ee061ac45df50c04a214157614f086cb8b23b3d59cd4edcf0791a3d0347 WHIRLPOOL ac201094d74ebddc3014251e640229c0a7158e0682b79e224df95df20c311e3844d35e2df190bba69df732afbe868d7a8d7dab443588b7ed1dd7afb6bc53afb8
-MISC metadata.xml 602 SHA256 aa9d118ccdadd175248b36ffa8c2c3491d283231277bd8883e7ade9e43beb232 SHA512 cf713f392d8c00180c20bca0a5d4396ec6c3c2b1f9cf468e51c0f4116a097c1a2c50a63a39187a84aeed05f9645bc1eb19ae6be4f8237bf010c3377c04300cf8 WHIRLPOOL 3c78f855f391146b35fceae462f06c9db95445a5c527c2c73cc2d07fe02cd395fdf0a2911acc04127820fdd6a049368e21be6b748e0cf9850e0a91132194c180
+MISC metadata.xml 651 SHA256 eb3d09e041c62fcd2c4fe449f81256a90edfd59fcdd7275b4ed00a788b87ebdf SHA512 7174fd352ffee5c45009306a23db9dbe613c8045483df7ddefd6cb465161904d6055951c9d3b2a89cfff33726ac4601dd72f25a0b5331ec14b1e88602f181c7c WHIRLPOOL 4742dfef65a707289aa01e89b2336fd65e436bd05820a613155e18c487262368be4a4534f1e0ebc05748e20648a4ae14061438891ab2c2ea7146086e023437d4
diff --git a/media-gfx/replicatorg/metadata.xml b/media-gfx/replicatorg/metadata.xml
index fba3a21a731d..d193ce4f0dbf 100644
--- a/media-gfx/replicatorg/metadata.xml
+++ b/media-gfx/replicatorg/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<!-- maintainer-needed -->	
 	<longdescription>
-This is the software that will drive your MakerBot Replicator, Thing-O-Matic, CupCake CNC, RepRap machine, or generic CNC machine. You can give it a GCode or STL file to process, and it takes it from there. It's cross platform, easily installed, and is based on the familiar Arduino / Processing environments. ReplicatorG is used by thousands of MakerBot Operators, and has printed tens of thousands of objects and counting.
-</longdescription>
+		This is the software that will drive your MakerBot Replicator, 
+		Thing-O-Matic, CupCake CNC, RepRap machine, or generic CNC machine. 
+		You can give it a GCode or STL file to process, and it takes it from 
+		there. It's cross platform, easily installed, and is based on the 
+		familiar Arduino / Processing environments. ReplicatorG is used by 
+		thousands of MakerBot Operators, and has printed tens of thousands 
+		of objects and counting.
+	</longdescription>
 </pkgmetadata>
diff --git a/media-gfx/replicatorg/replicatorg-37-r2.ebuild b/media-gfx/replicatorg/replicatorg-37-r2.ebuild
index 839824ac1a47..fbb7b8981eab 100644
--- a/media-gfx/replicatorg/replicatorg-37-r2.ebuild
+++ b/media-gfx/replicatorg/replicatorg-37-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="3"
@@ -8,7 +8,7 @@ inherit eutils versionator user
 MY_P="${PN}-00${PV}"
 
 DESCRIPTION="ReplicatorG is a simple, open source 3D printing program"
-HOMEPAGE="http://replicat.org/start"
+HOMEPAGE="http://replicat.org/start https://github.com/makerbot/ReplicatorG"
 SRC_URI="https://replicatorg.googlecode.com/files/${MY_P}-linux.tgz"
 
 SLOT="0"
diff --git a/media-gfx/replicatorg/replicatorg-40-r1.ebuild b/media-gfx/replicatorg/replicatorg-40-r1.ebuild
index 042c8795ed5e..2653c8696e89 100644
--- a/media-gfx/replicatorg/replicatorg-40-r1.ebuild
+++ b/media-gfx/replicatorg/replicatorg-40-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="3"
@@ -8,7 +8,7 @@ inherit eutils versionator user
 MY_P="${PN}-00${PV}"
 
 DESCRIPTION="ReplicatorG is a simple, open source 3D printing program"
-HOMEPAGE="http://replicat.org/start"
+HOMEPAGE="http://replicat.org/start https://github.com/makerbot/ReplicatorG"
 SRC_URI="https://replicatorg.googlecode.com/files/${MY_P}-linux.tgz"
 
 SLOT="0"