gentoo resync : 05.04.2018

5 files changed, 92 insertions, 9 deletions

diff --git a/media-gfx/dawn/Manifest b/media-gfx/dawn/Manifest
index a4c3faf1c8cb..f777eae514cb 100644
--- a/media-gfx/dawn/Manifest
+++ b/media-gfx/dawn/Manifest
@@ -1,4 +1,6 @@
-AUX dawn-3.90b-no-interactive.patch 5686 BLAKE2B 49631a9c141f218e1edd245305c6688893b507047876b98849746253c21041475a5267617373751f814ad95b9b762cd13294277dbb514c573ac1e3733886baea SHA512 9a2a86fca7d680569b2cba59354b56e89fc2cff6bd6cc8679744f5283a68d9f6e0ac74892529de632efbfa9834cc7743847520fcafd5e82ded1dc73e05a326d4
+AUX dawn-3.90b-gcc7.patch 513 BLAKE2B cf0e95894bbe85db5bfc45c1ef731dafd593c4531711bce931013b921a82b5306ca31e68dfd4f5a5b9fcf70b1bfc51f4b4c1a015725acaea6d7ac6703fb2cd8d SHA512 784659c383e1c240f5ea9def2bc39429fe726960356ca57ad07fc4e0415053f6bf9125a09ce54a1a1591b2ad9887dbc01619fa7f566d249d86767ed798f2345a
+AUX dawn-3.90b-no-interactive.patch 5467 BLAKE2B 2d7bfe6cc17143dcd2c33492eb45a77ecc44bcad9685f147c4a69ad0ec6aecced69c9e9de6d27b66c2a6db57971019ce2fa7014e1e9d0a1a5e338bc79027254e SHA512 fa9be36122f1c97226c7096657c7b3fd43f23c30c2e7d3ecb0673aa09fc1327f86afe92abf26a078165ee959ee5edcfe77b628c614f92e56cc8ca91e6b612265
 DIST dawn_3_90b.tgz 1334732 BLAKE2B 97f4e747b8f9d2eb60d9c8f0e7358fe549052e36a02127f02363c328775f33ae9fd36afd850ef06b365aaaa9723a541d89d7f2fccb37d1dd30f626054d7939b3 SHA512 5ff0b3572442ad1f435d5f894a0f1637efbc8eb3dae4f67dd456ff220a497cc59fe3bdf773cd38a0690d3689e9cda48f49c408ddab56f31efb9c87447d439fea
-EBUILD dawn-3.90b.ebuild 1194 BLAKE2B 67ab0c0336f7b837c19e0fa27171d6c65fae5fbced75071309f3adca1434ea7b40efd840641920eafcce3a8f1e100f2dbf106588dfe46a8ecf724053827b1d8b SHA512 ad827620ac42b5fddeea20d3222b342f2a6481cade600ff1e5da5cffb29d5b62a383de5f8322a05c05a2c979fcf69503b70e4412ae96f0c8318582ba1988224e
+EBUILD dawn-3.90b-r1.ebuild 1072 BLAKE2B cd75223d58f1314132ac2c528862de1aba877a20fe00921c244c46bb43165583ec6f37987f331d5203e40567f8c65e6d9779decbf8d8b9e253e5c2c56b790ef1 SHA512 de9b8dc05426938bed5c65c17856559ab8296cf123ecd9095d89aa1546688c70fac0b1e81d19e676a3ee9f53491749f113170684df4784768e9c342a59d16210
+EBUILD dawn-3.90b.ebuild 1232 BLAKE2B f723d630092e5df1a4d37a5cddbfcea53123a5af42e7dd5e3634e27a1ca08a0677c0152cdac3173734a9c0791d534304c6cd52855b862c87637fd9336846a8fc SHA512 e7e40b06f1a6af969d985f22c79d6ecfa9006ac259a564dec9ec50471eca25dfc9bab6d042f7bc69554b684299a94f613541a97ee6eb88f46e7617a94aba5c74
 MISC metadata.xml 1190 BLAKE2B 1d73439a17d21cf023760353df3691121b9c563264a7df26c17a04b5d1f56977faefcb9d3e289f494d6cffaa0c97bd4b444c463ff93d2b7217e34acf452e7b70 SHA512 e89f54b6c40745ace97ed1aa0acd4e3d7d7f69ef68883e17f43e9425016b7d883fee48e4d229543d99be1c66c274184f49c091ecc71cdf835a2b64e9016611d6
