added install of stdsounds2 from the freeciv site (to address bug 36178)

5 files changed, 21 insertions, 13 deletions

diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog
index 7f4d924a12d0..c16c0a7a07a8 100644
--- a/games-strategy/freeciv/ChangeLog
+++ b/games-strategy/freeciv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/freeciv
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.7 2004/01/03 20:51:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.8 2004/01/06 22:14:11 mr_bones_ Exp $
+
+  06 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> freeciv-1.14.1.ebuild:
+  added install of stdsounds2 from the freeciv site (to address bug 36178)
 
 *freeciv-1.14.1 (03 Jan 2004)
 
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index ad70c613fe23..6ac5ec727ac1 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,6 +1,6 @@
-MD5 7e355ce4acc4d33cfffd706257f9bcb1 ChangeLog 2837
+MD5 30456a924a79ac49908c5e90452ef05e ChangeLog 2994
 MD5 a30c9d4ce8f9629d6d7323eaab258343 metadata.xml 241
-MD5 63bffe27594b0f7cf41e35016e685d47 freeciv-1.14.1.ebuild 1716
-MD5 eaf7d04331d8ca7eb7698f8bbe5b67ac freeciv-1.14.0-r1.ebuild 1722
+MD5 0a8dc8e890732bf07a7a9dcb72ea869d freeciv-1.14.0-r1.ebuild 1725
+MD5 bc503562c22a4b65edccd883fa6c9010 freeciv-1.14.1.ebuild 1844
 MD5 a596b071c160a0a1dd5d5c315f21a2f7 files/digest-freeciv-1.14.1 131
 MD5 a58905cf82fbffcfc85d0b05eb830f7f files/digest-freeciv-1.14.0-r1 68
diff --git a/games-strategy/freeciv/files/digest-freeciv-1.14.1 b/games-strategy/freeciv/files/digest-freeciv-1.14.1
index e90c0be655dc..c3c06580d3f7 100644
--- a/games-strategy/freeciv/files/digest-freeciv-1.14.1
+++ b/games-strategy/freeciv/files/digest-freeciv-1.14.1
@@ -1 +1,2 @@
 MD5 d328f65e7fca5252f27161f5f9e97a03 freeciv-1.14.1.tar.bz2 5850722
+MD5 63b06631addeaccf45bc4bf6b8ddf7b3 stdsounds2.tar.gz 1223738
diff --git a/games-strategy/freeciv/freeciv-1.14.0-r1.ebuild b/games-strategy/freeciv/freeciv-1.14.0-r1.ebuild
index 19d9d05a94ee..ba564325b3f6 100644
--- a/games-strategy/freeciv/freeciv-1.14.0-r1.ebuild
+++ b/games-strategy/freeciv/freeciv-1.14.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-1.14.0-r1.ebuild,v 1.2 2003/10/13 22:13:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-1.14.0-r1.ebuild,v 1.3 2004/01/06 22:14:11 mr_bones_ Exp $
 
 DESCRIPTION="multiplayer strategy game (Civilization Clone)"
 HOMEPAGE="http://www.freeciv.org/"
diff --git a/games-strategy/freeciv/freeciv-1.14.1.ebuild b/games-strategy/freeciv/freeciv-1.14.1.ebuild
index 4f3eb436a6f2..2f332bf15a89 100644
--- a/games-strategy/freeciv/freeciv-1.14.1.ebuild
+++ b/games-strategy/freeciv/freeciv-1.14.1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-1.14.1.ebuild,v 1.1 2004/01/03 20:51:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-1.14.1.ebuild,v 1.2 2004/01/06 22:14:11 mr_bones_ Exp $
 
 inherit games
 
 MY_P=${PN}-${PV/_/-}
 DESCRIPTION="multiplayer strategy game (Civilization Clone)"
 HOMEPAGE="http://www.freeciv.org/"
-SRC_URI="ftp://ftp.freeciv.org/freeciv/stable/${MY_P}.tar.bz2"
+SRC_URI="ftp://ftp.freeciv.org/freeciv/stable/${MY_P}.tar.bz2
+	http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds2.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -39,7 +40,7 @@ DEPEND=">=sys-devel/gettext-0.10.36
 			>=media-libs/libvorbis-1.0-r2
 		)"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_compile() {
 	local myclient="no"
@@ -60,12 +61,15 @@ src_compile() {
 }
 
 src_install() {
-	emake install DESTDIR=${D} || die "install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 
 	insinto /usr/X11R6/lib/X11/app-defaults
-	doins data/Freeciv
+	doins data/Freeciv || die "doins failed"
 
 	dodoc ChangeLog INSTALL NEWS \
-		doc/{BUGS,CodingStyle,HACKING,HOWTOPLAY,PEOPLE,README*,TODO}
+		doc/{BUGS,CodingStyle,HACKING,HOWTOPLAY,PEOPLE,README*,TODO} \
+			|| die "dodoc failed"
+	# install sounds
+	cp -R ../stdsounds* "${D}${GAMES_DATADIR}/${PN}"
 	prepgamesdirs
 }