remove old, masked version

(Portage version: 2.1.3.9)

5 files changed, 6 insertions, 375 deletions

diff --git a/games-puzzle/pingus/ChangeLog b/games-puzzle/pingus/ChangeLog
index 25622dbec089..4512303aacca 100644
--- a/games-puzzle/pingus/ChangeLog
+++ b/games-puzzle/pingus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-puzzle/pingus
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/ChangeLog,v 1.14 2007/09/27 15:29:38 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/ChangeLog,v 1.15 2007/10/01 00:21:22 mr_bones_ Exp $
+
+  01 Oct 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/pingus-0.6.0-build.patch, -files/pingus-0.6.0-gcc.patch,
+  -pingus-0.6.0-r1.ebuild:
+  remove old, masked version
 
   27 Sep 2007; Christoph Mende <angelos@gentoo.org> pingus-0.7.1.ebuild:
   Added ~amd64 wrt bug #156496
diff --git a/games-puzzle/pingus/files/digest-pingus-0.6.0-r1 b/games-puzzle/pingus/files/digest-pingus-0.6.0-r1
deleted file mode 100644
index a75a4cae3c78..000000000000
--- a/games-puzzle/pingus/files/digest-pingus-0.6.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9cd678272b97dbdb53f42324be31eacd pingus-0.6.0.tar.bz2 9585580
-RMD160 2f8507997f6f47b886ed861e19e7c50185d7c597 pingus-0.6.0.tar.bz2 9585580
-SHA256 b88c9e220c9b82691c1bbf07e5ad5cfe763c3617d493a37c786ae4750fd77662 pingus-0.6.0.tar.bz2 9585580
diff --git a/games-puzzle/pingus/files/pingus-0.6.0-build.patch b/games-puzzle/pingus/files/pingus-0.6.0-build.patch
deleted file mode 100644
index 232b6634887a..000000000000
--- a/games-puzzle/pingus/files/pingus-0.6.0-build.patch
+++ /dev/null
@@ -1,192 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -64,6 +64,8 @@
- dnl -- Static Libaries --
- AC_PROG_RANLIB
- 
-+CPPFLAGS="$CPPFLAGS `clanlib0.6-config --cflags`"
-+LIBS="$LIBS `clanlib0.6-config --libs`"
- AC_CHECK_HEADER(ClanLib/core.h,, [echo "Please get ClanLib from http://www.clanlib.org"; exit])
- 
- dnl FIXME: we don't need pthread, but some system might need it to succeed at the final link
-@@ -274,11 +276,11 @@
- AC_CHECK_FUNCS(select strdup)
- 
- dnl Checking for the install prefix and then use it to define PINGUS_DATADIR
--PINGUS_EXPAND_DIR(pingus_datadir, "$datadir/games/$PACKAGE")
-+PINGUS_EXPAND_DIR(pingus_datadir, "$datadir/$PACKAGE")
- AC_DEFINE_UNQUOTED(PINGUS_DATADIR, "$pingus_datadir", [Location of Pingus data files])
- 
- dnl -- Define the localedir, needed for gettext --
--PINGUS_EXPAND_DIR(localedir, "$datadir/locale")
-+PINGUS_EXPAND_DIR(localedir, "/usr/share/locale")
- AC_DEFINE_UNQUOTED(LOCALEDIR, "$localedir", [Location of gettext files])
- 
- # po/Makefile.in intl/Makefile <- this must be in one line, if its not
---- data/controller/Makefile.am
-+++ data/controller/Makefile.am
-@@ -15,7 +15,7 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
--pkgdatadir = $(datadir)/games/@PACKAGE@/controller
-+pkgdatadir = $(datadir)/@PACKAGE@/controller
- EXTRA_DIST = default.xml gamepad.xml
- pkgdata_DATA = $(EXTRA_DIST)
- 
---- data/data/Makefile.am
-+++ data/data/Makefile.am
-@@ -15,7 +15,7 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
--pkgdatadir = $(datadir)/games/@PACKAGE@/data
-+pkgdatadir = $(datadir)/@PACKAGE@/data
- 
- EXTRA_DIST  = \
- pingus.scr    \
---- data/demos/Makefile.am
-+++ data/demos/Makefile.am
-@@ -15,7 +15,7 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
--pkgdatadir = $(datadir)/games/@PACKAGE@/demos
-+pkgdatadir = $(datadir)/@PACKAGE@/demos
- 
- pkgdata_DATA = level1.pde
- 
---- data/images/Makefile.am
-+++ data/images/Makefile.am
-@@ -15,7 +15,7 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
--pkgdatadir = $(datadir)/games/@PACKAGE@/images
-+pkgdatadir = $(datadir)/@PACKAGE@/images
- 
- nobase_pkgdata_DATA = backgrounds/large_star.png \
- backgrounds/middle_star.png \
---- data/levels/Makefile.am
-+++ data/levels/Makefile.am
-@@ -18,7 +18,7 @@
- #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
- ## Override automake so that "make install" puts these in proper place:
--pkgdatadir = $(datadir)/games/@PACKAGE@/levels
-+pkgdatadir = $(datadir)/@PACKAGE@/levels
- 
- nobase_pkgdata_DATA = \
- 	$(wildcard tutorial/*.xml) \
---- data/Makefile.am
-+++ data/Makefile.am
-@@ -18,9 +18,8 @@
- SUBDIRS = controller images levels demos data music sounds worldmaps themes prefabs
- 
- # Tweaking the `datadir' to install the files in the correct location
--pkgdatadir = $(datadir)/games/@PACKAGE@
-+pkgdatadir = $(datadir)/@PACKAGE@
- 
- EXTRA_DIST = README
--pkgdata_DATA = $(EXTRA_DIST)
- 
- # EOF #
---- data/music/Makefile.am
-+++ data/music/Makefile.am
-@@ -15,7 +15,7 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
--pkgdatadir = $(datadir)/games/@PACKAGE@/music
-+pkgdatadir = $(datadir)/@PACKAGE@/music
- EXTRA_DIST = gd-giirm.s3m   pingus-5.it  rough_journey.it \
- gd-ite.it	    pingus-1.it  pingus-6.it  success_1.it \
- README	     gd-matth.it    pingus-2.it  pingus-7.it  success_2.it \
-@@ -23,4 +23,4 @@
- gd-cancn.it  goin_march.it  pingus-4.it  pingus-9.it
- pkgdata_DATA = $(EXTRA_DIST)
- 
--# EOF #
-\ No newline at end of file
-+# EOF #
---- data/prefabs/Makefile.am
-+++ data/prefabs/Makefile.am
-@@ -16,7 +16,7 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
- ## Override automake so that "make install" puts these in proper place:
--pkgdatadir = $(datadir)/games/@PACKAGE@/prefabs
-+pkgdatadir = $(datadir)/@PACKAGE@/prefabs
- 
- EXTRA_DIST = water.xml snow-entrance.xml
- pkgdata_DATA = $(EXTRA_DIST)
---- data/sounds/Makefile.am
-+++ data/sounds/Makefile.am
-@@ -15,9 +15,9 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
--pkgdatadir = $(datadir)/games/@PACKAGE@/sounds
-+pkgdatadir = $(datadir)/@PACKAGE@/sounds
- EXTRA_DIST = chink.wav   goodidea.wav  plop.wav   splash.wav  ting.wav \
-              digger.wav  ohno.wav	  plop2.wav  tick.wav	 yipee.wav
- pkgdata_DATA = $(EXTRA_DIST)
- 
--# EOF #
-\ No newline at end of file
-+# EOF #
---- data/themes/Makefile.am
-+++ data/themes/Makefile.am
-@@ -18,9 +18,9 @@
- #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
- # Tweaking the `datadir' to install the files in the correct location
--pkgdatadir = $(datadir)/games/@PACKAGE@/themes
-+pkgdatadir = $(datadir)/@PACKAGE@/themes
- 
- EXTRA_DIST = $(wildcard *.xml)
- pkgdata_DATA = $(EXTRA_DIST)
- 
--# EOF #
-\ No newline at end of file
-+# EOF #
---- data/worldmaps/Makefile.am
-+++ data/worldmaps/Makefile.am
-@@ -16,9 +16,9 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
- # Tweaking the `datadir' to install the files in the correct location
--pkgdatadir = $(datadir)/games/@PACKAGE@/worldmaps
-+pkgdatadir = $(datadir)/@PACKAGE@/worldmaps
- 
- EXTRA_DIST = volcano.xml pacman.xml tutorial.xml
- pkgdata_DATA = $(EXTRA_DIST)
- 
--# EOF #
-\ No newline at end of file
-+# EOF #
---- po/Makefile.in.in
-+++ po/Makefile.in.in
-@@ -21,7 +21,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = /usr/share/locale
- gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -17,10 +17,9 @@
- #  along with this program; if not, write to the Free Software
- #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
--bindir=$(prefix)/games
- 
- # The next lines are for gettext
--localedir = $(datadir)/locale
-+localedir = /usr/share/locale
- # DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
- # INCLUDES = -I$(srcdir) -I.. -I$(top_srcdir)/lib -I../intl -I$(top_srcdir)/intl
- 
diff --git a/games-puzzle/pingus/files/pingus-0.6.0-gcc.patch b/games-puzzle/pingus/files/pingus-0.6.0-gcc.patch
deleted file mode 100644
index b429bac676d3..000000000000
--- a/games-puzzle/pingus/files/pingus-0.6.0-gcc.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-Make sure we type the cast properly.
-
-http://bugs.gentoo.org/show_bug.cgi?id=63773
-
-Pingus uses assert() but never includes assert.h, boo !
-
-http://bugs.gentoo.org/show_bug.cgi?id=28281
-
---- pingus-0.6.0/src/story_screen.cxx
-+++ pingus-0.6.0/src/story_screen.cxx
-@@ -142,7 +142,7 @@
- 
-   if (!page_displayed_completly)
-     {
--      unsigned int len = static_cast<unsigned int>(20.0f * time_passed);
-+      size_t len = static_cast<size_t>(20.0f * time_passed);
-       display_text = current_page.text.substr(0, Math::min(current_page.text.length(), len));
- 
-       if (current_page.text.length() < len)
---- pingus-0.6.0/src/blitter.cxx
-+++ pingus-0.6.0/src/blitter.cxx
-@@ -17,6 +17,7 @@
- //  along with this program; if not, write to the Free Software
- //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
-+#include <assert.h>
- #include <config.h>
- #include <stdio.h>
- #include "pingus_error.hxx"
---- pingus-0.6.0/src/col_map.cxx
-+++ pingus-0.6.0/src/col_map.cxx
-@@ -17,6 +17,7 @@
- //  along with this program; if not, write to the Free Software
- //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
-+#include <assert.h>
- #include <iostream>
- #include <ClanLib/Display/SurfaceProviders/canvas.h>
- #include "gui/graphic_context.hxx"
---- pingus-0.6.0/src/console.cxx
-+++ pingus-0.6.0/src/console.cxx
-@@ -17,6 +17,7 @@
- //  along with this program; if not, write to the Free Software
- //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
-+#include <assert.h>
- #include <config.h>
- #include <ClanLib/Display/Display/display.h>
- #include <ClanLib/Display/Font/font.h>
---- pingus-0.6.0/src/demo_recorder.cxx
-+++ pingus-0.6.0/src/demo_recorder.cxx
-@@ -17,6 +17,7 @@
- //  along with this program; if not, write to the Free Software
- //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
-+#include <assert.h>
- #include <time.h>
- #include <iostream>
- #include "system.hxx"
---- pingus-0.6.0/src/editor/generic_property_frame.cxx
-+++ pingus-0.6.0/src/editor/generic_property_frame.cxx
-@@ -17,6 +17,7 @@
- //  along with this program; if not, write to the Free Software
- //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
-+#include <assert.h>
- #include <iostream>
- #include <ClanLib/GUI/label.h>
- #include <ClanLib/GUI/inputbox.h>
---- pingus-0.6.0/src/gui/root_gui_manager.cxx
-+++ pingus-0.6.0/src/gui/root_gui_manager.cxx
-@@ -17,6 +17,7 @@
- //  along with this program; if not, write to the Free Software
- //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
-+#include <assert.h>
- #include "root_gui_manager.hxx"
- #include "../input/controller.hxx"
- 
---- pingus-0.6.0/src/pingu_holder.cxx
-+++ pingus-0.6.0/src/pingu_holder.cxx
-@@ -17,6 +17,7 @@
- //  along with this program; if not, write to the Free Software
- //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
-+#include <assert.h>
- #include <iostream>
- #include "pingu_holder.hxx"
- #include "pingu.hxx"
---- pingus-0.6.0/src/savegame_manager.cxx
-+++ pingus-0.6.0/src/savegame_manager.cxx
-@@ -17,6 +17,7 @@
- //  along with this program; if not, write to the Free Software
- //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
-+#include <assert.h>
- #include <iostream>
- #include <fstream>
- #include "system.hxx"
---- pingus-0.6.0/src/worldmap/dot.cxx
-+++ pingus-0.6.0/src/worldmap/dot.cxx
-@@ -17,6 +17,7 @@
- //  along with this program; if not, write to the Free Software
- //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
-+#include <assert.h>
- #include <iostream>
- #include "../xml_file_reader.hxx"
- #include "dot.hxx"
---- pingus-0.6.0/src/worldmap/graph.hxx
-+++ pingus-0.6.0/src/worldmap/graph.hxx
-@@ -20,6 +20,8 @@
- #ifndef HEADER_GRAPH_HXX
- #define HEADER_GRAPH_HXX
- 
-+#include <assert.h>
- #include <algorithm>
- #include <vector>
-+#include <iostream>
- 
-diff -ur pingus-0.6.0-orig/src/worldmap/sprite_drawable.hxx pingus-0.6.0/src/worldmap/sprite_drawable.hxx
---- pingus-0.6.0-orig/src/worldmap/sprite_drawable.hxx	2005-09-11 21:46:11.000000000 -0400
-+++ pingus-0.6.0/src/worldmap/sprite_drawable.hxx	2005-09-11 21:49:46.000000000 -0400
-@@ -46,7 +46,7 @@
- 
- private:
-   SpriteDrawable (const SpriteDrawable&);
--  SpriteDrawable operator= (const SpriteDrawable&);
-+  SpriteDrawable& operator= (const SpriteDrawable&);
- };
- 
- } // namespace WorldMapNS
diff --git a/games-puzzle/pingus/pingus-0.6.0-r1.ebuild b/games-puzzle/pingus/pingus-0.6.0-r1.ebuild
deleted file mode 100644
index 68e14e21bf1c..000000000000
--- a/games-puzzle/pingus/pingus-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/pingus-0.6.0-r1.ebuild,v 1.17 2006/11/04 04:56:55 nyhm Exp $
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-inherit autotools eutils flag-o-matic games
-
-DESCRIPTION="free Lemmings clone"
-HOMEPAGE="http://pingus.seul.org/"
-SRC_URI="http://pingus.seul.org/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-amd64 x86"
-IUSE="nls opengl"
-
-RDEPEND="media-libs/hermes
-	=dev-games/clanlib-0.6.5*
-	dev-libs/libxml2
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc.patch #28281 #63773
-	epatch "${FILESDIR}"/${P}-build.patch
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_compile() {
-	replace-flags -Os -O2
-	egamesconf \
-		$(use_enable nls) \
-		$(use_with opengl clanGL) \
-		|| die
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS NEWS README TODO
-	make_desktop_entry pingus Pingus
-	prepgamesdirs
-}