diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2006-09-05 20:59:26 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-09-05 20:59:26 +0000 |
| commit | aa00bd463666c6426ab42fa9dd79d270a94dbc8d (patch) | |
| tree | ab12bad32bf11e9dc9d2c10fde24280288c1be57 /games-rpg | |
| parent | Library of python code used by Red Hat Linux programs (diff) | |
| download | gentoo-2-aa00bd463666c6426ab42fa9dd79d270a94dbc8d.tar.gz gentoo-2-aa00bd463666c6426ab42fa9dd79d270a94dbc8d.tar.bz2 gentoo-2-aa00bd463666c6426ab42fa9dd79d270a94dbc8d.zip | |
Fixing package collisions with games-rpg/nwn and closing bug #145593.
(Portage version: 2.1.1_rc1-r1)
Diffstat (limited to 'games-rpg')
| -rw-r--r-- | games-rpg/nwn-data/ChangeLog | 5 | ||||
| -rw-r--r-- | games-rpg/nwn-data/nwn-data-1.29.ebuild | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/games-rpg/nwn-data/ChangeLog b/games-rpg/nwn-data/ChangeLog index 9fff9c25042a..1d68e6bd3d1f 100644 --- a/games-rpg/nwn-data/ChangeLog +++ b/games-rpg/nwn-data/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-rpg/nwn-data # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/ChangeLog,v 1.17 2006/09/01 23:57:42 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/ChangeLog,v 1.18 2006/09/05 20:59:26 wolf31o2 Exp $ + + 05 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org> nwn-data-1.29.ebuild: + Fixing package collisions with games-rpg/nwn and closing bug #145593. 01 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org> nwn-data-1.29.ebuild: Add some more error checking into the unpacking stage. diff --git a/games-rpg/nwn-data/nwn-data-1.29.ebuild b/games-rpg/nwn-data/nwn-data-1.29.ebuild index f039f7a4a5d1..68a4d406e79e 100644 --- a/games-rpg/nwn-data/nwn-data-1.29.ebuild +++ b/games-rpg/nwn-data/nwn-data-1.29.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/nwn-data-1.29.ebuild,v 1.18 2006/09/01 23:57:42 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/nwn-data-1.29.ebuild,v 1.19 2006/09/05 20:59:26 wolf31o2 Exp $ inherit eutils games @@ -106,7 +106,6 @@ src_unpack() { unzip -o "${CDROM_ROOT}"/Language_data.zip || die "unpacking" unzip -o "${CDROM_ROOT}"/Language_update.zip || die "unpacking" unzip -o "${CDROM_ROOT}"/Data_Linux.zip || die "unpacking" - rm -f data/patch.bif patch.key touch .metadata/sou || die "touching sou" fi if use hou @@ -116,12 +115,13 @@ src_unpack() { rm -f xp1patch.key data/xp1patch.bif override/* cdrom_load_next_cd fi - rm -f data/patch.bif patch.key unzip -o "${CDROM_ROOT}"/Data_Shared.zip || die "unpacking" unzip -o "${CDROM_ROOT}"/Language_data.zip || die "unpacking" unzip -o "${CDROM_ROOT}"/Language_update.zip || die "unpacking" touch .metadata/hou || die "touching hou" fi + # These files aren't needed and come from the patches (games-rpg/nwn) + rm -f data/patch.bif patch.key sed -i -e '\:^./nwmain .*:i \ if [[ -f ./nwmouse.so ]]; then \ @@ -138,8 +138,9 @@ src_install() { # eventually be removed to allow for nwmovies to work. rm -rf "${S}"/movies mkdir -p "${S}"/dmvault "${S}"/hak "${S}"/portraits "${S}"/localvault - rm -rf "${S}"/dialog.tlk "${S}"/dialog.TLK "${S}"/dmclient "${S}"/nwmain \ - "${S}"/nwserver "${S}"/nwm/* "${S}"/SDL-1.2.5 "${S}"/fixinstall + rm -rf "${S}"/dialog.tlk "${S}"/dialog.TLK "${S}"/dialogf.tlk \ + "${S}"/dmclient "${S}"/nwmain "${S}"/nwserver "${S}"/nwm/* \ + "${S}"/SDL-1.2.5 "${S}"/fixinstall mv "${S}"/* "${Ddir}" mv "${S}"/.metadata "${Ddir}" keepdir "${dir}"/servervault |