mgorny 14/10/13 16:41:00
Modified: darwinia-1.3.0.ebuild darwinia-1.4.0_beta9.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.18 games-strategy/darwinia/darwinia-1.3.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/darwinia/darwinia-1.3.0.ebuild?rev=1.18&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/darwinia/darwinia-1.3.0.ebuild?rev=1.18&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/darwinia/darwinia-1.3.0.ebuild?r1=1.17&r2=1.18
Index: darwinia-1.3.0.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/games-strategy/darwinia/darwinia-1.3.0.ebuild,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- darwinia-1.3.0.ebuild 7 Sep 2014 15:36:20 -0000 1.17
+++ darwinia-1.3.0.ebuild 13 Oct 2014 16:41:00 -0000 1.18
@@ -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/darwinia/darwinia-1.3.0.ebuild,v 1.17
2014/09/07 15:36:20 ulm Exp $
+# $Header:
/var/cvsroot/gentoo-x86/games-strategy/darwinia/darwinia-1.3.0.ebuild,v 1.18
2014/10/13 16:41:00 mgorny Exp $
+
+EAPI=5
CDROM_OPTIONAL="yes"
inherit eutils unpacker cdrom games
@@ -17,15 +19,20 @@
RDEPEND="
~virtual/libstdc++-3.3
- x86? (
- virtual/opengl
- virtual/glu
- media-libs/libsdl
- media-libs/libvorbis )
- amd64? (
- app-emulation/emul-linux-x86-xlibs
- app-emulation/emul-linux-x86-medialibs
- app-emulation/emul-linux-x86-sdl )"
+ || (
+ (
+ media-libs/libsdl[abi_x86_32(-)]
+ media-libs/libvorbis[abi_x86_32(-)]
+ virtual/glu[abi_x86_32(-)]
+ virtual/opengl[abi_x86_32(-)]
+ )
+ amd64? (
+ app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+ 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(-)]
+ )
+ )"
S=${WORKDIR}
@@ -41,17 +48,16 @@
exeinto "${dir}"/lib
doins lib/{language,patch}.dat
- doexe lib/darwinia.bin.x86 lib/open-www.sh || die "copying executables"
+ doexe lib/darwinia.bin.x86 lib/open-www.sh
exeinto "${dir}"
- doexe bin/Linux/x86/darwinia || die "couldn't do exe"
+ doexe bin/Linux/x86/darwinia
if use cdinstall ; then
- doins "${CDROM_ROOT}"/gamefiles/{main,sounds}.dat \
- || die "couldn't copy data files"
+ doins "${CDROM_ROOT}"/gamefiles/{main,sounds}.dat
fi
- dodoc README || die "no reading"
+ dodoc README
newicon darwinian.png darwinia.png
games_make_wrapper darwinia ./darwinia "${dir}" "${dir}"
1.16 games-strategy/darwinia/darwinia-1.4.0_beta9.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/darwinia/darwinia-1.4.0_beta9.ebuild?rev=1.16&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/darwinia/darwinia-1.4.0_beta9.ebuild?rev=1.16&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/darwinia/darwinia-1.4.0_beta9.ebuild?r1=1.15&r2=1.16
Index: darwinia-1.4.0_beta9.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/games-strategy/darwinia/darwinia-1.4.0_beta9.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- darwinia-1.4.0_beta9.ebuild 7 Sep 2014 15:36:20 -0000 1.15
+++ darwinia-1.4.0_beta9.ebuild 13 Oct 2014 16:41:00 -0000 1.16
@@ -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/darwinia/darwinia-1.4.0_beta9.ebuild,v
1.15 2014/09/07 15:36:20 ulm Exp $
+# $Header:
/var/cvsroot/gentoo-x86/games-strategy/darwinia/darwinia-1.4.0_beta9.ebuild,v
1.16 2014/10/13 16:41:00 mgorny Exp $
+
+EAPI=5
CDROM_OPTIONAL="yes"
inherit eutils unpacker cdrom games
@@ -18,15 +20,20 @@
RDEPEND="
~virtual/libstdc++-3.3
- x86? (
- virtual/opengl
- virtual/glu
- media-libs/libsdl
- media-libs/libvorbis )
- amd64? (
- app-emulation/emul-linux-x86-xlibs
- app-emulation/emul-linux-x86-medialibs
- app-emulation/emul-linux-x86-sdl )"
+ || (
+ (
+ media-libs/libsdl[abi_x86_32(-)]
+ media-libs/libvorbis[abi_x86_32(-)]
+ virtual/glu[abi_x86_32(-)]
+ virtual/opengl[abi_x86_32(-)]
+ )
+ amd64? (
+ app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+ 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(-)]
+ )
+ )"
S=${WORKDIR}
@@ -43,17 +50,16 @@
exeinto "${dir}"/lib
doins lib/{language,patch}.dat
- doexe lib/darwinia.bin.x86 lib/open-www.sh || die "copying executables"
+ doexe lib/darwinia.bin.x86 lib/open-www.sh
exeinto "${dir}"
- doexe bin/Linux/x86/darwinia || die "couldn't do exe"
+ doexe bin/Linux/x86/darwinia
if use cdinstall ; then
- doins "${CDROM_ROOT}"/gamefiles/{main,sounds}.dat \
- || die "couldn't copy data files"
+ doins "${CDROM_ROOT}"/gamefiles/{main,sounds}.dat
fi
- dodoc README || die "no reading"
+ dodoc README
newicon darwinian.png darwinia.png
games_make_wrapper darwinia ./darwinia "${dir}" "${dir}"
1.16 games-strategy/darwinia/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/darwinia/ChangeLog?rev=1.16&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/darwinia/ChangeLog?rev=1.16&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/darwinia/ChangeLog?r1=1.15&r2=1.16
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-strategy/darwinia/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ChangeLog 7 Sep 2014 15:36:20 -0000 1.15
+++ ChangeLog 13 Oct 2014 16:41:00 -0000 1.16
@@ -1,6 +1,10 @@
# ChangeLog for games-strategy/darwinia
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/darwinia/ChangeLog,v 1.15
2014/09/07 15:36:20 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/darwinia/ChangeLog,v 1.16
2014/10/13 16:41:00 mgorny Exp $
+
+ 13 Oct 2014; Michał Górny <mgo...@gentoo.org> darwinia-1.3.0.ebuild,
+ darwinia-1.4.0_beta9.ebuild:
+ Support multilib providers for deps. Bump to EAPI=5.
07 Sep 2014; Ulrich Müller <u...@gentoo.org> darwinia-1.3.0.ebuild,
darwinia-1.4.0_beta9.ebuild:
