summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-12-05 11:54:10 +0000
committerPacho Ramos <pacho@gentoo.org>2014-12-05 11:54:10 +0000
commit32d594baba8ead833c360daffbc166679c629f43 (patch)
tree4ed067033c78847cb799e65030b9c19b30512b2f /games-puzzle/gtetrinet
parentStable for x86, wrt bug #531582 (diff)
downloadgentoo-2-32d594baba8ead833c360daffbc166679c629f43.tar.gz
gentoo-2-32d594baba8ead833c360daffbc166679c629f43.tar.bz2
gentoo-2-32d594baba8ead833c360daffbc166679c629f43.zip
Fix gentoo theme installation, fix building with -Werror=format-security (#531702)
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'games-puzzle/gtetrinet')
-rw-r--r--games-puzzle/gtetrinet/ChangeLog9
-rw-r--r--games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild (renamed from games-puzzle/gtetrinet/gtetrinet-0.7.11-r2.ebuild)11
2 files changed, 16 insertions, 4 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/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
}