diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2013-09-06 23:31:45 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2013-09-06 23:31:45 +0000 |
| commit | b52a776af19ec38554e7efd4d4230ac2d85c6b22 (patch) | |
| tree | e7317b425eab4790ebee002debb719f0c526e25f /games-board | |
| parent | version bump (diff) | |
| download | gentoo-2-b52a776af19ec38554e7efd4d4230ac2d85c6b22.tar.gz gentoo-2-b52a776af19ec38554e7efd4d4230ac2d85c6b22.tar.bz2 gentoo-2-b52a776af19ec38554e7efd4d4230ac2d85c6b22.zip | |
don't expand path variables in configure.in, thanks to vapier for pointing it out
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'games-board')
| -rw-r--r-- | games-board/awale/ChangeLog | 7 | ||||
| -rw-r--r-- | games-board/awale/awale-1.5.ebuild | 6 | ||||
| -rw-r--r-- | games-board/awale/files/awale-1.5-build.patch | 8 |
3 files changed, 13 insertions, 8 deletions
diff --git a/games-board/awale/ChangeLog b/games-board/awale/ChangeLog index c7e46c421518..7fdbd35910ab 100644 --- a/games-board/awale/ChangeLog +++ b/games-board/awale/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-board/awale # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/awale/ChangeLog,v 1.6 2013/07/07 10:18:12 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/awale/ChangeLog,v 1.7 2013/09/06 23:31:43 hasufell Exp $ + + 06 Sep 2013; Julian Ospald <hasufell@gentoo.org> awale-1.5.ebuild, + files/awale-1.5-build.patch: + don't expand path variables in configure.in, thanks to vapier for pointing it + out 07 Jul 2013; Agostino Sarubbo <ago@gentoo.org> awale-1.5.ebuild: Stable for x86, wrt bug #469728 diff --git a/games-board/awale/awale-1.5.ebuild b/games-board/awale/awale-1.5.ebuild index 69099a14a9d0..c8ae36bad99e 100644 --- a/games-board/awale/awale-1.5.ebuild +++ b/games-board/awale/awale-1.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/awale/awale-1.5.ebuild,v 1.6 2013/07/07 10:18:12 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/awale/awale-1.5.ebuild,v 1.7 2013/09/06 23:31:43 hasufell Exp $ # do not use autotools related stuff in stable ebuilds # unless you like random breakage: 469796, 469798, 424041 @@ -12,7 +12,7 @@ inherit eutils gnome2-utils games # STABLE ARCH DESCRIPTION="Free Awale - The game of all Africa" HOMEPAGE="http://www.nongnu.org/awale/" SRC_URI="mirror://nongnu/awale/${P}.tar.gz" -SRC_URI="${SRC_URI} http://dev.gentoo.org/~hasufell/distfiles/${P}-no-autoreconf.patch.xz" # STABLE ARCH +SRC_URI="${SRC_URI} http://dev.gentoo.org/~hasufell/distfiles/${P}-no-autoreconf2.patch.xz" # STABLE ARCH LICENSE="GPL-2" SLOT="0" @@ -23,7 +23,7 @@ RDEPEND="tk? ( dev-lang/tcl dev-lang/tk )" src_prepare() { epatch "${FILESDIR}"/${P}-build.patch - epatch "${DISTDIR}"/${P}-no-autoreconf.patch.xz # STABLE ARCH + epatch "${DISTDIR}"/${P}-no-autoreconf2.patch.xz # STABLE ARCH mv src/xawale.tcl src/xawale.tcl.in || die # mv configure.in configure.ac || die # UNSTABLE ARCH diff --git a/games-board/awale/files/awale-1.5-build.patch b/games-board/awale/files/awale-1.5-build.patch index 39d1239d87cd..0e8ca136a410 100644 --- a/games-board/awale/files/awale-1.5-build.patch +++ b/games-board/awale/files/awale-1.5-build.patch @@ -66,16 +66,16 @@ Subject: build system +# let user specify desktopdir +AC_ARG_WITH([desktopdir], + [AS_HELP_STRING([--with-desktopdir=DIR], -+ [path where desktop files get installed (default: share/applications)])], ++ [path where desktop files get installed (default: $datadir/applications)])], + [DESKTOPFILESDIR="$withval"], -+ [DESKTOPFILESDIR="$datadir/applications"]) ++ [DESKTOPFILESDIR='$(datadir)/applications']) + +# let user specify iconsdir +AC_ARG_WITH([iconsdir], + [AS_HELP_STRING([--with-iconsdir=DIR], -+ [path where icons get installed (default: datadir/pixmaps)])], ++ [path where icons get installed (default: $datadir/pixmaps)])], + [ICONSDIR="$withval"], -+ [ICONSDIR="$datadir/pixmaps"]) ++ [ICONSDIR='$(datadir)/pixmaps']) + +# configure-switch for tkgui +AC_ARG_ENABLE([tk], |