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 | d61c1d8cde0cb26d2a911157e75a1060718ef31f (patch) | |
| tree | 3c220f5d134fe23701bee1f1b7fc122eff11a65e /games-action | |
| parent | Mark amd64 stable #211127. (diff) | |
| download | historical-d61c1d8cde0cb26d2a911157e75a1060718ef31f.tar.gz historical-d61c1d8cde0cb26d2a911157e75a1060718ef31f.tar.bz2 historical-d61c1d8cde0cb26d2a911157e75a1060718ef31f.zip | |
Fixing merge problems with a patch from Tomáš Chvátal <tomas.chvatal@gmail.com> and closing bug #215332.
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'games-action')
| -rw-r--r-- | games-action/abuse/ChangeLog | 6 | ||||
| -rw-r--r-- | games-action/abuse/Manifest | 4 | ||||
| -rw-r--r-- | games-action/abuse/abuse-0.7.1.ebuild | 13 |
3 files changed, 18 insertions, 5 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/Manifest b/games-action/abuse/Manifest index c6ed676d62c7..201e137c7272 100644 --- a/games-action/abuse/Manifest +++ b/games-action/abuse/Manifest @@ -3,6 +3,6 @@ DIST abuse-data-2.00.tar.gz 1997832 RMD160 3fe70dd5134f8ae77c630a44d38a1d37e7b53 DIST abuse-frabs-2.11.tar.gz 4819133 RMD160 96ea6ef031d10ba02e070eb7d2acdbc85025024f SHA1 2699f2f4cefc5e529eec808e8208aad796de36de SHA256 6ccbdf4a754bbacd7c07b09f4f0c805bef39d3a537aadbb0cd4d06ad50acfdb8 DIST abuse-lib-2.00.tar.gz 2144433 RMD160 813a33cf1a6e25cffabc77907aee00307c2ca56b SHA1 9eb34ab24f01008da31f034dc46ade7de2f8ff82 SHA256 263997a5e4ea70ac3d187de824c09b9a6b4ce778bbec5d8cf8372c54b34b81df DIST abuse-sfx-2.00.tar.gz 690291 RMD160 4eab7e003307205c2477a547c3824bf80ce73dda SHA1 2b396164ce3f70605d669511385a667bf2730c8b SHA256 042af3e5ae2b0d402593d375c31d643d91da9e83180e8971d563c0878f570c60 -EBUILD abuse-0.7.1.ebuild 1506 RMD160 175c11e215c6a6c9a270e706d2aff1ba4b01373c SHA1 1cc55972ec2c1b98c512ab96332454f015d6cdb3 SHA256 2f75a0ae1f88a7226fd824a829a94577b08fa01652575c03f9921fe8bf94275d -MISC ChangeLog 3885 RMD160 14195aabfb3959eefacfd2cdd6e1841f47833bd2 SHA1 be5debe9373e0dc9b266df3d2fdd92af9b04726c SHA256 35eb5b576d32b4c8a0db075a651815e814a0a517182a2a8aff027fff7b35e7f0 +EBUILD abuse-0.7.1.ebuild 1908 RMD160 14424be469c04dabc08e12a6a223f9c890557f22 SHA1 72874b399a46e727e190d45576db8783e434fe1d SHA256 c7a69d59c0fcd14151f7f2851dbe59a90870f18743fc33616b3974a08f486ab3 +MISC ChangeLog 4071 RMD160 7ff372ad21e0417f00ac89f40646c2ee68864bb1 SHA1 c5dc2f0048e4aff2d9a7de7e6506a8acac34e3ce SHA256 029a6a29329382a946377592fd98ace8e47b9e8881712e410548e344c3c884a9 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 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 |