diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-04-18 09:03:52 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-04-18 09:03:52 +0000 |
| commit | 3d5fa1cb1c8ce82b0f7b5287d12e6a3235752a20 (patch) | |
| tree | b54e2fc46a7ea547967f900f822a7dfff0e11ade /games-strategy | |
| parent | version bump (Manifest recommit) (diff) | |
| download | gentoo-2-3d5fa1cb1c8ce82b0f7b5287d12e6a3235752a20.tar.gz gentoo-2-3d5fa1cb1c8ce82b0f7b5287d12e6a3235752a20.tar.bz2 gentoo-2-3d5fa1cb1c8ce82b0f7b5287d12e6a3235752a20.zip | |
make freecraft and freecraft-fcmp work together #39278
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/freecraft/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/freecraft/files/freecraft | 2 | ||||
| -rw-r--r-- | games-strategy/freecraft/freecraft-1.18-r3.ebuild | 13 |
3 files changed, 18 insertions, 3 deletions
diff --git a/games-strategy/freecraft/ChangeLog b/games-strategy/freecraft/ChangeLog index 5963797ff068..f6062adfb69e 100644 --- a/games-strategy/freecraft/ChangeLog +++ b/games-strategy/freecraft/ChangeLog @@ -1,9 +1,13 @@ # ChangeLog for games-strategy/freecraft # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecraft/ChangeLog,v 1.4 2004/01/22 18:16:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecraft/ChangeLog,v 1.5 2004/04/18 09:03:52 vapier Exp $ *freecraft-1.18-r3 (22 Jan 2004) + 18 Apr 2004; Mike Frysinger <vapier@gentoo.org> : + Make sure freecraft and freecraft-fcmp dont clobber each other when + freecraft is upgraded #39278 by Arnaud JEANSEN. + 22 Jan 2004; Mike Frysinger <vapier@gentoo.org> : Stupid wrapper script #38580. diff --git a/games-strategy/freecraft/files/freecraft b/games-strategy/freecraft/files/freecraft index 12f0c1e0293a..49e7734f744f 100644 --- a/games-strategy/freecraft/files/freecraft +++ b/games-strategy/freecraft/files/freecraft @@ -12,4 +12,4 @@ if [ ! -d GENTOO_DATADIR/data/music ] ; then exit 1 fi -GENTOO_LIBDIR/freecraft -d GENTOO_DATADIR/data "$@" +exec GENTOO_LIBDIR/freecraft -d GENTOO_DATADIR/data "$@" diff --git a/games-strategy/freecraft/freecraft-1.18-r3.ebuild b/games-strategy/freecraft/freecraft-1.18-r3.ebuild index a6a1ca1439cd..262ba20c0bae 100644 --- a/games-strategy/freecraft/freecraft-1.18-r3.ebuild +++ b/games-strategy/freecraft/freecraft-1.18-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecraft/freecraft-1.18-r3.ebuild,v 1.2 2004/02/20 07:38:17 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecraft/freecraft-1.18-r3.ebuild,v 1.3 2004/04/18 09:03:52 vapier Exp $ inherit games eutils @@ -12,6 +12,7 @@ SRC_URI="${MY_P}-src.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="x86" +IUSE="" RESTRICT="fetch" DEPEND=">=media-libs/libpng-1.2.3 @@ -60,6 +61,16 @@ src_install() { dodoc README prepgamesdirs + + # make sure we dont clobber files freecraft and freecraft-fcmp share #39278 + local fcmpver="`best_version games-strategy/freecraft-fcmp`" + if [ ! -z "${fcmpver}" ] ; then + cd ${D}/${GAMES_DATADIR}/${PN}/data/ccl + for f in `grep ${GAMES_DATADIR}/${PN}/data/ccl/ /var/db/pkg/${fcmpver}/CONTENTS` ; do + [ -d "${f}" ] && continue + [ -e "${f}" -a -e "${D}/${f}" ] && rm ${D}/${f} + done + fi } pkg_postinst() { |