mgorny      14/10/13 16:12:03

  Modified:             heroes3-demo-1.3.1a.ebuild ChangeLog
  Log:
  Support multilib providers for deps. Bump to EAPI=5.
  
  (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with 
key EFB4464E!)

Revision  Changes    Path
1.9                  games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild?rev=1.9&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild?rev=1.9&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild?r1=1.8&r2=1.9

Index: heroes3-demo-1.3.1a.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- heroes3-demo-1.3.1a.ebuild  7 Sep 2014 17:45:28 -0000       1.8
+++ heroes3-demo-1.3.1a.ebuild  13 Oct 2014 16:12:03 -0000      1.9
@@ -1,6 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild,v
 1.8 2014/09/07 17:45:28 ulm Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild,v
 1.9 2014/10/13 16:12:03 mgorny Exp $
+
+EAPI=5
 
 inherit eutils unpacker games
 
@@ -19,12 +21,17 @@
 
 DEPEND="games-util/loki_patch"
 RDEPEND=">=sys-libs/lib-compat-loki-0.2
-       x86? (
-               x11-libs/libX11 )
-       ppc? (
-               x11-libs/libX11 )
-       amd64? (
-               app-emulation/emul-linux-x86-xlibs )"
+       || (
+               ppc? (
+                       x11-libs/libX11
+               )
+               !ppc? (
+                       x11-libs/libX11[abi_x86_32(-)]
+               )
+               amd64? (
+                       app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+               )
+       )"
 
 dir="${GAMES_PREFIX_OPT}/${PN}"
 QA_PREBUILT="${dir:1}/*"
@@ -46,18 +53,17 @@
 
        insinto "${dir}"
        exeinto "${dir}"
-       doins -r "${demo}"/* || die "doins ${demo} failed"
+       doins -r "${demo}"/*
        rm "${D}/${dir}"/{${exe_stub}*,*.sh} || die "rm executables failed"
-       doexe "${demo}/${exe}" || die "doexe ${exe} failed"
+       doexe "${demo}/${exe}"
 
        einfo "Linking libs provided by 'sys-libs/lib-compat-loki' to '${dir}'."
-       dosym /lib/loki_ld-linux.so.2 "${dir}"/ld-linux.so.2 || die "dosym"
-       dosym /usr/lib/loki_libc.so.6 "${dir}"/libc.so.6 || die "dosym"
-       dosym /usr/lib/loki_libnss_files.so.2 "${dir}"/libnss_files.so.2 \
-               || die "dosym"
+       dosym /lib/loki_ld-linux.so.2 "${dir}"/ld-linux.so.2
+       dosym /usr/lib/loki_libc.so.6 "${dir}"/libc.so.6
+       dosym /usr/lib/loki_libnss_files.so.2 "${dir}"/libnss_files.so.2
 
        games_make_wrapper ${PN} "./${exe}" "${dir}"
-       newicon "${demo}/icon.xpm" ${PN}.png || die "newicon icon.xpm failed"
+       newicon "${demo}/icon.xpm" ${PN}.png
        make_desktop_entry ${PN} "Heroes of Might and Magic III (Demo)" ${PN}
 
        prepgamesdirs



1.9                  games-strategy/heroes3-demo/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/heroes3-demo/ChangeLog?rev=1.9&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/heroes3-demo/ChangeLog?rev=1.9&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/heroes3-demo/ChangeLog?r1=1.8&r2=1.9

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-strategy/heroes3-demo/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ChangeLog   7 Sep 2014 17:45:28 -0000       1.8
+++ ChangeLog   13 Oct 2014 16:12:03 -0000      1.9
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/heroes3-demo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3-demo/ChangeLog,v 1.8 
2014/09/07 17:45:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/heroes3-demo/ChangeLog,v 1.9 
2014/10/13 16:12:03 mgorny Exp $
+
+  13 Oct 2014; Michał Górny <mgo...@gentoo.org> heroes3-demo-1.3.1a.ebuild:
+  Support multilib providers for deps. Bump to EAPI=5.
 
   07 Sep 2014; Ulrich Müller <u...@gentoo.org> heroes3-demo-1.3.1a.ebuild:
   Drop reverse dependencies of sys-libs/lib-compat to unstable, bug 517932.
@@ -29,4 +32,3 @@
   +heroes3-demo-1.3.1a.ebuild:
   Initial import. Ebuild by Paul Bredbury <br...@sent.com>. Closing bug
   #141746.
-




Reply via email to