clean older ebuild; fix dep (patch from Nathan Skillen via bug #74271)

diff --git a/games-strategy/freelords/ChangeLog b/games-strategy/freelords/ChangeLog
index 050d2acdea2f9b51454a03873a2f676a6629a9a4..c302632debe3db670a98faef90d8be0d82ea88d8 100644 (file)
--- a/games-strategy/freelords/ChangeLog
+++ b/games-strategy/freelords/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/freelords
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/ChangeLog,v 1.13 2004/11/19 21:55:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/ChangeLog,v 1.14 2004/12/13 12:17:01 mr_bones_ Exp $
+
+  13 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/freelords-0.3.3-gcc-3.4.patch, -freelords-0.3.3.ebuild,
+  freelords-0.3.4.ebuild:
+  clean older ebuild; fix dep (patch from Nathan Skillen via bug #74271)
 
 *freelords-0.3.4 (19 Nov 2004)
 

diff --git a/games-strategy/freelords/Manifest b/games-strategy/freelords/Manifest
index 1e6cc8040ddf9ba36475e7088b1de8aec42bd010..7537a69e78b4c3a6cb675269856358ca4bab38a0 100644 (file)
--- a/games-strategy/freelords/Manifest
+++ b/games-strategy/freelords/Manifest
@@ -1,8 +1,5 @@
-MD5 fdc0e71c1e330d4ec0e3529344d79b16 freelords-0.3.3.ebuild 1430
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 26a6d63303faae366a079e9731895ffb freelords-0.3.4.ebuild 1515
-MD5 2f9473eaa985e0a64c4fc4551fcb87ed ChangeLog 1817
-MD5 fa26afec1f59a2cca205ade604bfdf96 files/freelords-0.3.3-gcc-3.4.patch 459
+MD5 c25b1b9f32cdd694a9ed8168570ecac9 freelords-0.3.4.ebuild 1515
+MD5 3ee6e4ca8ffe0cc171cfbf117ba2587f ChangeLog 2037
 MD5 ab1b855445f4e0f4ccbc46662e0bf206 files/freelordsrc 147
-MD5 847bea9f1eb22873a23e5b4f40dcab30 files/digest-freelords-0.3.3 68
 MD5 6ef80ef4d03f0404bcfbc6ca368861e8 files/digest-freelords-0.3.4 69

diff --git a/games-strategy/freelords/files/digest-freelords-0.3.3 b/games-strategy/freelords/files/digest-freelords-0.3.3
deleted file mode 100644 (file)
index 0e436cd..0000000
--- a/games-strategy/freelords/files/digest-freelords-0.3.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7aa016ba4eb92b4f16bd18beba8f3026 freelords-0.3.3.tar.bz2 927344

diff --git a/games-strategy/freelords/files/freelords-0.3.3-gcc-3.4.patch b/games-strategy/freelords/files/freelords-0.3.3-gcc-3.4.patch
deleted file mode 100644 (file)
index 702bc99..0000000
--- a/games-strategy/freelords/files/freelords-0.3.3-gcc-3.4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ObjectList.cpp.old     2004-11-05 07:17:55.928861736 +0000
-+++ src/ObjectList.cpp 2004-11-05 07:06:58.624787144 +0000
-@@ -27,7 +27,7 @@
- 
- template<class T> T* ObjectList<T>::getObjectAt(int x, int y) 
- {
--    for (typename ObjectList<T>::iterator it = begin(); it != end(); ++it)
-+    for (typename ObjectList<T>::iterator it = this->begin(); it != this->end(); ++it)
-     {
-         PG_Point p = (*it).getPos();
-         int size = (*it).getSize() - 1;

diff --git a/games-strategy/freelords/freelords-0.3.3.ebuild b/games-strategy/freelords/freelords-0.3.3.ebuild
deleted file mode 100644 (file)
index e1a44a5..0000000
--- a/games-strategy/freelords/freelords-0.3.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/freelords-0.3.3.ebuild,v 1.4 2004/11/08 02:13:17 josejx Exp $
-
-inherit eutils games
-
-DESCRIPTION="Free Warlords clone"
-HOMEPAGE="http://www.freelords.org/"
-SRC_URI="mirror://sourceforge/freelords/${P}.tar.bz2"
-
-KEYWORDS="x86 ~ppc"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls"
-
-RDEPEND="dev-libs/expat
-       >=media-libs/libsdl-1.2
-       >=media-libs/sdl-image-1.2
-       >=media-libs/freetype-2
-       =media-libs/paragui-1.0*
-       >=dev-libs/libsigc++-1.2"
-DEPEND="${RDEPEND}
-       nls? ( sys-devel/gettext )
-       dev-util/pkgconfig
-       >=sys-apps/sed-4"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       sed -i \
-               -e "s:/etc/freelordsrc:${GAMES_SYSCONFDIR}/freelordsrc:" src/main.cpp \
-               || die "sed src/main.cpp failed"
-       sed -i \
-               -e "s:\$(prefix)/share/locale:/usr/share/locale:" src/Makefile.in \
-               || die "sed src/Makefile.in failed"
-       epatch ${FILESDIR}/${P}-gcc-3.4.patch
-}
-
-src_compile() {
-       egamesconf \
-               --disable-dependency-tracking \
-               --disable-paraguitest \
-               $(use_enable nls) \
-               || die
-       emake \
-               localedir="/usr/share/locale" \
-               CXXFLAGS="${CXXFLAGS}" || die "emake failed"
-}
-
-src_install() {
-       make \
-               DESTDIR="${D}" \
-               localedir="/usr/share/locale" \
-               install || die "make install failed"
-       dodoc AUTHORS BUGS ChangeLog DEPENDENCIES HACKER NEWS README TODO \
-               doc/[[:upper:]]*
-       prepgamesdirs
-}

diff --git a/games-strategy/freelords/freelords-0.3.4.ebuild b/games-strategy/freelords/freelords-0.3.4.ebuild
index ea64dce1430be61bf87db003236a645d62c27173..73e09d1f14e5a3223a3fc82fe96ec1f2357381b7 100644 (file)
--- a/games-strategy/freelords/freelords-0.3.4.ebuild
+++ b/games-strategy/freelords/freelords-0.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/freelords-0.3.4.ebuild,v 1.1 2004/11/19 21:55:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freelords/freelords-0.3.4.ebuild,v 1.2 2004/12/13 12:17:01 mr_bones_ Exp $
 
 inherit eutils games
 
@@ -18,7 +18,7 @@ RDEPEND="dev-libs/expat
        >=media-libs/sdl-image-1.2
        >=media-libs/freetype-2
        =media-libs/paragui-1.0*
-       >=dev-libs/libsigc++-1.2"
+       =dev-libs/libsigc++-1.2*"
 DEPEND="${RDEPEND}
        nls? ( sys-devel/gettext )
        dev-util/pkgconfig