6 files changed, 102 insertions, 1 deletions
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 953d613e3e2a..f0c8f99e2b0c 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/lightspeed/Manifest b/sci-physics/lightspeed/Manifest
index b2948476845e..5e6f20c2c44a 100644
--- a/sci-physics/lightspeed/Manifest
+++ b/sci-physics/lightspeed/Manifest
@@ -5,4 +5,5 @@ DIST lightspeed_1.2a-7.diff.gz 379281 BLAKE2B 1cfae528d58b556cede1a2e8c3087f059c
 DIST objects-1.tar.gz 767805 BLAKE2B cde889eae12913bd6c0f9f2c3206c49a2a946e8acef1080c19339dbad6bdd41a52abf108b052b0723cc43926395572eb9bc8ddc6548af06c6de9b5978a8d97b2 SHA512 cb8c2d5c323b92b87dfe2bfa8f7f37c46b381c4611d5ca2f645a16943339b90850615647f6edc21ae28a28792b0f071e8cac9779dbfdbf6bf928498cdd451231
 EBUILD lightspeed-1.2a-r1.ebuild 1588 BLAKE2B 4840628cf40f3fb34a2086d00c9483b0d00c6b445522fb3f6494ea2504daccdea9bef77c50a0040e26b867134a6b5a758bd636ce4ee9a871a52a657a922c1221 SHA512 b9dd82e8c3b035c82bc0f5e835118d36de008a61985b27e4de010c0bab089f0f5c397290380f6d005057a897833081a52c27f9f2507f5f8053d8458bf4b3fc65
 EBUILD lightspeed-1.2a-r2.ebuild 1524 BLAKE2B 03ad31c3c0c436944882a4dc08a87b9e7a6ce924b61289cf6374811fb503821794aa08094611d0e668271097feb08fbfda9f8d5d58fb930f8f9fe5e9ef0e15a3 SHA512 7e69381fa323b8e0689b749f0f77e720d3034d6de81b91178e543d83cd0e92dd1bdbf13b7272546a4a557fb6673f7ab4e01c8d19f82da58b86dc15fe78e6f909
+EBUILD lightspeed-1.2a-r3.ebuild 1524 BLAKE2B c1722a042ffae225ce22a88fcac9dc201d53bbfe418ef6e4913b80fedf38d50c9cec880b3a1b19c5fb742bb13ab81358e8be6e475accfb032427cee1645d5ab6 SHA512 563f45474a48542a85caaf3e3d0dbc973407907030dc5d16ab07a7ae17959bf740d7f7ecb05358e255fd7b27ddede14823cf4433adbfb2247422f4113b288a4e
 MISC metadata.xml 763 BLAKE2B 896c0cda6875b7735977f4261e69e606bcfff6c384e7edddc28b01bb76e923c72dece79540ae5e60867f8954b0cf8c9ad3da4dee1200280c355add8650992422 SHA512 d33c67d677850f7eaf12b4086c66a49940259b5553470a9f3c9ca56279f06a99eec12384e75815e32e7953ac3275ce01e03582d35a9fa3de21e5b3380d02d08f
