| 1 |
mr_bones_ 14/07/04 06:51:01 |
| 2 |
|
| 3 |
Modified: tome-2.3.5.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
fix underlinking (bug #516264); EAPI=5 |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.8 games-roguelike/tome/tome-2.3.5.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/tome/tome-2.3.5.ebuild?rev=1.8&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/tome/tome-2.3.5.ebuild?rev=1.8&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/tome/tome-2.3.5.ebuild?r1=1.7&r2=1.8 |
| 15 |
|
| 16 |
Index: tome-2.3.5.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.3.5.ebuild,v |
| 19 |
retrieving revision 1.7 |
| 20 |
retrieving revision 1.8 |
| 21 |
diff -u -r1.7 -r1.8 |
| 22 |
--- tome-2.3.5.ebuild 28 May 2012 12:23:39 -0000 1.7 |
| 23 |
+++ tome-2.3.5.ebuild 4 Jul 2014 06:51:01 -0000 1.8 |
| 24 |
@@ -1,8 +1,8 @@ |
| 25 |
-# Copyright 1999-2012 Gentoo Foundation |
| 26 |
+# Copyright 1999-2014 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.3.5.ebuild,v 1.7 2012/05/28 12:23:39 tupone Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.3.5.ebuild,v 1.8 2014/07/04 06:51:01 mr_bones_ Exp $ |
| 30 |
|
| 31 |
-EAPI=2 |
| 32 |
+EAPI=5 |
| 33 |
inherit eutils games |
| 34 |
|
| 35 |
MY_PV=${PV//./} |
| 36 |
@@ -32,15 +32,12 @@ |
| 37 |
mv makefile.std makefile |
| 38 |
epatch "${FILESDIR}/${PV}-gentoo-paths.patch" \ |
| 39 |
"${FILESDIR}"/${P}-noX.patch |
| 40 |
- sed -i \ |
| 41 |
- -e "s:xx:x:" \ |
| 42 |
- ../lib/edit/p_info.txt |
| 43 |
- sed -i \ |
| 44 |
- -e "s:GENTOO_DIR:${GAMES_STATEDIR}:" files.c init2.c \ |
| 45 |
- || die "sed failed" |
| 46 |
+ sed -i -e '/^CC =/d' makefile || die |
| 47 |
+ sed -i -e "s:xx:x:" ../lib/edit/p_info.txt || die |
| 48 |
+ sed -i -e "s:GENTOO_DIR:${GAMES_STATEDIR}:" files.c init2.c || die |
| 49 |
|
| 50 |
- find .. -name .cvsignore -exec rm -f \{\} \; |
| 51 |
- find ../lib/edit -type f -exec chmod a-x \{\} \; |
| 52 |
+ find .. -name .cvsignore -exec rm -f \{\} + |
| 53 |
+ find ../lib/edit -type f -exec chmod a-x \{\} + |
| 54 |
} |
| 55 |
|
| 56 |
src_compile() { |
| 57 |
@@ -82,30 +79,28 @@ |
| 58 |
fi |
| 59 |
GENTOO_INCLUDES="${GENTOO_INCLUDES} -Ilua -I." |
| 60 |
GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_LUA" |
| 61 |
- make \ |
| 62 |
+ emake -j1 \ |
| 63 |
INCLUDES="${GENTOO_INCLUDES}" \ |
| 64 |
DEFINES="${GENTOO_DEFINES}" \ |
| 65 |
- depend || die "make depend failed" |
| 66 |
- emake ./tolua || die "emake ./tolua failed" |
| 67 |
+ depend |
| 68 |
+ emake ./tolua |
| 69 |
emake \ |
| 70 |
COPTS="${CFLAGS}" \ |
| 71 |
INCLUDES="${GENTOO_INCLUDES}" \ |
| 72 |
DEFINES="${GENTOO_DEFINES}" \ |
| 73 |
- LIBS="${GENTOO_LIBS}" \ |
| 74 |
+ LIBS="${GENTOO_LIBS} -lm" \ |
| 75 |
BINDIR="${GAMES_BINDIR}" \ |
| 76 |
LIBDIR="${GAMES_DATADIR}/${PN}" \ |
| 77 |
GTK_SRC_FILE="${GTK_SRC_FILE}" \ |
| 78 |
- GTK_OBJ_FILE="${GTK_OBJ_FILE}" \ |
| 79 |
- || die "emake failed" |
| 80 |
+ GTK_OBJ_FILE="${GTK_OBJ_FILE}" |
| 81 |
} |
| 82 |
|
| 83 |
src_install() { |
| 84 |
- make \ |
| 85 |
+ emake -j1 \ |
| 86 |
DESTDIR="${D}" \ |
| 87 |
OWNER="${GAMES_USER}" \ |
| 88 |
BINDIR="${GAMES_BINDIR}" \ |
| 89 |
- LIBDIR="${GAMES_DATADIR}/${PN}" install \ |
| 90 |
- || die "make install failed" |
| 91 |
+ LIBDIR="${GAMES_DATADIR}/${PN}" install |
| 92 |
cd .. |
| 93 |
dodoc *.txt |
| 94 |
|
| 95 |
|
| 96 |
|
| 97 |
|
| 98 |
1.36 games-roguelike/tome/ChangeLog |
| 99 |
|
| 100 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/tome/ChangeLog?rev=1.36&view=markup |
| 101 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/tome/ChangeLog?rev=1.36&content-type=text/plain |
| 102 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/tome/ChangeLog?r1=1.35&r2=1.36 |
| 103 |
|
| 104 |
Index: ChangeLog |
| 105 |
=================================================================== |
| 106 |
RCS file: /var/cvsroot/gentoo-x86/games-roguelike/tome/ChangeLog,v |
| 107 |
retrieving revision 1.35 |
| 108 |
retrieving revision 1.36 |
| 109 |
diff -u -r1.35 -r1.36 |
| 110 |
--- ChangeLog 28 May 2012 12:23:39 -0000 1.35 |
| 111 |
+++ ChangeLog 4 Jul 2014 06:51:01 -0000 1.36 |
| 112 |
@@ -1,6 +1,9 @@ |
| 113 |
# ChangeLog for games-roguelike/tome |
| 114 |
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 115 |
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/ChangeLog,v 1.35 2012/05/28 12:23:39 tupone Exp $ |
| 116 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 117 |
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/ChangeLog,v 1.36 2014/07/04 06:51:01 mr_bones_ Exp $ |
| 118 |
+ |
| 119 |
+ 04 Jul 2014; Michael Sterrett <mr_bones_@g.o> tome-2.3.5.ebuild: |
| 120 |
+ fix underlinking (bug #516264); EAPI=5 |
| 121 |
|
| 122 |
28 May 2012; Tupone Alfredo <tupone@g.o> tome-2.3.5.ebuild, |
| 123 |
+files/tome-2.3.5-noX.patch, -files/tome-2.3.5-overflow.patch: |
Archives