[gentoo-commits] repo/gentoo:master commit in: games-arcade/openmortal/files/, games-arcade/openmortal/

[Michael Sterrett]

commit:     1b59cc3e262e449fa01587cb2b411a48cc14247b
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 05:43:31 2015 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 05:43:44 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b59cc3e

tidy; keep up with freetype's shifting headers (bug #562734)

Package-Manager: portage-2.2.20.1

 games-arcade/openmortal/files/openmortal-0.7-freetype.patch | 10 +++++-----
 games-arcade/openmortal/files/openmortal-0.7-gcc41.patch    |  4 ++--
 games-arcade/openmortal/openmortal-0.7-r1.ebuild            |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/games-arcade/openmortal/files/openmortal-0.7-freetype.patch 
b/games-arcade/openmortal/files/openmortal-0.7-freetype.patch
index 4000ca3..3a342c8 100644
--- a/games-arcade/openmortal/files/openmortal-0.7-freetype.patch
+++ b/games-arcade/openmortal/files/openmortal-0.7-freetype.patch
@@ -1,5 +1,5 @@
---- openmortal-0.7/src/sge_tt_text.cpp.old     2014-04-04 21:35:37.275483286 
+0300
-+++ openmortal-0.7/src/sge_tt_text.cpp 2014-04-04 21:36:08.065359870 +0300
+--- openmortal-0.7/src/sge_tt_text.cpp.old
++++ openmortal-0.7/src/sge_tt_text.cpp
 @@ -37,9 +37,9 @@
  
  #ifndef _SGE_NOTTF
@@ -7,9 +7,9 @@
 -#include <freetype/freetype.h>
 -#include <freetype/ftoutln.h>
 -#include <freetype/ttnameid.h>
-+#include <freetype.h>
-+#include <ftoutln.h>
-+#include <ttnameid.h>
++#include FT_FREETYPE_H
++#include FT_OUTLINE_H
++#include FT_TRUETYPE_IDS_H
  
  /* The structure used to hold glyph information (cached) */
  struct glyph {

diff --git a/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch 
b/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch
index fdba61c..1c10ce2 100644
--- a/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch
+++ b/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch
@@ -1,5 +1,5 @@
---- src/OnlineChat.cpp.old     2006-01-28 14:34:42.000000000 -0700
-+++ src/OnlineChat.cpp 2006-01-28 14:34:53.000000000 -0700
+--- src/OnlineChat.cpp.old
++++ src/OnlineChat.cpp
 @@ -56,7 +56,7 @@
  class CChallengeMenu: public Menu
  {

diff --git a/games-arcade/openmortal/openmortal-0.7-r1.ebuild 
b/games-arcade/openmortal/openmortal-0.7-r1.ebuild
index c24d9f4..9dcc163 100644
--- a/games-arcade/openmortal/openmortal-0.7-r1.ebuild
+++ b/games-arcade/openmortal/openmortal-0.7-r1.ebuild
@@ -21,20 +21,20 @@ DEPEND="media-libs/libsdl[video]
        media-libs/sdl-net
        >=media-libs/freetype-2.4.0
        dev-lang/perl"
-RDEPEND="${DEPEND}"
+RDEPEND=${DEPEND}
 
 src_prepare() {
        epatch \
                "${FILESDIR}/${P}"-gcc41.patch \
                "${FILESDIR}/${P}"-freetype.patch
-
+       mv configure.{in,ac} || die
        eautoreconf
 }
 
 src_install() {
-       emake DESTDIR="${D}" install
+       DOCS="AUTHORS ChangeLog README TODO" \
+               default
        newicon data/gfx/icon.png ${PN}.png
        make_desktop_entry ${PN} OpenMortal
-       dodoc AUTHORS ChangeLog README TODO
        prepgamesdirs
 }