diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-10-13 16:12:03 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-10-13 16:12:03 +0000 |
| commit | ce4d87fb79d01bd8050c2658c3b915d412a02035 (patch) | |
| tree | 760a7fcd7c0bd2be985148236363aa17e31375c2 | |
| parent | Add 20140929a release. Drop old. Fixes bug 522146. (diff) | |
| download | gentoo-2-ce4d87fb79d01bd8050c2658c3b915d412a02035.tar.gz gentoo-2-ce4d87fb79d01bd8050c2658c3b915d412a02035.tar.bz2 gentoo-2-ce4d87fb79d01bd8050c2658c3b915d412a02035.zip | |
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!)
| -rw-r--r-- | games-strategy/heroes3-demo/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild | 34 |
2 files changed, 24 insertions, 16 deletions
diff --git a/games-strategy/heroes3-demo/ChangeLog b/games-strategy/heroes3-demo/ChangeLog index 64a2c06f45fb..49f7ba34cf98 100644 --- a/games-strategy/heroes3-demo/ChangeLog +++ b/games-strategy/heroes3-demo/ChangeLog @@ -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 <mgorny@gentoo.org> heroes3-demo-1.3.1a.ebuild: + Support multilib providers for deps. Bump to EAPI=5. 07 Sep 2014; Ulrich Müller <ulm@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 <brebs@sent.com>. Closing bug #141746. - diff --git a/games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild b/games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild index ef86f4deb7c2..a1b7f16e2942 100644 --- a/games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild +++ b/games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild @@ -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 @@ RESTRICT="mirror bindist strip" 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 @@ src_install() { 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 |