diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2010-03-02 10:44:01 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2010-03-02 10:44:01 +0000 |
| commit | 93e0426e43c053e158be20f6dfb0733f07524d3f (patch) | |
| tree | e04912dbc81887953bd58d13a3a31c511bccd8d2 /games-strategy | |
| parent | stable x86, bug 306195 (diff) | |
| download | historical-93e0426e43c053e158be20f6dfb0733f07524d3f.tar.gz historical-93e0426e43c053e158be20f6dfb0733f07524d3f.tar.bz2 historical-93e0426e43c053e158be20f6dfb0733f07524d3f.zip | |
Do not install ELF under share. Bug #304707
Package-Manager: portage-2.1.7.16/cvs/Linux i686
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/ufo-ai/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/ufo-ai/Manifest | 5 | ||||
| -rw-r--r-- | games-strategy/ufo-ai/files/ufo-ai-2.2.1-noelfonshared.patch | 11 | ||||
| -rw-r--r-- | games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild | 11 |
4 files changed, 28 insertions, 5 deletions
diff --git a/games-strategy/ufo-ai/ChangeLog b/games-strategy/ufo-ai/ChangeLog index bef286a7b517..5db3b2392d76 100644 --- a/games-strategy/ufo-ai/ChangeLog +++ b/games-strategy/ufo-ai/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/ufo-ai # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.23 2010/02/21 15:02:22 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.24 2010/03/02 10:44:00 tupone Exp $ + + 02 Mar 2010; Tupone Alfredo <tupone@gentoo.org> ufo-ai-2.2.1.ebuild, + +files/ufo-ai-2.2.1-noelfonshared.patch: + Do not install ELF under share. Bug #304707 by flameeyes@gentoo.org 21 Feb 2010; Michael Sterrett <mr_bones_@gentoo.org> ufo-ai-2.2.1.ebuild: make_desktop_entry cleanup (bug #306193) diff --git a/games-strategy/ufo-ai/Manifest b/games-strategy/ufo-ai/Manifest index ae02b14aa6d3..9db82427728c 100644 --- a/games-strategy/ufo-ai/Manifest +++ b/games-strategy/ufo-ai/Manifest @@ -1,6 +1,7 @@ AUX ufo-ai-2.2.1-gentoo.patch 2273 RMD160 2cb17341e638a955cf6fcde610a9bbf67c3ee797 SHA1 74814edd9747de7077eaabf6c4ef2e16960126b7 SHA256 62711814268a142bb0ba304b0645735f077a5cc984c36b0f1e781a4c03759ff2 +AUX ufo-ai-2.2.1-noelfonshared.patch 436 RMD160 7382ad9ad5dd5b97cf8d448a28133ba86550f796 SHA1 fda2e8bb739f8e360584d521e04159f6e2cdeed8 SHA256 2bf2a7f038eebc230636253be2ed6321309cbab2b31fa553185c31dee23d4f7c DIST ufoai-2.2.1-data.tar 390502400 RMD160 af91dd473f59c73e705181759059bd37ba215f62 SHA1 eb071333478bd6860179e12d8655301980f87d60 SHA256 639c37867733feb5c8cf0852cee6a183c4bc6cd8e31f4c39356b275790a6bd0a DIST ufoai-2.2.1-source.tar.bz2 7640531 RMD160 980405a5d38bcbb5ae2cea4e25c54374c7dd8e99 SHA1 6ad1b8c357fdbbe9a31839b3bf8de46ad17a40eb SHA256 0c0ff8fc72038963e44ae0420eacedbd7dfe4f9115527ec3554d8c707d0d5ee5 -EBUILD ufo-ai-2.2.1.ebuild 2598 RMD160 f510ec197d22dbc0a7c77fc506f97a435063e438 SHA1 a482c3212621285e75c27d219a6c0b0e80f1cead SHA256 db9dc6837f68d854b8897cab16168832b32f6de21273da7c0391e20929026033 -MISC ChangeLog 3203 RMD160 d64b08ace74e5152bc04a3c2c3e45e688f8d849f SHA1 2fa3ca36c4b25d2b3dce34526f67633a837bf051 SHA256 2abdd5d356cd45a4bc32fd8d5b79bff1c36fdeb4230a81fea2b1c408bc0a6e12 +EBUILD ufo-ai-2.2.1.ebuild 2843 RMD160 d727b663adaa1942328ede0c0866185e076b80ed SHA1 82d71f6d30ec85d5f1e3d2713c9a32f964de5a2d SHA256 e2800a8f101b245f20457d7d0bd517c8918ecf2d760442d76d78ecb8720adfbc +MISC ChangeLog 3385 RMD160 b7527e99660bdd83e53b9930a5b2e073c6c4127e SHA1 965912fe5651dd3de8fe5481c50d7194247046db SHA256 ab4cde76c8cf6b1c4a1fed4369f2992c7412dd4db2927ee5e65fc409894b94f9 MISC metadata.xml 219 RMD160 145b5b398d86f7dfb219d32e4394ed0f1ffd5873 SHA1 485e12874a226aaf92ccbbbf5b2b1c902dd68110 SHA256 266385ce0470b911b2b3ca5fe6b237ad5dfc2d480533be5453537328a08cb2eb diff --git a/games-strategy/ufo-ai/files/ufo-ai-2.2.1-noelfonshared.patch b/games-strategy/ufo-ai/files/ufo-ai-2.2.1-noelfonshared.patch new file mode 100644 index 000000000000..18b3a7da2bd2 --- /dev/null +++ b/games-strategy/ufo-ai/files/ufo-ai-2.2.1-noelfonshared.patch @@ -0,0 +1,11 @@ +--- src/common/files.c.old 2010-03-01 09:07:30.000000000 +0100 ++++ src/common/files.c 2010-03-01 09:08:18.000000000 +0100 +@@ -894,6 +894,8 @@ + /* start up with base by default */ + FS_AddGameDirectory(va("%s/" BASEDIRNAME, fs_basedir->string)); + ++ FS_AddGameDirectory("@GAMES_LIBDIR@"); ++ + /* then add a '.ufoai/base' directory in home directory by default */ + if (fs_usehomedir->integer) + FS_AddHomeAsGameDirectory(BASEDIRNAME); diff --git a/games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild b/games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild index cdbea8ed2533..a153d4b99799 100644 --- a/games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild +++ b/games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild,v 1.6 2010/02/21 15:02:22 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild,v 1.7 2010/03/02 10:44:00 tupone Exp $ EAPI=2 inherit eutils games @@ -45,10 +45,12 @@ src_prepare() { mv "${WORKDIR}/base" "${S}" || die # Set basedir & fixes bug in finding text files - it should use fs_basedir - epatch "${FILESDIR}"/${P}-gentoo.patch + epatch "${FILESDIR}"/${P}-gentoo.patch \ + "${FILESDIR}"/${P}-noelfonshared.patch sed -i \ -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \ + -e "s:@GAMES_LIBDIR@:$(games_get_libdir)/${PN}:" \ src/common/files.c \ src/tools/gtkradiant/games/ufoai.game \ src/client/cl_main.c \ @@ -78,6 +80,8 @@ src_compile() { fi emake || die "emake failed" + mv base/game.so . \ + || die "Failed moving game library" } src_install() { @@ -96,6 +100,9 @@ src_install() { dogamesbin ufo2map || die "Failed installing editor" fi + exeinto "$(games_get_libdir)"/${PN} + doexe game.so || die "Failed installing game library" + insinto "${GAMES_DATADIR}"/${PN} doins -r base || die "doins -r failed" if use doc ; then |