From 2f51c9978dda4c6e8debca43e4235ecc86914032 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 25 Dec 2017 17:37:52 +0000
Subject: gentoo resync : 25.12.2017

---
 dev-games/Manifest.gz              | Bin 6411 -> 6403 bytes
 dev-games/mygui/Manifest           |   2 +-
 dev-games/mygui/mygui-3.2.2.ebuild |  24 ++++++++++++------------
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'dev-games')

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index ffe0c7af2ac7..524a1a8bbe82 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/mygui/Manifest b/dev-games/mygui/Manifest
index 98f2c6343146..10702b5b3840 100644
--- a/dev-games/mygui/Manifest
+++ b/dev-games/mygui/Manifest
@@ -2,5 +2,5 @@ AUX mygui-3.2.2-FHS.patch 1209 BLAKE2B 7bd14cfe0653ac74df4ab5ac6be69a9d958377958
 AUX mygui-3.2.2-build.patch 2801 BLAKE2B c414f7249f63c5addd0c616df3a0ac0979fc7c8565b9c12c8f81007f152c129d868ec9359641ce59abca4b9958bc3fa39bb906b221d66fef4e9df53135bf18da SHA512 954f95759967a1a4f4eb6952f6abbabbe3157703d5d0014299a8cd5060cd5fb0c7faa635ad10e5c23e0bc0c8d8089c29c14952058a7bdcc2643f06c226f5524d
 AUX mygui-3.2.2-underlinking.patch 398 BLAKE2B 0e4ebdf58228ac6b6368202c40137feadf5f3adeb4f2e20020d2ed8db6db17a1ca0715e1018a5e851cc8a38163e4607e9f705f20f3190fa09de9de0eb7ab3099 SHA512 ad0e5e0e8aacdb65ea9195175f597eb95f265b07d0154482f2380ae6e837672d5d41b6d43b1266abb12dec319625426dd65a892aca7fdca297131bd4db2312b9
 DIST MyGUI3.2.2.tar.gz 22081236 BLAKE2B 3a28e0838a8203d20565822d5a19423a733149cca250dc4169de43f22beb7d37fccbf3d282ea9b4f284cb71df2df9a9073bac40124e1d8a90d15c5fda2af798a SHA512 1290ce1d78b9e4bfe72bea3fb1bc6cdd25969b44be2844df62a1f425b3e221a68b61658fdf45271fb50a1957f12b5ada1c9be971e00ecfe41f53ae0a83ae18d4
-EBUILD mygui-3.2.2.ebuild 3706 BLAKE2B d7297092aaa0ae24164d400a11586f23eb0365ad5b6d880391c39f374d25caa1f3ffa14889e174327e7ea0f8ca75b8ccf82c2efa6bf4f3c9d5b5735859998aa2 SHA512 7a6fd7fda83620ae6dfd8374b7963386a322d2d9572627e48c29575e8c1dbf1cd90d92bfcc6407a401b63086601d8cc3770485e344d0ca65ebe4c2893be23808
+EBUILD mygui-3.2.2.ebuild 3715 BLAKE2B 55b6564a79a7a16327cc751584ce67315d51069cb23b605e332f3fb0606eeb21afb026d54485c866baa0fac9e5272155bfc88caa6911c878ca999618865ae322 SHA512 e9c9673afcca22151f6efc68be5478eb90e7ebc6cf376b5ef9d4e843a6820c0d6debadf93437a16b96da1e13e58c73903e1301aa1d59332d022a0b5cee0ab6fc
 MISC metadata.xml 2042 BLAKE2B c4690fb7a1b64e2d782f7373511a2bb85e39a797d8f3e265eb15820b012dc3b784f18e51bbd2ba7801beeb2554295efb8a1bb6c760a6c2f4258191e9616b1980 SHA512 76aa0598c2e5505c4c2eead9c59a54849cdad281196d763859aea254a286a7928cf29c7aa4e709f45aabf3e160ec70fd0b92a644519e1ae5b90257f74d6a4844
diff --git a/dev-games/mygui/mygui-3.2.2.ebuild b/dev-games/mygui/mygui-3.2.2.ebuild
index 60ec5b14954f..3755ef1f7122 100644
--- a/dev-games/mygui/mygui-3.2.2.ebuild
+++ b/dev-games/mygui/mygui-3.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,6 +36,12 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/mygui-${MY_P}
 STATIC_BUILD=${WORKDIR}/${P}_build_static
 
+PATCHES=(
+	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-FHS.patch
+)
+
 pkg_setup() {
 	if use samples && use !ogre ; then
 		ewarn "Samples disabled, because they only work with ogre!"
@@ -43,12 +49,6 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-underlinking.patch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-FHS.patch
-}
-
 src_configure() {
 	use debug && append-cppflags -DDEBUG
 
@@ -129,14 +129,14 @@ src_install() {
 	fperms o+w /etc/MYGUI
 
 	# test media not needed at runtime
-	rm -rf "${D}"/usr/share/MYGUI/Media/UnitTests
+	rm -rf "${ED%/}"/usr/share/MYGUI/Media/UnitTests || die
 	# wrapper not available for linux, remove related media
-	rm -rf "${D}"/usr/share/MYGUI/Media/Wrapper
+	rm -rf "${ED%/}"/usr/share/MYGUI/Media/Wrapper || die
 }
 
 pkg_postinst() {
-	einfo
+	elog
 	elog "ogre.cfg and Ogre.log are created as"
-	elog "/etc/MYGUI/mygui-ogre.cfg and /etc/MYGUI/mygui-Ogre.log"
-	einfo
+	elog "${EROOT%/}/etc/MYGUI/mygui-ogre.cfg and /etc/MYGUI/mygui-Ogre.log"
+	elog
 }
-- 
cgit v1.2.3