diff --git a/sci-physics/lightspeed/lightspeed-1.2a-r3.ebuild b/sci-physics/lightspeed/lightspeed-1.2a-r3.ebuild
new file mode 100644
index 000000000000..4f96026b6f0a
--- /dev/null
+++ b/sci-physics/lightspeed/lightspeed-1.2a-r3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools desktop readme.gentoo-r1
+
+DEB_PATCH="${PN}_${PV}-7"
+DESCRIPTION="OpenGL interactive relativistic simulator"
+HOMEPAGE="http://lightspeed.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://sourceforge/${PN}/objects-1.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_PATCH}.diff.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+
+IUSE="nls truetype"
+
+RDEPEND="
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	virtual/opengl
+	x11-libs/gtkglext
+	x11-libs/gtkglarea:2
+	x11-libs/gtk+:2
+	x11-libs/libXmu
+	truetype? ( media-libs/ftgl )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${WORKDIR}/${DEB_PATCH}.diff"
+	"${FILESDIR}"/${P}-autoconf.patch
+	"${FILESDIR}"/${P}-libpng15.patch
+)
+
+DOC_CONTENTS="
+	Some 3d models have been placed in /usr/share/${PN}
+	You can load them in Light Speed! from the File menu.
+"
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-gtk=2 \
+		$(use_enable nls) \
+		$(use_with truetype ftgl)
+}
+
+src_install() {
+	default
+
+	newicon src/icon.xpm lightspeed.xpm
+	make_desktop_entry ${PN} "Light Speed! Relativistic Simulator"
+
+	readme.gentoo_create_doc
+	newdoc debian/changelog ChangeLog.Debian
+	cd "${WORKDIR}/objects" || die
+	newdoc README objects-README
+
+	insinto /usr/share/${PN}
+	doins *.3ds *.lwo
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index d857e1421b47..f87b70a50d81 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -11,10 +11,11 @@ AUX root-6.11.02-hsimple.patch 1838 BLAKE2B e5d4a2a04580c1ebe4e1da4cf615939347bc
 AUX root-6.12.04-no-ocaml.patch 1631 BLAKE2B 808da46144572073e6fac54859a60a9f056e164a4f31718f2962197f162ced11a6f1e9839af50d1d9c720dc0e2811f9eabef4901dfbe0c14d055315abf9dcdad SHA512 37d78c57b05a20088794cf887d60514c932b6b11b2a918b4b2621700be281df80adf3f17d76da17a146e4e941bf472a0a1ddcbbf14406e5d49bd3b8e4dbf3c50
 AUX root-6.12.04-no-opengl.patch 763 BLAKE2B 7f93aac3941dd5906768cd07c87a421137de2d21531d24b6e9e9d6c1182bbc2c8aea20a2c8a79415633cc41018ac8e979689277e4b96923df3e0518d5abae95e SHA512 cd4dbeb8e0a253ce664b489238a84535ab4c0e96d52b995965354ba4cd0f19b2a2783dad72ab3a3d0935744acf64f1f82c804f3bebe2203cd891dda8c6b40b8f
 AUX root-6.12.04-z3.patch 1155 BLAKE2B 31d099bb260a030d88fcfbe0c9c5a7953738619b216da4140e087b29fead0bfd05bd22aa75da99521689decfb54caa23e0b50a9be9c34fe2fd75596b99b13092 SHA512 ca82ed6f3a0eb9e0ae13a0c354eab0a7c9c18e93ef444418f5786decdd8600184a6c2d5deb6d54d1a852076988645a0fbd215459cd15f5569f54606d74ee3e18
+AUX root-6.12.06_cling-runtime-sysroot.patch 989 BLAKE2B 8202cc8f2bf72cc25642d0a03ba26c3969069b291a6a22188879dbedbf0c3c496149f79f671d0eb51d81d0ee36565660d136b4741f5d018c2b05325ff08381f0 SHA512 c96dee9843da1051c54bd6870ef0a04714944ffe1f86800c9a51b8eb8ef84107d3315d3a708dcc0b651248af4bec362c7f31695514505045aeda9c793d40dc58
 AUX rootd.confd 199 BLAKE2B d7638f5ee8ccb4fcb428d07c59d776a9ab8773fa8a8911281e8f76b32fab5902e3f6f6086ad210af39480df514c947719cc5e76d29c7dbf2a8715ae58ef49880 SHA512 2ce6753d37a7f22cc3656f110f802b8e07c1469bfe4524606c1472369352f8c584c01c716760252fab40369470b72d8c77cdbb2d52126c39371faaf597bf58d8
 AUX rootd.initd 622 BLAKE2B 7edeaf3cf550303642a89eb69edb65e6625215ac2daae5766904bcc14f1b30f6277c6eac6b895f46fbda01656df80cb71fdad6294a19bf581badceaa29278fdf SHA512 fde858a37b52540285d228e52845c963b18065a250aef0753f469753d541f577ac401f01438297c030e47176350bb23c3c0280c9b4ccbc1feda3313ab7c9be2e
 DIST root_v5.34.36.source.tar.gz 75427331 BLAKE2B 203af03e1459c7fe079fcb1b30da145b3262f90c074abb7ff8fb3b1b2b90ac24391ce51aa8afbd10e0db8d69549207f15176207bc30a13720e0ae94342a38dfa SHA512 2cc0c8f8b63b2a3ce01c49c41704483548a7324d92c21a63e3e36a00f4d6f5656a7844fdf48cb71a6f2a2c974112527300ffd3bb5502d8365ffaf138e6ae4c7a
 DIST root_v6.12.06.source.tar.gz 162284452 BLAKE2B 944b5e899677bab40842d7ec969ff08cfa470e63be9a02b948a49ae088e8da72ce433a5071d9196bfd98f71e6861b1bda285354012620eee6c61cffcee71a0c8 SHA512 3d44749ccfc3d40a2f516ae53ef40fb244ed785eee0dbc18ff822bbb811a15b943039d30282ef5358a283d485e62531880c877ec77a86089503b06d6f37e42e1
 EBUILD root-5.34.36.ebuild 12173 BLAKE2B 4829235ce5fae8b912afde7d28b619e98c9335cea9f614716f9222916734ef71b87df3d791f18337ddd477a854053ef690e4f4edfd43aeab7ba519686c2baa68 SHA512 52fee9354448cb8b471e28ff4ee2a552a975f36d9b6efc3af1b0e3e83a554dc406c502348ea49bbbbec82cf86cbeb9ed7d6df01645a31e4f5211c665abb27dfd
-EBUILD root-6.12.06-r1.ebuild 9124 BLAKE2B 25879f2196d554cdc721f296548b1e2e663dfc20108e5cc1985e085d45294aa1894925278a25cb9e5de984a23f11e87c0fdf662d61b3e2d39412bbd763d7201a SHA512 d0bb953562f88f4556b00a5339ae483ec75a3c7f814657299ecca9d88f144ad3e72986d73c52006559f2f08e4054f23e046e27097816065d01ef1475a3e04cf8
+EBUILD root-6.12.06-r1.ebuild 9188 BLAKE2B 3a23869ac2344c4949eb1cdaec9fd4763ad84641defbe928b2c940f2a3db4bf7f00d16f60abf2284b647f169fdb234ee9155215346f878fcc12a2bf073f1e8ad SHA512 ed545ac2493b7ebddaf71d438d71b2b6f58cb562ec3017311d185084a7e0838aa8c253a320392cab1a3ca7b46655f95a786c55fd3b3ab18c06dfcc7edc02f543
 MISC metadata.xml 3238 BLAKE2B 0396ebafbf0bd14c88f7ba401f12f698ccca313c0c04cab46f9fa198681b0f305f21413bab8a86c97bb65e0bbe00eb6b6f488600402784109dc13ed196d6589b SHA512 2ba887003b3dc6dc3d4de379ec9dde8a7ba8144c2bbd7be50ebcfc7b3bfb3154733edd39007fcd8c380034d028a0d3f352e4cb973d8facd9412f38f820c16b1e
diff --git a/sci-physics/root/files/root-6.12.06_cling-runtime-sysroot.patch b/sci-physics/root/files/root-6.12.06_cling-runtime-sysroot.patch
new file mode 100644
index 000000000000..1f8e056e946e
--- /dev/null
+++ b/sci-physics/root/files/root-6.12.06_cling-runtime-sysroot.patch
@@ -0,0 +1,22 @@
+On Prefix, we have specified SYSROOT for llvm at build time.  But we
+  do not need sysroot at runtime as we are not crosscompiling.
+
+This patch disable the sysroot feature for cling, so that ACLiC can
+work on Prefix.
+
+Index: root-6.12.06/interpreter/cling/lib/Utils/Paths.cpp
+===================================================================
+--- root-6.12.06.orig/interpreter/cling/lib/Utils/Paths.cpp
++++ root-6.12.06/interpreter/cling/lib/Utils/Paths.cpp
+@@ -57,11 +57,6 @@ using namespace clang;
+ void CopyIncludePaths(const clang::HeaderSearchOptions& Opts,
+                       llvm::SmallVectorImpl<std::string>& incpaths,
+                       bool withSystem, bool withFlags) {
+-  if (withFlags && Opts.Sysroot != "/") {
+-    incpaths.push_back("-isysroot");
+-    incpaths.push_back(Opts.Sysroot);
+-  }
+-
+   /// User specified include entries.
+   for (unsigned i = 0, e = Opts.UserEntries.size(); i != e; ++i) {
+     const HeaderSearchOptions::Entry &E = Opts.UserEntries[i];
diff --git a/sci-physics/root/root-6.12.06-r1.ebuild b/sci-physics/root/root-6.12.06-r1.ebuild
index ab9b95a0ad45..f3b7aeca416d 100644
--- a/sci-physics/root/root-6.12.06-r1.ebuild
+++ b/sci-physics/root/root-6.12.06-r1.ebuild
@@ -134,6 +134,7 @@ src_prepare() {
 	cmake-utils_src_prepare
 
 	hprefixify build/CMakeLists.txt core/clingutils/CMakeLists.txt
+	eapply "${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch
 
 	# CSS should use local images
 	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"