mgorny 14/10/13 16:22:19 Modified: dominions2-2.16.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.12 games-strategy/dominions2/dominions2-2.16.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/dominions2/dominions2-2.16.ebuild?rev=1.12&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/dominions2/dominions2-2.16.ebuild?rev=1.12&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/dominions2/dominions2-2.16.ebuild?r1=1.11&r2=1.12 Index: dominions2-2.16.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-strategy/dominions2/dominions2-2.16.ebuild,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- dominions2-2.16.ebuild 4 May 2014 18:40:15 -0000 1.11 +++ dominions2-2.16.ebuild 13 Oct 2014 16:22:19 -0000 1.12 @@ -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/dominions2/dominions2-2.16.ebuild,v 1.11 2014/05/04 18:40:15 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/dominions2-2.16.ebuild,v 1.12 2014/10/13 16:22:19 mgorny Exp $ + +EAPI=5 inherit eutils cdrom games @@ -24,12 +26,24 @@ IUSE="doc" RESTRICT="bindist strip" -DEPEND="virtual/opengl - virtual/glu - x86? ( media-libs/libsdl ) - ppc? ( media-libs/libsdl ) - amd64? ( app-emulation/emul-linux-x86-xlibs - app-emulation/emul-linux-x86-sdl )" +DEPEND=" + || ( + ppc? ( + media-libs/libsdl + virtual/opengl + virtual/glu + ) + !ppc? ( + media-libs/libsdl[abi_x86_32(-)] + virtual/opengl[abi_x86_32(-)] + virtual/glu[abi_x86_32(-)] + ) + amd64? ( + app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] + app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] + app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] + ) + )" RDEPEND="${DEPEND}" dir=${GAMES_PREFIX_OPT}/${PN} @@ -54,23 +68,22 @@ exeinto "${dir}" if use amd64 || use x86 then - doexe "${CDROM_ROOT}"/bin_lin/x86/dom2* || die "doexe failed" + doexe "${CDROM_ROOT}"/bin_lin/x86/dom2* elif use ppc then - doexe "${CDROM_ROOT}"/bin_lin/ppc/dom2* || die "doexe failed" + doexe "${CDROM_ROOT}"/bin_lin/ppc/dom2* fi insinto "${dir}" - doins -r "${CDROM_ROOT}"/dominions2.app/Contents/Resources/* || \ - die "doins failed" - dodoc "${CDROM_ROOT}"/doc/* || die "dodoc failed" + doins -r "${CDROM_ROOT}"/dominions2.app/Contents/Resources/* + dodoc "${CDROM_ROOT}"/doc/* # applying the official patches just means overwriting some important # files with their more recent versions: einfo "Applying patch for version ${PV}..." - dodoc "${S}"/patch/doc/* || die "dodoc failed" - doexe "${S}"/patch/dom2 || die "doexe failed" + dodoc "${S}"/patch/doc/* + doexe "${S}"/patch/dom2 rm -rf "${S}"/patch/doc/ "${S}"/patch/dom2 || die "rm failed" - doins -r "${S}"/patch/* || die "doins failed" + doins -r "${S}"/patch/* if use doc; then elog "" 1.12 games-strategy/dominions2/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/dominions2/ChangeLog?rev=1.12&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/dominions2/ChangeLog?rev=1.12&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/dominions2/ChangeLog?r1=1.11&r2=1.12 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-strategy/dominions2/ChangeLog,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ChangeLog 4 May 2014 18:40:15 -0000 1.11 +++ ChangeLog 13 Oct 2014 16:22:19 -0000 1.12 @@ -1,6 +1,9 @@ # ChangeLog for games-strategy/dominions2 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/ChangeLog,v 1.11 2014/05/04 18:40:15 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2/ChangeLog,v 1.12 2014/10/13 16:22:19 mgorny Exp $ + + 13 Oct 2014; Michał Górny <mgo...@gentoo.org> dominions2-2.16.ebuild: + Support multilib providers for deps. Bump to EAPI=5. 04 May 2014; Ulrich Müller <u...@gentoo.org> dominions2-2.16.ebuild: Change LICENSE to all-rights-reserved, add bindist restriction, bug 505758. @@ -41,4 +44,3 @@ +dominions2-2.16.ebuild: Initial import. Ebuild by Alex Linke <incubation...@freenet.de> and modified by me. Tested on amd64 and x86. Closing bug #36706. -
