diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2013-01-31 15:30:42 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2013-01-31 15:30:42 +0000 |
| commit | f5832ab47b69bfb423adaebbfecf393d3065af0e (patch) | |
| tree | 98e7bb3f2ed7efb46488a41113a46b2148327726 /games-engines/residualvm | |
| parent | Version bump to mirall-1.2.0. Punt older. (diff) | |
| download | gentoo-2-f5832ab47b69bfb423adaebbfecf393d3065af0e.tar.gz gentoo-2-f5832ab47b69bfb423adaebbfecf393d3065af0e.tar.bz2 gentoo-2-f5832ab47b69bfb423adaebbfecf393d3065af0e.zip | |
fix build under EE locale
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'games-engines/residualvm')
| -rw-r--r-- | games-engines/residualvm/ChangeLog | 6 | ||||
| -rw-r--r-- | games-engines/residualvm/files/residualvm-0.1.0-EE.patch | 42 | ||||
| -rw-r--r-- | games-engines/residualvm/residualvm-0.1.0.ebuild | 6 |
3 files changed, 52 insertions, 2 deletions
diff --git a/games-engines/residualvm/ChangeLog b/games-engines/residualvm/ChangeLog index 5bd4b71bf153..5c04f6af0b33 100644 --- a/games-engines/residualvm/ChangeLog +++ b/games-engines/residualvm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-engines/residualvm # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/residualvm/ChangeLog,v 1.1 2013/01/14 18:35:28 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/residualvm/ChangeLog,v 1.2 2013/01/31 15:30:42 hasufell Exp $ + + 31 Jan 2013; Julian Ospald <hasufell@gentoo.org> residualvm-0.1.0.ebuild, + +files/residualvm-0.1.0-EE.patch: + fix build under EE locale *residualvm-0.1.0 (14 Jan 2013) diff --git a/games-engines/residualvm/files/residualvm-0.1.0-EE.patch b/games-engines/residualvm/files/residualvm-0.1.0-EE.patch new file mode 100644 index 000000000000..5a12b54ecc20 --- /dev/null +++ b/games-engines/residualvm/files/residualvm-0.1.0-EE.patch @@ -0,0 +1,42 @@ +--- config.guess ++++ config.guess +@@ -855,7 +855,7 @@ + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland +- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu ++ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[:upper:]' '[:lower:]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix +@@ -955,7 +955,7 @@ + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level +- case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in ++ case `grep '^cpu[^[:lower:]]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; +--- configure ++++ configure +@@ -3395,8 +3395,8 @@ + if test -z "$_freetypeconfig"; then + _freetype2=no + else +- FREETYPE2_LIBS=`$_freetypeconfig --prefix="$_freetypepath" --libs` +- FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$_freetypepath" --cflags` ++ FREETYPE2_LIBS=`pkg-config --libs freetype2 2>/dev/null || $_freetypeconfig --prefix="$_freetypepath" --libs` ++ FREETYPE2_CFLAGS=`pkg-config --cflags freetype2 2>/dev/null || $_freetypeconfig --prefix="$_freetypepath" --cflags` + + if test "$_freetype2" = "auto"; then + _freetype2=no +@@ -3848,7 +3848,7 @@ + fi + + # Save the settings +- defname="ENABLE_`echo $engine | tr '[a-z]' '[A-Z]'`" ++ defname="ENABLE_`echo $engine | tr '[:lower:]' '[:upper:]'`" + if test "$isbuilt" = "no" ; then + add_line_to_config_mk "# $defname" + else diff --git a/games-engines/residualvm/residualvm-0.1.0.ebuild b/games-engines/residualvm/residualvm-0.1.0.ebuild index 73902e0f625b..d26261bd1c7e 100644 --- a/games-engines/residualvm/residualvm-0.1.0.ebuild +++ b/games-engines/residualvm/residualvm-0.1.0.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-engines/residualvm/residualvm-0.1.0.ebuild,v 1.1 2013/01/14 18:35:28 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/residualvm/residualvm-0.1.0.ebuild,v 1.2 2013/01/31 15:30:42 hasufell Exp $ EAPI=5 inherit eutils toolchain-funcs gnome2-utils games @@ -25,6 +25,10 @@ RDEPEND=" virtual/opengl" DEPEND="${RDEPEND}" +src_prepare() { + epatch "${FILESDIR}"/${P}-EE.patch +} + src_configure() { # not an autotools script # most configure options currently do nothing, recheck on version bump !!! |