gentoo resync : 19.04.2018

5 files changed, 30 insertions, 30 deletions

diff --git a/games-arcade/holotz-castle/Manifest b/games-arcade/holotz-castle/Manifest
index 6fc98c0bee6a..61fa0df300c8 100644
--- a/games-arcade/holotz-castle/Manifest
+++ b/games-arcade/holotz-castle/Manifest
@@ -1,6 +1,6 @@
-AUX holotz-castle-1.3.14-build.patch 2270 BLAKE2B 9d9422be1f071bbebc98176dbc81175fbb8622a8c4f81fd10d1e604efed3d23d471775e814a463091f5085a248df865a55efedeb83d3807153ac3abdf14f5ace SHA512 f7b51add393949e87e68e5d787e4694b5ab5e8b3d2b403e1d271de1e4bd7d153e5bddb717a0a7f0d0e901cd5ef8820cad6ae8672cfdb41cc174c24f6aab1b8f4
-AUX holotz-castle-1.3.14-gcc44.patch 288 BLAKE2B 1839eddfbe1e0a5a15136a8cac314d16247145a4d2b94111d9c52160e1e26548e9508366746e7b0f072bfa5b21dc81089a9fba4d2609b841c8ef8bce9e1c5148 SHA512 38ae0281ac5a846294708821015030f7aaea059de0d42e1b8c122291f460b8bc80b052586055d8fc4d496e45ae307cb55994d343606e1e0ba95b5772e407ff61
-AUX holotz-castle-1.3.14-underlink.patch 536 BLAKE2B 5b1c42232a86451127903848a036acabe0e4932d37734c18350287961eb162e04126f3d203f34b480747b5d14606fea8292aac887518ee82f9009a669980ed0c SHA512 8f3fd05099235366f112b74a61be5285ceaa05b7c042285199bc21ffe8e674a640abe447af5f7b14e61df40c3e8246ce21259af6be47f84596d1d3331388f71a
+AUX holotz-castle-1.3.14-build.patch 2278 BLAKE2B 1fc9e92fcbce33277a9535becb700d8159db7dd66581efe87ed272399b67c704535422c6d3484d3e7480cb1934aaf5dd2704e401d9a867867817c02827ac540a SHA512 fd19155ff5f372306b987a4998b0ef9a3ae194bdc75c99d5f276cae50910fef5998dfd244c6ca4cae0b33741334d072876bff7710fabf365712531502345d101
+AUX holotz-castle-1.3.14-gcc44.patch 292 BLAKE2B 9a287237f52ef832839280134263a10c95752bdd131dc9340c1b2731c844f1af9e40785f1219816d1ac5bbdfde1e58013de8c960c3db400c50ab23a17bcdeece SHA512 89ea8aa06c23adc21a88031f02da88476e086ab9ee3147bee1a545cbc6a9b631de2d8b504b0b1b3081a3a62c11df7720ac124ceda788518937652f2ca5a2a118
+AUX holotz-castle-1.3.14-underlink.patch 540 BLAKE2B 443ee944d5f92d81fca16dd7d1ed450edb1e8bc9f93e97fc89dc40b30c8e99dcbd7035b20a11868c9575e3af3304369086c07dcbf012a4bc5d4c6cebca298705 SHA512 29d01cd2404018def02cc7bc44afb9752f7b6fe58f1f8dcf01ce6d41865eae663e26fa159206f55a1d70320aaf5a1556012c0fd0199fdb001f9257571b93d46d
 DIST holotz-castle-1.3.14-src.tar.gz 3691364 BLAKE2B 82ec9336410634d5649eaabe55f69b4cce94d983b1713aa2e7472cec59cd7c1b843a4512a2e11b79c74cc869d96259ea9e21e4bd6d88ddbeeaf8437b63ab13b8 SHA512 129f15a51b13bc80ca068b1ec18cc4ae8bb5b80f11f852b81bff4492dab5bf4edbae714fcaafb197cdedf2b079070ab2f8750790b0b1680204ee7520f1d74576
-EBUILD holotz-castle-1.3.14.ebuild 1222 BLAKE2B 838a58c6c28f498240d2250c32eccd77da39f89f802fc7e150ab18bb64bf40f206be39f04f52d8b765572f40f36ae050f1313afcaa03876a6afdeb1e97dfc34f SHA512 c35df7b484a4c3b7f499932a07e47dcbbe37c65df7895f2818fb6efbf0bfc3a8108cfe7ceaae3c4d312e0d73a5ca67936a7ef0de1c37be4de0c5249b84d49f97
+EBUILD holotz-castle-1.3.14-r1.ebuild 1157 BLAKE2B 09579ecdefcdab731b4002fe3421f8da07d4624017bf8be63400eedb35aceebb80d45341b210fd1cee18ae073221fb9acf4333f2933a473b0d365da1686df5ff SHA512 dc67b5ad93ae62a8f93084b72a64905a10555f6672a5af2dc19f3c5c802ced5e6b968daf35585119dfc454049f1be053ccf6285b4bbc8ce8eb7fffc0d6a26283
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/holotz-castle/files/holotz-castle-1.3.14-build.patch b/games-arcade/holotz-castle/files/holotz-castle-1.3.14-build.patch
index bb834656601d..cdf814546e1d 100644
--- a/games-arcade/holotz-castle/files/holotz-castle-1.3.14-build.patch
+++ b/games-arcade/holotz-castle/files/holotz-castle-1.3.14-build.patch
@@ -1,5 +1,5 @@
---- JLib/Makefile
-+++ JLib/Makefile
+--- a/JLib/Makefile
++++ b/JLib/Makefile
 @@ -19,7 +19,7 @@
  endif
  
