gentoo resync : 14.07.2018

6 files changed, 136 insertions, 0 deletions

diff --git a/games-puzzle/xye/Manifest b/games-puzzle/xye/Manifest
new file mode 100644
index 000000000000..73ecb2a9d92c
--- /dev/null
+++ b/games-puzzle/xye/Manifest
@@ -0,0 +1,6 @@
+AUX xye-0.12.2-fix-buildsystem.patch 1020 BLAKE2B 6408b6df99db5ca103183a7cee8905f7cc1c851d7e2f00e60334b806517841eab0896028e0a178fcfdf42e0bd672a8594c47caae2ac629d915ceff9af883dab6 SHA512 d4b08db4eb5ee4b3e1e98e9faeda87aafe17ae444cb0a8400c9206c2871b56801040bddeffb13dfed0170094d48ffac593209b2ad69896f8993521d0b0929cf1
+AUX xye-0.12.2-fix-c++14.patch 502 BLAKE2B e3116515757af9e84d5bac340947df1e88e768058a3dfb65e0894388ad8e0fa98f63e6c16314e35b288fff8639d8f46972999c031e077d3417218c09bc9c00a7 SHA512 c9dcc309b5e451f1608174de4f6016d006879d2267627eebe8ff524af293137af90f4761c8eacbc5ebd9ee633cc7d087e23eb3e7c4970f5484e065dfa8dff3af
+AUX xye-0.12.2-fix-desktop-file.patch 414 BLAKE2B 3d4f87e6db2144407eaf5161d73184d23eabd4742dbc1f68e59d8932257491eb429d68d12d910ee311fdbafecd4c118a6ad9f9b3b225157384035868ced3ee48 SHA512 c798ed5da4e45b0a8d5aaa4dd77fe09d9cb08837a33b44a5c69f89e4d2456fb5964c4fc5646a83fd6166d315200924944ab6dd7eea3f983e4be403a8f14f8c9e
+DIST xye-0.12.2.tar.gz 2860290 BLAKE2B 426cd4afb84c0de8bdbafe9b63d0da2f686593449b4577ae0eb77e38364bcac166cb9bf4a3a41f7d15a0a1745bc9574f959e0429998c00ad78a6fe40c49093f1 SHA512 a31d922e0a0660d269d30430fbaf1d00924b0271db697f3cbc89b78815e597e11743bd9018fbf3f2f9e7561ad3469e9cca28687efaae7fc6dcba40ada2b5effa
+EBUILD xye-0.12.2.ebuild 932 BLAKE2B c77382cd8764e3425d8c257e9f36f3d91af9b8df27ef71c9bfff3102c739c7e1e907d7fff57da861025d704afac45086be9b90d4ab45b45ac6078f98e013ae65 SHA512 9b0c88bc789e73608ff3fb297c04a83cb1eca221130a3ca53148f170b187ac7f87b86181233535e8955ef0f944b5db5e7660f424d501ff608328fe83ba3322d7
+MISC metadata.xml 326 BLAKE2B 8f368cb2e89ca46600917931c95285943f8ededa8a3c1c6fe1602a11c68a00f53429be467d28a49cf9a0989cb6b6f0cfa70ded461f2b6f9adeb86e8c05a49e52 SHA512 05084d9dcce50a1d4302a83cb89abd67519143384ff6c1ca3f84e10db468483cf90e4d10c240dc58f47b10df747725c86514db303efaeca048d44a3085bb7fe6
diff --git a/games-puzzle/xye/files/xye-0.12.2-fix-buildsystem.patch b/games-puzzle/xye/files/xye-0.12.2-fix-buildsystem.patch
new file mode 100644
index 000000000000..c96d42e34681
--- /dev/null
+++ b/games-puzzle/xye/files/xye-0.12.2-fix-buildsystem.patch
@@ -0,0 +1,45 @@
+Fix build system to respect correct paths
+and install files in correct paths.
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4,13 +4,11 @@
+ 
+ 
+ bin_PROGRAMS = xye
+-xye_LDFLAGS = 
+ 
++doc_DATA = NEWS ChangeLog AUTHORS
++html_DATA = ReadMe.html
+ 
+-docedir = $(datadir)/@PACKAGE@
+-doce_DATA = ReadMe.html NEWS ChangeLog AUTHORS
+-
+-levelsdir= $(datadir)/@PACKAGE@/levels
++levelsdir= $(datadir)/$(PACKAGE)/levels
+ levels_DATA = levels/5levels.xye \
+ levels/levels.xye \
+ levels/logo.xye \
+@@ -25,12 +23,10 @@
+ levels/xyester.xye \
+ levels/SuperJustin.xye
+ 
+-resdir= $(datadir)/@PACKAGE@/res
++resdir= $(datadir)/$(PACKAGE)/res
+ res_DATA = res/default.xml \
+ res/xye.png \
+ res/xye_luminosity.png \
+-res/DejaVuSans.ttf \
+-res/DejaVuSans-Bold.ttf \
+ res/fon.bmp \
+ res/fon_bold.bmp \
+ res/clean40.xml \
+@@ -103,7 +99,7 @@
+ src/skins.cpp \
+ src/skins.h
+ 
+-EXTRA_DIST = ${EXTRA_DIST1} ${xye_SOURCES} ${res_DATA} ${levels_DATA} ${doce_DATA}
++EXTRA_DIST = ${EXTRA_DIST1} ${xye_SOURCES} ${res_DATA} ${levels_DATA}
+ 
+ DEFS=@data_path_flag@
+ 
diff --git a/games-puzzle/xye/files/xye-0.12.2-fix-c++14.patch b/games-puzzle/xye/files/xye-0.12.2-fix-c++14.patch
new file mode 100644
index 000000000000..f2083b871a82
--- /dev/null
+++ b/games-puzzle/xye/files/xye-0.12.2-fix-c++14.patch
@@ -0,0 +1,14 @@
+Add explicit cast to silence C++14 -Wnarrowing conversion warnings.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=600298
+
+--- a/src/xsb_level.cpp
++++ b/src/xsb_level.cpp
+@@ -784,7 +784,7 @@
+ 

