mgorny 14/10/13 10:36:57 Modified: rune-1.07-r2.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.13 games-action/rune/rune-1.07-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/rune/rune-1.07-r2.ebuild?rev=1.13&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/rune/rune-1.07-r2.ebuild?rev=1.13&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/rune/rune-1.07-r2.ebuild?r1=1.12&r2=1.13 Index: rune-1.07-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-action/rune/rune-1.07-r2.ebuild,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- rune-1.07-r2.ebuild 7 Sep 2014 09:14:12 -0000 1.12 +++ rune-1.07-r2.ebuild 13 Oct 2014 10:36:57 -0000 1.13 @@ -1,8 +1,8 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/rune/rune-1.07-r2.ebuild,v 1.12 2014/09/07 09:14:12 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/rune/rune-1.07-r2.ebuild,v 1.13 2014/10/13 10:36:57 mgorny Exp $ -EAPI=2 +EAPI=5 inherit eutils cdrom games DESCRIPTION="Viking hack and slay game" @@ -15,15 +15,20 @@ IUSE="" RESTRICT="strip" -RDEPEND="virtual/opengl - dev-util/xdelta:0 - x86? ( - x11-libs/libX11 - x11-libs/libXext - >=media-libs/libsdl-1.2.9-r1 ) - amd64? ( - app-emulation/emul-linux-x86-xlibs - app-emulation/emul-linux-x86-sdl )" +RDEPEND="dev-util/xdelta:0 + || ( + ( + >=media-libs/libsdl-1.2.9-r1[abi_x86_32(-)] + x11-libs/libXext[abi_x86_32(-)] + x11-libs/libX11[abi_x86_32(-)] + virtual/opengl[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(-)] + ) + )" DEPEND="" @@ -43,7 +48,7 @@ elif [[ ${CDROM_SET} -eq 1 ]] then # unpack the runelinuxfiles.tar.gz - unpack ${A} || die "Could not unpack rune-all-0.1.tar.bz2" + unpack ${A} fi } @@ -56,28 +61,25 @@ 0) for x in Help Maps Meshes Sounds System Textures Web do - doins -r $x || die "copying $x" + doins -r $x done # copy linux specific files - doins -r "${CDROM_ROOT}"/System \ - || die "Could not copy Linux specific files" + doins -r "${CDROM_ROOT}"/System # the most important things: rune and ucc :) - doexe "${CDROM_ROOT}"/bin/x86/rune \ - || die "Could not install rune executable" - fperms 750 "${dir}"/System/{ucc{,-bin},rune-bin} \ - || die "Could not make executables executable" + doexe "${CDROM_ROOT}"/bin/x86/rune + fperms 750 "${dir}"/System/{ucc{,-bin},rune-bin} # installing documentation/icon - dodoc "${CDROM_ROOT}"/{README,CREDITS} || die "Could not dodoc README.linux" - newicon "${CDROM_ROOT}"/icon.xpm rune.xpm || die "Could not copy pixmap" + dodoc "${CDROM_ROOT}"/{README,CREDITS} + newicon "${CDROM_ROOT}"/icon.xpm rune.xpm ;; 1) # copying Maps Sounds and Web for x in Maps Sounds Web do - doins -r "${CDROM_ROOT}"/$x || die "copying $x" + doins -r "${CDROM_ROOT}"/$x done # copying the texture files @@ -89,21 +91,21 @@ || die "modifying and copying $x" done - doins -r "${S}"/System || die "Could not copy Linux specific files" - doins -r "${S}"/Help || die "Could not copy Help data" + doins -r "${S}"/System + doins -r "${S}"/Help sed -e "s:.*\(\w+/\w+\)\w:\1:" for x in $(ls "${S}"/patch/{System,Maps,Meshes} |sed -e \ "s:.*/\([^/]\+/[^/]\+\).patch$:\1:") do xdelta patch "${S}"/patch/${x}.patch "${CDROM_ROOT}"/${x} "${S}"/patch/${x} - doins "${S}"/patch/${x} || die "Could not copy Patch data" + doins "${S}"/patch/${x} done insinto "${dir}"/System # copying system files from the Windows CD for x in "${CDROM_ROOT}"/System/*.{int,u,url}; do - doins $x || die "copying $x" + doins $x done # modify the files @@ -120,13 +122,12 @@ rm "${Ddir}"/System/{Setup.int,SGLDrv.int,MeTaLDrv.int,Manifest.int,D3DDrv.int,Galaxy.int,SoftDrv.int,WinDrv.int,Window.int} || die "Could not delete not needed System files" # the most important things: rune and ucc :) - doexe "${S}"/bin/x86/rune || die "Could not install rune executable" - fperms 750 "${dir}"/System/{ucc,ucc-bin,rune-bin} \ - || die "Could not make executables executable" + doexe "${S}"/bin/x86/rune + fperms 750 "${dir}"/System/{ucc,ucc-bin,rune-bin} # installing documentation/icon - dodoc "${S}"/{README,CREDITS} || die "Could not dodoc README.linux" - doicon "${S}"/rune.xpm rune.xpm || die "Could not copy pixmap" + dodoc "${S}"/{README,CREDITS} + doicon "${S}"/rune.xpm rune.xpm ;; esac 1.22 games-action/rune/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/rune/ChangeLog?rev=1.22&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/rune/ChangeLog?rev=1.22&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/rune/ChangeLog?r1=1.21&r2=1.22 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-action/rune/ChangeLog,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- ChangeLog 7 Sep 2014 09:14:12 -0000 1.21 +++ ChangeLog 13 Oct 2014 10:36:57 -0000 1.22 @@ -1,6 +1,9 @@ # ChangeLog for games-action/rune # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/rune/ChangeLog,v 1.21 2014/09/07 09:14:12 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/rune/ChangeLog,v 1.22 2014/10/13 10:36:57 mgorny Exp $ + + 13 Oct 2014; Michał Górny <[email protected]> rune-1.07-r2.ebuild: + Support multilib providers for deps. Bump to EAPI=5. 07 Sep 2014; Ulrich Müller <[email protected]> rune-1.07-r2.ebuild: QA: Remove unnecessary dependency on emul-linux-x86-compat, bug 522152. @@ -84,4 +87,3 @@ +rune-1.07.ebuild: Initial import. Original ebuild by Patrick Zimmermann <[email protected]> and modified by me. Closing bug #41732. -
