gentoo resync : 16.04.2018

4 files changed, 29 insertions, 30 deletions

diff --git a/games-arcade/apricots/Manifest b/games-arcade/apricots/Manifest
index 714b71d2723b..85580776e0e7 100644
--- a/games-arcade/apricots/Manifest
+++ b/games-arcade/apricots/Manifest
@@ -1,5 +1,5 @@
-AUX apricots-0.2.6-freealut.patch 1596 BLAKE2B 80f661cac024c10314c3027c0d5d45c6d77e563ec4a6db83e3c071e4b2aed51da89c1ef132c00cba779e47d56d78545830e23f75968e44b5c303e70c1497851d SHA512 1a3efc32776ab364ca242611ec8a5ee6018b470a122430e22b222934361ceafd09e3fbc2c60e273990263c599f08d097887babde10500a78269356611fde75ad
-AUX apricots-0.2.6-ldflags.patch 829 BLAKE2B ab9f620de4967185e965ca2acb2282135623beb20be4fb1b1e2eac11419fb7c03e30e2950b2cacb598dc4b5b5269aef6867f1d8a5f6b99605e3f74e40aba22ba SHA512 51da904011d7fa65b40c3239819ef9a03e59d669c23caee30eb16a06349f17509d016d7c70ccfdbcbfc956097bd989c317fb0242cfe9a034efb9001411386bbf
+AUX apricots-0.2.6-freealut.patch 1608 BLAKE2B 4437952b0fa7b177e02d36f0bd32578265e0d3c2bd7207c55824b1a25086f98a3ee3cb0f883d552d703ea1fdaaa7a61dd619ea92d569b45fd5c69c9de428f5a4 SHA512 cb29fea3ba109f5bae09ad1673aa0ccc81904f09cb2775cc2453c01ea839ad5f5b07639d81bb3804aa3b21a2d417597e2ab5377dcd944763a1de4b20ca68680c
+AUX apricots-0.2.6-ldflags.patch 833 BLAKE2B 3d5f68a96673ef5ecfd022ff18dcf43ac3203e275b682f37aa9f42270e2a64d87f5b3cef24c2fa238aee66aa37d68a23aa0981230e8a56e5f9f2376097231134 SHA512 532c0912dbddd8890829e717d6a062df80cb2d3a51131370062c2cbfd358e987872c5a53948dd1339f0ec820e56fad0696969c286f2da72a956f2d7f01589a80
 DIST apricots-0.2.6.tar.gz 768568 BLAKE2B 82fa6d4be5f1a9ed86e968a4645822cbf558ea37df956d54d0f07e3260ca2e7ff561ae6ea357dabb2c35b7bfd4ff0d806dda5cf51cbb3a956ebdba52f6ef526a SHA512 cf8a988d316382469e4b13a86315c760b702b3d490398cf2fe96f119ba743c1ff707c09228dbbf4eb601189fece708913a621b04c44e9d93162639ccbd502cf5
-EBUILD apricots-0.2.6-r1.ebuild 1563 BLAKE2B e519b3067dba6fab9761d2d89504f38e9d11e10afd71aed974002298024be8a5a309d064fd6658e508d1754219e3f9a97999eea5c821685a6b3c9b448ba5c322 SHA512 58302d0e91a295f54fa2d37940ebb9201b39c64c3052eb3db14333f4820e26a4ce91da95269ded2206770f68286667e70431404690e10dacfaa1c8b7c42e3105
+EBUILD apricots-0.2.6-r2.ebuild 1370 BLAKE2B b8beb3effe2c18b3b862700fd11ab6ec241f0fb57158ac3bf86f6a73751648ce4d1413a6657d4fe2ee291d885f307fc3e6b39a0e50d4e2410c08040d3cd69ce8 SHA512 e08f4aa491764b431de1a2a569fcda99363b6a70c0733e0da844e81a8172146d15eeba1133478a4abe9fd1c95740142c111dce1c2b29ba477d7f19de04bdef79
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/apricots/apricots-0.2.6-r1.ebuild b/games-arcade/apricots/apricots-0.2.6-r2.ebuild
index a67017a31fa7..b0a37bd7912b 100644
--- a/games-arcade/apricots/apricots-0.2.6-r1.ebuild
+++ b/games-arcade/apricots/apricots-0.2.6-r2.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 autotools eutils games
+EAPI=6
+inherit autotools desktop
 
 DESCRIPTION="Fly a plane around bomb/shoot the enemy. Port of Planegame from Amiga"
 HOMEPAGE="http://www.fishies.org.uk/apricots.html"
@@ -19,24 +19,28 @@ DEPEND="media-libs/libsdl[sound,video]
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-freealut.patch \
+	default
+
+	eapply "${FILESDIR}"/${P}-freealut.patch \
 		"${FILESDIR}"/${P}-ldflags.patch
 
 	cp admin/acinclude.m4.in acinclude.m4
 
 	sed -i \
-		-e 's:-DAP_PATH=\\\\\\"$prefix.*":-DAP_PATH=\\\\\\"${GAMES_DATADIR}/${PN}/\\\\\\"":' \
+		-e 's:-DAP_PATH=\\\\\\"$prefix.*":-DAP_PATH=\\\\\\"/usr/share/${PN}/\\\\\\"":' \
 		-e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
 		configure.in || die
 	sed -i \
-		-e "s:filename(AP_PATH):filename(\"${GAMES_SYSCONFDIR}/${PN}/\"):" \
+		-e "s:filename(AP_PATH):filename(\"/etc/${PN}/\"):" \
 		${PN}/init.cpp || die
 	sed -i \
-		-e "s:apricots.cfg:${GAMES_SYSCONFDIR}/${PN}/apricots.cfg:" \
+		-e "s:apricots.cfg:/etc/${PN}/apricots.cfg:" \
 		README apricots.html || die
 	sed -i \
 		-e 's/-Wmissing-prototypes//' \
 		acinclude.m4 || die
+
+	mv configure.in configure.ac || die
 	eautoreconf
 }
 
@@ -45,20 +49,15 @@ src_compile() {
 }
 
 src_install() {
-	dodoc AUTHORS README TODO ChangeLog
-	dohtml apricots.html
+	HTML_DOCS="apricots.html"
+	einstalldocs
+
 	cd ${PN}
-	dogamesbin apricots
-	insinto "${GAMES_DATADIR}"/${PN}
+	dobin apricots
+	insinto /usr/share/${PN}
 	doins *.wav *.psf *.shapes
-	insinto "${GAMES_SYSCONFDIR}"/${PN}
+	insinto /etc/${PN}
 	doins apricots.cfg
-	make_desktop_entry ${PN} Apricots
-	prepgamesdirs
-}
 
-pkg_postinst() {
-	games_pkg_postinst
-	elog "You can change the game options by editing:"
-	elog "${GAMES_SYSCONFDIR}/${PN}/apricots.cfg"
+	make_desktop_entry ${PN} Apricots
 }
diff --git a/games-arcade/apricots/files/apricots-0.2.6-freealut.patch b/games-arcade/apricots/files/apricots-0.2.6-freealut.patch
index 4f663071340a..d2e1b27f6f34 100644
--- a/games-arcade/apricots/files/apricots-0.2.6-freealut.patch
+++ b/games-arcade/apricots/files/apricots-0.2.6-freealut.patch
@@ -1,5 +1,5 @@
---- apricots/apricots.cpp
-+++ apricots/apricots.cpp
+--- a/apricots/apricots.cpp
++++ b/apricots/apricots.cpp
 @@ -16,6 +16,7 @@
  int main(int, char**){

  #endif

@@ -9,8 +9,8 @@
    gamedata g;

    init_data(g);

 
---- apricots/sampleio.cpp
-+++ apricots/sampleio.cpp
+--- a/apricots/sampleio.cpp
++++ b/apricots/sampleio.cpp
 @@ -74,12 +74,9 @@
    alListenerfv(AL_ORIENTATION, front );

  

@@ -51,8 +51,8 @@
  }

  

 
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -100,7 +100,8 @@
  
  dnl Check for OpenAL
diff --git a/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch b/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch
index 5a2a34490b7e..8a7b4a9f9a8c 100644
--- a/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch
+++ b/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch
@@ -1,5 +1,5 @@
---- apricots/Makefile.am.old	2010-10-11 15:58:18.000000000 +0200
-+++ apricots/Makefile.am	2010-10-11 15:59:21.000000000 +0200
+--- a/apricots/Makefile.am.old	2010-10-11 15:58:18.000000000 +0200
++++ b/apricots/Makefile.am	2010-10-11 15:59:21.000000000 +0200
 @@ -4,7 +4,8 @@
  ## INCLUDES were found outside kdevelop specific part