gentoo resync : 14.07.2018

7 files changed, 184 insertions, 0 deletions

diff --git a/dev-python/soya/Manifest b/dev-python/soya/Manifest
new file mode 100644
index 000000000000..6d51884503fe
--- /dev/null
+++ b/dev-python/soya/Manifest
@@ -0,0 +1,9 @@
+AUX soya-0.14-glu.patch 501 BLAKE2B 6180ff433f02ce58f1258dc6786bae766aa4b31587be97a65b90d75607425bc44a296fd98bd4c7c325927582ed4705944d94589f646cd9487805c0e5d0c8b5fc SHA512 aa834bceba523b387104cb7717701b841fb4c54be4fdd97867031ccad7303f79b99cc42cd855c81d5fcf626e6687205d8c52069da1354b9ad59c7fa7caf3c6b7
+AUX soya-0.15_rc1-glu.patch 515 BLAKE2B 5d95fb91d1d3593d616bfed11c49bc80964f734e7d2bdc33a1424283e77326a3bd743ba2817ec2b1f5d28f84d43b437df2655fa05523a3fd6ffee69823d25125 SHA512 b9316c5e1514f7dff1c25a7c3864e02b29c4e8d84bde920186a53fd938680e487484af2c6541d285a595abab5a87e7547949f4eb7f6aee03988105e29fb09a07
+AUX soya-pillow.patch 607 BLAKE2B b38c09a904873280ee0a93425a94508be4931ae08a22a8111b7ab671b6c9f94169d17e92844b5406ce73ee5615259c4bc76e15475004d209bf7b0326623d3b2a SHA512 2c3bc0626a7c03dcfd9085434c372a06a68fd03bec9293a314c1f4c3a42f99aaedba8d56ca04983ddea9c94acf85c116e1a6e2cc4da7df4fa8e5a6247eb76676
+DIST Soya-0.14.tar.bz2 905659 BLAKE2B bf759b7c599ee338a39388a15e95c0007aaef5d8f45aaee01e7c20671789454701383e89fb20b6c809bc3e7f3f0826fbb3c18ed27aa0c4e41c0eb8493f15c26c SHA512 3a6d8d0523cd13d1e9e8e2260612f23dfd2d33526b40d11ea1568a3b3c3eb7172ab94b8c8e9490203128c1fbe0b840d29a04d1c7b9d93bd273eb318ad286b711
+DIST Soya-0.15rc1.tar.bz2 910576 BLAKE2B 2ec129869cdabcdb974dbfea24a3eebda1b55f4696f978335dd7e34a813c361eec9d27aa5b395a3ced0693335b34eb8f533f049e0240f443a8f1859fff5686cb SHA512 698ad3ebb446b49dc6fb70f53cfa6b1d9f35fc854d6f5fd1dafcb1478fce01c8de694a86af02580bb2b149f086122450f1bd6fe002f87d45a5c7555911c23fc6
+DIST SoyaTutorial-0.14.tar.bz2 5223674 BLAKE2B 2cc3927a058936aa497846a300e9093f169898cf1bb13f3df88c6f75d344b689d95ea386ce50a3d93c6b14b3675211855d4515b3bcc3e297411b081007eb6784 SHA512 484bc93c2561aa1f2c8bd7101b75c8ea5d42a2bae7c0431ef1e7719bd86da2f47fb68129d60ce1923b26cce1b7915ab6576d0c5f6c8ee889736971be166b4623
+EBUILD soya-0.14-r1.ebuild 1408 BLAKE2B 8e4c729c9daa880113218c5508988ad89824a87530df247c36e14d612531d8b069e1576d1eda5bd8ededf4c2c3e66d9ae4ff9122fdf948e10ece637615170815 SHA512 c768eb73e0ad6c5f0468301947efe2bfec5b73364a8d6081586a30a1afd1126ed4d0cb6c8248686f3715c97b274847e30f7eadd17e52f52c6a3b726544198b9a
+EBUILD soya-0.15_rc1-r1.ebuild 1395 BLAKE2B 4c2e708958a26da1afcb9f5bbe27caa91884e61f4008c747cbdb8b2efe7c1aff1f1863f47f9e5cdac94943e3ae8be3b0e2a1d09247aa340e02c52330e1287739 SHA512 05d9bfc400bbbd70810831a1fe41241b4966546b60fc95900f38c6a3cc85fcc83f221bf71470a5af70a629b6bbf5eba756ba589223077b38a936e49fdcf81c19
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/soya/files/soya-0.14-glu.patch b/dev-python/soya/files/soya-0.14-glu.patch
new file mode 100644
index 000000000000..606114a22fb7
--- /dev/null
+++ b/dev-python/soya/files/soya-0.14-glu.patch
@@ -0,0 +1,13 @@
+Index: setup.py
+===================================================================
+--- setup.py	(revision 550)
++++ setup.py	(working copy)
+@@ -130,7 +130,7 @@
+ if sys.platform[:3] == "win":
+ 	LIBS = ["m", "glew32", "SDL", "SDL_mixer", "freetype", "cal3d", "stdc++", "ode"]
+ else:
+-	LIBS = ["m", "GLEW", "SDL", "freetype", "cal3d", "stdc++","ode"]
++	LIBS = ["m", "GLEW", "GLU" , "SDL", "freetype", "cal3d", "stdc++","ode"]
+ 	FRAMEWORKS=[]
+ 
+ SOYA_PYREX_SOURCES  = ["_soya.pyx", "matrix.c", "chunk.c"]
diff --git a/dev-python/soya/files/soya-0.15_rc1-glu.patch b/dev-python/soya/files/soya-0.15_rc1-glu.patch
new file mode 100644
index 000000000000..39463e725a5e
--- /dev/null
+++ b/dev-python/soya/files/soya-0.15_rc1-glu.patch
@@ -0,0 +1,12 @@
+diff -rupN a/setup.py b/setup.py
+--- a/setup.py	2010-01-18 15:39:57.000000000 -0600
++++ b/setup.py	2012-07-19 21:19:48.054609136 -0500
+@@ -109,7 +109,7 @@ if endian == "big":
+ if sys.platform[:3] == "win":
+ 	LIBS = ["m", "glew32", "SDL", "SDL_mixer", "freetype", "cal3d", "stdc++", "ode"]
+ else:
+-	LIBS = ["m", "GLEW", "SDL", "freetype", "cal3d", "stdc++","ode"]
++	LIBS = ["m", "GLEW", "GLU", "SDL", "freetype", "cal3d", "stdc++","ode"]
+ 	FRAMEWORKS=[]
+ 
+ SOYA_PYREX_SOURCES  = ["_soya.pyx", "matrix.c", "chunk.c"]
diff --git a/dev-python/soya/files/soya-pillow.patch b/dev-python/soya/files/soya-pillow.patch
new file mode 100644
index 000000000000..4f8df982ccf2
--- /dev/null
+++ b/dev-python/soya/files/soya-pillow.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/show_bug.cgi?id=471510
+--- a/editor/__init__.py
++++ b/editor/__init__.py
+@@ -52,7 +52,7 @@
+ 		
+ 		if obj.face.material and obj.face.material.texture:
+ 			try:
+-				import Image, ImageTk
++				from PIL import Image, ImageTk
+ 
+ 				self.image = Image.open(os.path.join(soya.path[0], obj.face.material.texture.filename))
+ 				
+@@ -71,7 +71,7 @@
+ 		self.cancel = self.master.cancel
+ 		
+ 	def label_conf(self, event = None):
+-		import Image, ImageTk
++		from PIL import Image, ImageTk
+ 		
+ 		if self.image_width != self.label.winfo_width():
+ 			self.image_width  = self.label.winfo_width()
diff --git a/dev-python/soya/metadata.xml b/dev-python/soya/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/dev-python/soya/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/dev-python/soya/soya-0.14-r1.ebuild b/dev-python/soya/soya-0.14-r1.ebuild
new file mode 100644
index 000000000000..edbd531a388f
--- /dev/null
+++ b/dev-python/soya/soya-0.14-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PV="${PV/_}"
+MY_P="Soya-${MY_PV}"
+TUT_P="SoyaTutorial-${MY_PV}"
+
+DESCRIPTION="A high-level 3D engine for Python, designed with games in mind"
+HOMEPAGE="http://oomadness.nekeme.net/Soya/FrontPage"
+SRC_URI="
+	http://download.gna.org/soya/${MY_P}.tar.bz2
+	doc? ( http://download.gna.org/soya/${TUT_P}.tar.bz2 )
+	examples? ( http://download.gna.org/soya/${TUT_P}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples"
+
+DEPEND="
+	=dev-games/ode-0.11.1
+	dev-python/editobj
+	>=dev-python/pyopenal-0.1.6[${PYTHON_USEDEP}]
+	media-fonts/freefonts
+	media-libs/freetype:2
+	>=media-libs/cal3d-0.10
+	media-libs/freeglut
+	>=media-libs/freetype-2.5
+	>=media-libs/glew-1.3.3:*
+	>=media-libs/libsdl-1.2.8[opengl]
+	media-libs/openal
+	virtual/opengl
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-glu.patch"
+	"${FILESDIR}/${PN}-pillow.patch"
+)
+
+python_compile() {
+	local CFLAGS=${CFLAGS}
+	append-cflags -fno-strict-aliasing
+	distutils-r1_python_compile
+}
+
+python_install_all() {
+	use doc && DOCS=( "${WORKDIR}/${TUT_P}/doc"/{soya_guide,pudding/pudding}.pdf )
+	use examples && EXAMPLES=( "${WORKDIR}/${TUT_P}"/tutorial )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/soya/soya-0.15_rc1-r1.ebuild b/dev-python/soya/soya-0.15_rc1-r1.ebuild
new file mode 100644
index 000000000000..37ff57f4f1fa
--- /dev/null
+++ b/dev-python/soya/soya-0.15_rc1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python2_7)
+
+inherit distutils-r1 eutils
+
+MY_PN="Soya"
+MY_PV="${PV/_}"
+MY_P="Soya-${MY_PV}"
+TUT_P="SoyaTutorial-0.14"
+
+DESCRIPTION="A high-level 3D engine for Python, designed with games in mind"
+HOMEPAGE="http://home.gna.org/oomadness/en/soya3d/index.html"
+SRC_URI="http://download.gna.org/soya/${MY_P}.tar.bz2
+	doc? ( http://download.gna.org/soya/${TUT_P}.tar.bz2 )
+	examples? ( http://download.gna.org/soya/${TUT_P}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples"
+
+RDEPEND=">=dev-games/ode-0.14[-double-precision]
+	dev-python/editobj
+	dev-python/pillow
+	>=dev-python/pyopenal-0.1.6
+	media-fonts/freefonts
+	>=media-libs/cal3d-0.10
+	media-libs/freeglut
+	>=media-libs/freetype-2.1.5:2
+	>=media-libs/glew-1.3.3:0
+	>=media-libs/libsdl-1.2.8[opengl]
+	media-libs/openal
+	virtual/opengl
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-glu.patch"
+)
+
+src_unpack() {
+	unpack ${A}
+	mv "${WORKDIR}/${MY_P}" "${WORKDIR}/${MY_PN}"
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	insinto /usr/share/${PF}
+	if use doc; then
+		cd "${WORKDIR}/${TUT_P}/doc"
+		doins soya_guide.pdf pudding/pudding.pdf || die "doins failed"
+	fi
+	if use examples; then
+		cd "${WORKDIR}/${TUT_P}"
+		doins -r tutorial || die "doins failed"
+	fi
+}