diff --git a/media-gfx/dawn/dawn-3.90b-r1.ebuild b/media-gfx/dawn/dawn-3.90b-r1.ebuild
new file mode 100644
index 000000000000..eb0d35f516dd
--- /dev/null
+++ b/media-gfx/dawn/dawn-3.90b-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver toolchain-funcs
+
+MY_P=${PN}_$(ver_rs 1 _)
+
+DESCRIPTION="3D geometrical postscript renderer"
+HOMEPAGE="http://geant4.kek.jp/~tanaka/DAWN/About_DAWN.html"
+SRC_URI="http://geant4.kek.jp/~tanaka/src/${MY_P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+
+KEYWORDS="amd64 ~hppa ~ppc ~x86"
+IUSE="doc opengl X"
+
+RDEPEND="dev-lang/tk:*
+	opengl? ( virtual/opengl )
+	X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}
+	app-shells/tcsh
+	doc? ( virtual/latex-base )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-interactive.patch
+	"${FILESDIR}"/${P}-gcc7.patch
+)
+
+DOCS=( README.txt )
+
+src_prepare() {
+	default
+
+	sed -i -e "s/\$(LIB_DIR)/\$(LDFLAGS) &/" \
+		-e '/strip/d' Makefile*in || die
+
+	if use X; then
+		mv -f configure_xwin configure || die
+	fi
+
+	tc-export CXX
+}
+
+src_install() {
+	dodir /usr/bin
+
+	if use doc; then
+		pdflatex DOC/G4PRIM_FORMAT_24.tex || die "pdf generation failed"
+		DOCS+=( DOC/*.pdf )
+		HTML_DOCS=( DOC/*.html )
+	fi
+
+	default
+}
diff --git a/media-gfx/dawn/dawn-3.90b.ebuild b/media-gfx/dawn/dawn-3.90b.ebuild
index 9e9e200f5fd6..d3f9a78279fa 100644
--- a/media-gfx/dawn/dawn-3.90b.ebuild
+++ b/media-gfx/dawn/dawn-3.90b.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -27,6 +27,7 @@ S="${WORKDIR}/${MYP}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-no-interactive.patch
+	epatch "${FILESDIR}"/${P}-gcc7.patch
 	sed -i -e "s/\$(LIB_DIR)/\$(LDFLAGS) &/" \
 		-e '/strip/d' Makefile*in || die
 }
diff --git a/media-gfx/dawn/files/dawn-3.90b-gcc7.patch b/media-gfx/dawn/files/dawn-3.90b-gcc7.patch
new file mode 100644
index 000000000000..e144a38df8f0
--- /dev/null
+++ b/media-gfx/dawn/files/dawn-3.90b-gcc7.patch
@@ -0,0 +1,21 @@
+Bug: https://bugs.gentoo.org/638616
+
+--- a/FRString.h
++++ b/FRString.h
+@@ -137,13 +137,13 @@
+ 	char*  p = m_string ;
+ 	
+ 	// skip first blank if any
+-	while(  isspace(*p) && p != '\0' ) {p++;} 
++	while(  isspace(*p) && *p != '\0' ) {p++;}
+ 
+ 	// skip one word
+-	while( !isspace(*p) && p != '\0' ) {p++;} 
++	while( !isspace(*p) && *p != '\0' ) {p++;}
+ 
+ 	// skip second blank if any
+-	while(  isspace(*p) && p != '\0' ) {p++;} 
++	while(  isspace(*p) && *p != '\0' ) {p++;}
+ 
+ 	// reset string
+ 	strcpy( tmp, p  );
diff --git a/media-gfx/dawn/files/dawn-3.90b-no-interactive.patch b/media-gfx/dawn/files/dawn-3.90b-no-interactive.patch
index 244948ec5262..ea8ac7e6a90e 100644
--- a/media-gfx/dawn/files/dawn-3.90b-no-interactive.patch
+++ b/media-gfx/dawn/files/dawn-3.90b-no-interactive.patch
@@ -1,5 +1,5 @@
---- configure_xwin.orig	2008-04-02 22:58:44.973465484 +0100
-+++ configure_xwin	2008-04-03 00:02:15.950190359 +0100
+--- a/configure_xwin
++++ b/configure_xwin
 @@ -16,17 +16,17 @@
  #----- C++ compiler name
  echo "Input C++ compiler name (e.g. g++, no default)."
@@ -87,8 +87,8 @@
  echo ""                                                >> Makefile
  
  echo "### Socket libraries to be linked "              >> Makefile
---- FRSocketMacro.h.orig	2008-04-02 23:58:51.126518123 +0100
-+++ FRSocketMacro.h	2008-04-02 23:59:03.443220012 +0100
+--- a/FRSocketMacro.h
++++ b/FRSocketMacro.h
 @@ -14,8 +14,8 @@
  #elif defined SOCKET_REDHAT61
  	#define         CLIENT_ADDR_LENGTH    socklen_t
@@ -100,8 +100,8 @@
  #endif
  
  	//----- gethostname
---- configure.orig	2010-08-21 14:22:18.000000000 +0100
-+++ configure	2010-09-23 05:57:02.000000000 +0100
+--- a/configure
++++ b/configure
 @@ -13,22 +13,22 @@
  #----- C++ compiler name
  echo "Input C++ compiler name (e.g. g++, no default)."