diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2008-04-11 15:46:03 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2008-04-11 15:46:03 +0000 |
| commit | 4c108a12e3c22f0199583686de0cb5ff10b9182b (patch) | |
| tree | e68b7aab888d9184d5e7b059a08779a918906d75 /games-action | |
| parent | Mark amd64 stable #211127. (diff) | |
| download | gentoo-2-4c108a12e3c22f0199583686de0cb5ff10b9182b.tar.gz gentoo-2-4c108a12e3c22f0199583686de0cb5ff10b9182b.tar.bz2 gentoo-2-4c108a12e3c22f0199583686de0cb5ff10b9182b.zip | |
Fixing merge problems with a patch from Tomáš Chvátal <tomas.chvatal@gmail.com> and closing bug #215332.
(Portage version: 2.1.4.4)
Diffstat (limited to 'games-action')
| -rw-r--r-- | games-action/abuse/ChangeLog | 6 | ||||
| -rw-r--r-- | games-action/abuse/abuse-0.7.1.ebuild | 13 |
2 files changed, 16 insertions, 3 deletions
diff --git a/games-action/abuse/ChangeLog b/games-action/abuse/ChangeLog index 98174ffbd1bd..00cc60f03aa7 100644 --- a/games-action/abuse/ChangeLog +++ b/games-action/abuse/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-action/abuse # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/abuse/ChangeLog,v 1.4 2008/03/07 17:11:26 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/abuse/ChangeLog,v 1.5 2008/04/11 15:46:03 wolf31o2 Exp $ + + 11 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org> abuse-0.7.1.ebuild: + Fixing merge problems with a patch from Tomáš Chvátal + <tomas.chvatal@gmail.com> and closing bug #215332. 07 Mar 2008; Michael Sterrett <mr_bones_@gentoo.org> abuse-0.7.1.ebuild: revert previous change which was broken diff --git a/games-action/abuse/abuse-0.7.1.ebuild b/games-action/abuse/abuse-0.7.1.ebuild index c22f5a6fe8c1..fabc689d9d0a 100644 --- a/games-action/abuse/abuse-0.7.1.ebuild +++ b/games-action/abuse/abuse-0.7.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/abuse/abuse-0.7.1.ebuild,v 1.5 2008/03/12 21:39:28 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/abuse/abuse-0.7.1.ebuild,v 1.6 2008/04/11 15:46:03 wolf31o2 Exp $ inherit eutils games @@ -23,6 +23,15 @@ RDEPEND=">=media-libs/libsdl-1.1.6" DEPEND="${RDEPEND} x11-libs/libXt virtual/opengl" +src_unpack() { + unpack ${A} + #fix placing additional patches + cp -rf "${WORKDIR}"/abuse-frabs-2.11/{addon,art,levels,lisp,music,netlevel,register} "${WORKDIR}" + cp -rf "${WORKDIR}"/abuse-lib-2.00.orig/unpacked/{addon,art,levels,lisp,abuse.lsp} "${WORKDIR}" + cp -rf "${WORKDIR}"/abuse-sfx-2.00.orig/sfx "${WORKDIR}" + rm -rf "${WORKDIR}"/abuse-frabs-2.11/ "${WORKDIR}"/abuse-lib-2.00.orig/ "${WORKDIR}"/abuse-sfx-2.00.orig/ + cd ${S} +} src_compile() { # Abuse auto-appends games, so point to the base @@ -38,7 +47,7 @@ src_install() { # Data install insinto "${GAMES_DATADIR}"/abuse doins -r "${WORKDIR}"/{addon,art,levels,lisp,music,netlevel,register,sfx} \ - "${WORKDIR}"/README.datafiles "${WORKDIR}"/abuse.lsp \ + "${WORKDIR}"/abuse.lsp \ || die "doins failed" # Icons/desktop entry |