gentoo resync : 04.01.2018

3 files changed, 82 insertions, 66 deletions

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
 }