From 10c95c2ab680ec52746170bcfbd112fdf6fe8f57 Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Sat, 30 Jan 2010 08:08:06 +0000 Subject: Skip install of combine.pl (bug #236205) Package-Manager: portage-2.1.7.16/cvs/Linux i686 --- games-server/crossfire-server/ChangeLog | 8 ++++++-- games-server/crossfire-server/Manifest | 4 ++-- games-server/crossfire-server/crossfire-server-1.11.0.ebuild | 5 +++-- 3 files changed, 11 insertions(+), 6 deletions(-) (limited to 'games-server/crossfire-server') diff --git a/games-server/crossfire-server/ChangeLog b/games-server/crossfire-server/ChangeLog index 42af73892ba0..b96efe3d9881 100644 --- a/games-server/crossfire-server/ChangeLog +++ b/games-server/crossfire-server/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-server/crossfire-server -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/ChangeLog,v 1.14 2009/12/31 01:00:29 mr_bones_ Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/ChangeLog,v 1.15 2010/01/30 08:08:06 mr_bones_ Exp $ + + 30 Jan 2010; Michael Sterrett + crossfire-server-1.11.0.ebuild: + Skip install of combine.pl (bug #236205) 31 Dec 2009; Michael Sterrett crossfire-server-1.11.0.ebuild: diff --git a/games-server/crossfire-server/Manifest b/games-server/crossfire-server/Manifest index f42c730d1dfa..4eca7ba28005 100644 --- a/games-server/crossfire-server/Manifest +++ b/games-server/crossfire-server/Manifest @@ -2,7 +2,7 @@ DIST crossfire-1.11.0.maps.tar.gz 24675542 RMD160 4defb41bed63c87d92840c9cc13004 DIST crossfire-1.11.0.tar.gz 6302656 RMD160 c71c429896ccfecc98b5f52559377bb01b33c1c0 SHA1 5ba3f6e8ac39f7d02cf2d133ed6069c789502c25 SHA256 ad259903d37ddecbfc69507f01e5bfcf5c3f847fd22e711b1cc7df2d47ad222c DIST crossfire-1.9.0.maps.tar.gz 4682531 RMD160 5f49bcbe357c98131d31bb278240c212a134aca7 SHA1 a0ce915d72cf0ff5ace45717e5f82207cfeee6eb SHA256 815a8106777e36cb9e7c5a4ed6b64072b3e6cfc8b90930d40715c79c3fd61c26 DIST crossfire-1.9.0.tar.gz 5317109 RMD160 6069e1d566a738c73756096240694d8f62ab8ce4 SHA1 7f8ef84f4d465736fc854b4be4e32f39ed415eaf SHA256 c88887bbc3437032e79d4bc0304195418aa0837d24f22966ecd01857622299b7 -EBUILD crossfire-server-1.11.0.ebuild 1264 RMD160 bbed669f330a2b764d915aa48ffa12db0f38383a SHA1 feb5235fb97fe2ebcb3bf752ef9e4afcc5f49320 SHA256 e8909adbd4aef286db3804e8697bd1721a5b7647f9290b22caff1bb79d2f60df +EBUILD crossfire-server-1.11.0.ebuild 1319 RMD160 10b0246b676ee26c7b650b3e69e4307ac068a77c SHA1 1542ceccc99cbb53f3adeafd42719459d4f98702 SHA256 0a011868ee1cde25ab25507ea03c8d6c4f78f8da7d22ec36aeb9a6d7a81942ed EBUILD crossfire-server-1.9.0.ebuild 1178 RMD160 4e4bdfa0ce0f6721ca74cf1d6cf3e5ff550b5512 SHA1 b630e88e5a458078c02a280a86baf0760b25d063 SHA256 d62a77fb730b5d8dc029a935360cb4b15b075ede7e11a5c59b355fa6a169f919 -MISC ChangeLog 2141 RMD160 16b3bab9760f612f539cfe9c932df6d43ef805f4 SHA1 dc84f47fd178e693714d655f9740c0611b3995e6 SHA256 5145c8e429e2837e11b351ae1136314884b4ae59443ea57a6a1388789663de93 +MISC ChangeLog 2274 RMD160 63d654265f9d31936b875e4253729599da87eaf3 SHA1 73302f23363de68eeaa2d1f1e9dd090240e5d717 SHA256 887f1a69ac4831e607e23f31f897c2248817da270b69b8cdde22bf04f6eceb19 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-server/crossfire-server/crossfire-server-1.11.0.ebuild b/games-server/crossfire-server/crossfire-server-1.11.0.ebuild index f9009ac68d9b..dca9856d0163 100644 --- a/games-server/crossfire-server/crossfire-server-1.11.0.ebuild +++ b/games-server/crossfire-server/crossfire-server-1.11.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/crossfire-server-1.11.0.ebuild,v 1.2 2009/12/31 01:00:29 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/crossfire-server-1.11.0.ebuild,v 1.3 2010/01/30 08:08:06 mr_bones_ Exp $ EAPI=2 inherit autotools games @@ -32,6 +32,7 @@ src_prepare() { -e '/,2.5/s/,2.5/,2.6,2.5/' \ acinclude.m4 \ || die 'sed failed' + rm -f "${WORKDIR}"/maps/Info/combine.pl # bug #236205 eautoreconf } -- cgit v1.2.3-65-gdbad