Fix gentoo theme installation, fix building with -Werror=format-security (#531702)

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 21 insertions, 9 deletions

diff --git a/games-puzzle/gtetrinet/ChangeLog b/games-puzzle/gtetrinet/ChangeLog
index d43f920ef7f7..1fd754b30581 100644
--- a/games-puzzle/gtetrinet/ChangeLog
+++ b/games-puzzle/gtetrinet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-puzzle/gtetrinet
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gtetrinet/ChangeLog,v 1.28 2014/12/02 16:21:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gtetrinet/ChangeLog,v 1.29 2014/12/05 11:54:10 pacho Exp $
+
+*gtetrinet-0.7.11-r3 (05 Dec 2014)
+
+  05 Dec 2014; Pacho Ramos <pacho@gentoo.org> +gtetrinet-0.7.11-r3.ebuild,
+  -gtetrinet-0.7.11-r2.ebuild:
+  Fix gentoo theme installation, fix building with -Werror=format-security
+  (#531702)
 
 *gtetrinet-0.7.11-r2 (02 Dec 2014)
 
diff --git a/games-puzzle/gtetrinet/Manifest b/games-puzzle/gtetrinet/Manifest
index 574bc5234f8e..0cd2279c9b7c 100644
--- a/games-puzzle/gtetrinet/Manifest
+++ b/games-puzzle/gtetrinet/Manifest
@@ -6,13 +6,13 @@ AUX gtetrinet-0.7.11-noesd.patch 4007 SHA256 ee0b877775bbf10463cd31c39e1f18fac56
 DIST gtetrinet-0.7.11.tar.bz2 416744 SHA256 cea27a5f65cc4384e9130cf345421ef677418be4ebdab14d82b9049dd162ddc0 SHA512 5de7df7647ed9f7c0b6aba4eac976c625b7632eb5ab8034b11ef09aeb4582f90b4f9fc1791dc5371e1067d59c90b792a70276c69b75ebd6dc8c74c96c47c7130 WHIRLPOOL bb05ae48330a6a17209e13857d63f7f8711683df1ded9959b27bfcd3393859d4276f458462ac4b4e1663ac3a19f9e8299a53f0100b44909e5757881bd6ca1e02
 DIST gtetrinet-gentoo-theme-0.1.tbz2 88240 SHA256 33037370a0cab1ac395716f8b33ead7f2360cac0bd25b869cff3ab5d28b6a323 SHA512 6834ed4d70d94d94c201c5fa76d670ed21e4451ad18b1f41292c69e8ba18f56198898bb9d0c90343e28fa05a53e2e92536aa07fad747d4321d2e67c638d7ab8d WHIRLPOOL 9f1a0c0e4e7ea394209638e05640460be14533eb9d6db6962f9c10f2776af5c01d1b5486ac51792f0fc70e2b21bace691c6f1cf83d9b22c2117c1148e3218e8d
 EBUILD gtetrinet-0.7.11-r1.ebuild 1439 SHA256 5f1bdc2e43b9da195e753761c23d6faac95a7cc30f6195beddb4e8566610f049 SHA512 034fcef3371444be8d2c1d7ab531cb822b2a2778255de35b7a0689cfec3853f33aa04eb80a0cdd3ceede89a78623d1decb19a6e06af5d318cfdcc808ce40533a WHIRLPOOL a3b63f3934626e6316b1f6b36b6ce651ad0d6c2b607aae08cb0696ca7596bfe104f692198b22a3486f18cc5f32c5bc6cf0ef9429d383eb0d97beb248f3a72762
-EBUILD gtetrinet-0.7.11-r2.ebuild 1220 SHA256 fa6b0656b3821699ee3c6d84f06b80bd7306c16266ec06679563793dd98c9d41 SHA512 315a42f45e7d9fb4d4c7e3dce71fb6deba0b7a75bea7df88776c39aeca9078ac822df9fa4b6de2993533c962be0d2e99da6e2866eb7e19f3895632b59534cdd1 WHIRLPOOL dfb866238e77c09ae36d5975b0376284a55859e749357d814894afaca1d4113e525873a924fff1cf9eb48f6dfaef72e2c379dfebd0e10d4a3d544fbfca7183f1
-MISC ChangeLog 6157 SHA256 4c1157a5335733d498903461115674b335e3bbb9f105e2c2d2dad6bda8237b1a SHA512 db22bb7ac4447590853d7998e422132d73e63c0a9a706d0d16f5b2cb624b946a495712f440ac505814bbb92390b8df5f3e574f68ac2af6548fde5bfb91bbab11 WHIRLPOOL 3afb184806af06e47cf2f45269f530a5a4fc5f3279d1e7eeac056e31f75d9445fd0f534b34501581f858541e353e714a1cbb620b992f8a39b99e9b21348e3a46
+EBUILD gtetrinet-0.7.11-r3.ebuild 1361 SHA256 ab807b0582926cb137375970a65da16a316b44fb85cd3e3ed659abd8369bc82b SHA512 4a406e18015b37d6cbf1718fca204fbfd25a653ce5867717622fbbb44cc58c851120395b77ce322928486996e78b6c9113ec63b8265e7d59929f5610531cfe67 WHIRLPOOL 8d8bb09e282d71e1630eaf335bb0a60530836795f44cacc8e423754106857f14163b1a2d43343558e8915fd85fcb5d4cf70baaebb930d6ff7f3e23f990cbe37a
+MISC ChangeLog 6387 SHA256 8d259392c9bcfb832895b24b8a013267bfca156cb3e96eda2e7c592c383a58a5 SHA512 e0ce5fda8bc4fc2dff8b9dfb8d79f10e9f58344d5698ca3af5d56ecb3322a5a473a2202c5fdb28a762e44fab4d2a6791068adc61e01c1c5ec87c5bd2ec4a718e WHIRLPOOL 8629678331bcbad45bf871855e7e66929ee0b4b4788cd4156bae48466a20f984ff585532d6d2f54b3be7b7dff534ffca7f401a19abea6bbe60547836b8acbbdf
 MISC metadata.xml 652 SHA256 02143afc3f481a6995a9b1edb08ac275303f93a9aa15824977b5552632b5fa58 SHA512 b159ca3a606109e9825435fccb56492c9811fc92349711ad1de5696e8fbb36df7313deb7abef1dde114de2699c95de382f87ee9ed80a0d0d1922abd0aa67d58c WHIRLPOOL ec805562a2b6783446dedcf73cbb8d36c9edc2d1eca45d42905703dbd6e7d8d7f5edab23462910773aaf8228b219be824af31255128d01ac978fe7760b9b2120
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlR95xgACgkQCaWpQKGI+9QXBQCgh34tHVL7yh7ovUwUBkn3PXmX
-GHEAnjpsLm0G3e1DSXvTNDtzheTvLIWZ
-=rFNs
+iEYEAREIAAYFAlSBnOMACgkQCaWpQKGI+9RWOQCfe4UOekIchHx0E9Cx71oX5ot1
+hD0AnjIwkLyjmfIzkKpyAaijvOQLpaLo
+=BVOr
 -----END PGP SIGNATURE-----
diff --git a/games-puzzle/gtetrinet/gtetrinet-0.7.11-r2.ebuild b/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild
index 4f5166606d19..899e72f6c70e 100644
--- a/games-puzzle/gtetrinet/gtetrinet-0.7.11-r2.ebuild
+++ b/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gtetrinet/gtetrinet-0.7.11-r2.ebuild,v 1.1 2014/12/02 16:21:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild,v 1.1 2014/12/05 11:54:10 pacho Exp $
 
 EAPI=5
 GCONF_DEBUG="yes"
@@ -32,13 +32,18 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-{noesd,desktopfile}.patch
+	epatch "${FILESDIR}"/${P}-noesd.patch
+	epatch "${FILESDIR}"/${P}-desktopfile.patch
+	epatch "${FILESDIR}"/${P}-format-security.patch
 	sed -i \
 		-e "/^pkgdatadir =/s:=.*:= ${GAMES_DATADIR}/${PN}:" \
 		src/Makefile.in themes/*/Makefile.in || die
 	sed -i \
 		-e '/^gamesdir/s:=.*:=@bindir@:' \
 		src/Makefile.am || die
+
+	rm -rf "${WORKDIR}"/gentoo/.xvpics || die # Remove cruft
+
 	eautoreconf
 	gnome2_src_prepare
 }
@@ -50,5 +55,5 @@ src_configure() {
 
 src_install() {
 	gnome2_src_install
-	mv "${WORKDIR}"/gentoo "${D}/${GAMES_DATADIR}"/${PN}/themes/
+	mv "${WORKDIR}"/gentoo "${ED}/usr/share/${PN}/themes/" || die
 }