@@ -29,8 +29,8 @@
  
  .PHONY: install
  install:
---- src/Makefile
-+++ src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -30,7 +30,7 @@
  
  DEFINES = -DHC_DATA_DIR=\"$(HC_DATA)\" -DHCED_DATA_DIR=\"$(HCED_DATA)\"
diff --git a/games-arcade/holotz-castle/files/holotz-castle-1.3.14-gcc44.patch b/games-arcade/holotz-castle/files/holotz-castle-1.3.14-gcc44.patch
index 0c3af53591bf..ecf9d5c32de9 100644
--- a/games-arcade/holotz-castle/files/holotz-castle-1.3.14-gcc44.patch
+++ b/games-arcade/holotz-castle/files/holotz-castle-1.3.14-gcc44.patch
@@ -1,5 +1,5 @@
---- JLib/JLib/Util/JFS.cpp
-+++ JLib/JLib/Util/JFS.cpp
+--- a/JLib/JLib/Util/JFS.cpp
++++ b/JLib/JLib/Util/JFS.cpp
 @@ -887,7 +887,7 @@
  
  		// Si es un directorio lo importa recursivamente
diff --git a/games-arcade/holotz-castle/files/holotz-castle-1.3.14-underlink.patch b/games-arcade/holotz-castle/files/holotz-castle-1.3.14-underlink.patch
index 2e23b2a40995..efcf379fb129 100644
--- a/games-arcade/holotz-castle/files/holotz-castle-1.3.14-underlink.patch
+++ b/games-arcade/holotz-castle/files/holotz-castle-1.3.14-underlink.patch
@@ -1,5 +1,5 @@
---- src/Makefile.old	2011-06-22 06:09:53.195025702 +0200
-+++ src/Makefile	2011-06-22 06:10:54.774927134 +0200
+--- a/src/Makefile.old	2011-06-22 06:09:53.195025702 +0200
++++ b/src/Makefile	2011-06-22 06:10:54.774927134 +0200
 @@ -43,7 +43,7 @@
  # Definir -D_JLIB_DEBUG para debug con JLib. Ponerlo también en el Makefile de JLib.
  # Define -D_JLIB_DEBUG for JLib debug mode. Put it also in JLib's Makefile.
diff --git a/games-arcade/holotz-castle/holotz-castle-1.3.14.ebuild b/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild
index e6c3106134bb..16ed5d364bad 100644
--- a/games-arcade/holotz-castle/holotz-castle-1.3.14.ebuild
+++ b/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs games
+EAPI=6
+inherit desktop toolchain-funcs
 
 DESCRIPTION="2D platform game"
 HOMEPAGE="http://www.mainreactor.net/holotzcastle/en/index_en.html"
@@ -13,34 +13,35 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="virtual/opengl
+RDEPEND="
+	virtual/opengl
 	virtual/glu
 	media-libs/sdl-mixer
 	media-libs/libsdl
 	media-libs/sdl-ttf
-	media-libs/sdl-image"
-DEPEND=${RDEPEND}
+	media-libs/sdl-image
+"
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${P}-src
+S="${WORKDIR}/${P}-src"
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-underlink.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-gcc44.patch
+	"${FILESDIR}"/${P}-underlink.patch
+)
 
 src_compile() {
 	tc-export AR
 	emake -C JLib
-	emake -C src HC_BASE="${GAMES_DATADIR}"/${PN}/
+	emake -C src HC_BASE=/usr/share/${PN}/
 }
 
 src_install() {
-	dogamesbin holotz-castle holotz-castle-editor
-	insinto "${GAMES_DATADIR}"/${PN}/game
+	dobin holotz-castle holotz-castle-editor
+	insinto /usr/share/${PN}/game
 	doins -r res/*
-	insinto "${GAMES_DATADIR}"/${PN}/editor
+	insinto /usr/share/${PN}/editor
 	doins -r HCedHome/res/*
 	newicon res/icon/icon.bmp ${PN}.bmp
 	make_desktop_entry ${PN} "Holotz's Castle" /usr/share/pixmaps/${PN}.bmp
@@ -48,5 +49,4 @@ src_install() {
 		/usr/share/pixmaps/${PN}.bmp
 	dodoc doc/MANUAL*.txt
 	doman man/*.6
-	prepgamesdirs
 }