+ bool FromXyeDFS(int* mem, unsigned char x, unsigned char y)

+ {

+-    static const unsigned char dx[4] = {0,0,-1,1}, dy[4] = {-1,1,0,0};

++    static const unsigned char dx[4] = {0,0,(unsigned char)-1,1}, dy[4] = {(unsigned char)-1,1,0,0};

+     int &res =  mem[y*XYE_HORZ+x];

+     if( res==0)

+     {

diff --git a/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch b/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch
new file mode 100644
index 000000000000..99558ef28732
--- /dev/null
+++ b/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch
@@ -0,0 +1,18 @@
+Fix .desktop file to comply with FDO specifications.
+
+--- a/xye.desktop
++++ b/xye.desktop
+@@ -4,11 +4,11 @@
+ Encoding=UTF-8
+ Exec=xye
+ Type=Application
+-Categories=Application;Game;PuzzleGame
++Categories=Game
+ Name=Xye
+ GenericName=Xye
+ Comment=Solve puzzles and action challenges in order to get all the gems in the room.
+ Terminal=false
+ StartupNotify=false
+-Icon=xye.png
++Icon=xye
+ MimeType=application/xye-xml
diff --git a/games-puzzle/xye/metadata.xml b/games-puzzle/xye/metadata.xml
new file mode 100644
index 000000000000..136b7508becd
--- /dev/null
+++ b/games-puzzle/xye/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">xye</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/xye/xye-0.12.2.ebuild b/games-puzzle/xye/xye-0.12.2.ebuild
new file mode 100644
index 000000000000..ed474f123243
--- /dev/null
+++ b/games-puzzle/xye/xye-0.12.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Free version of the classic game Kye"
+HOMEPAGE="http://xye.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xye/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-fonts/dejavu
+	media-libs/libsdl[video]
+	media-libs/sdl-ttf
+	media-libs/sdl-image[png]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.12.2-fix-buildsystem.patch
+	"${FILESDIR}"/${PN}-0.12.2-fix-c++14.patch
+	"${FILESDIR}"/${PN}-0.12.2-fix-desktop-file.patch
+)
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	# create symlinks for previously bundled fonts
+	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/res/DejaVuSans.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf /usr/share/${PN}/res/DejaVuSans-Bold.ttf
+}