Use external enet

(Portage version: 2.1.2.2)

4 files changed, 167 insertions, 1 deletions

diff --git a/games-puzzle/enigma/ChangeLog b/games-puzzle/enigma/ChangeLog
index 7ac9c50e3d66..1131b16225bb 100644
--- a/games-puzzle/enigma/ChangeLog
+++ b/games-puzzle/enigma/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-puzzle/enigma
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/ChangeLog,v 1.30 2007/02/07 14:06:16 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/ChangeLog,v 1.31 2007/03/26 19:25:09 nyhm Exp $
+
+*enigma-1.00-r2 (26 Mar 2007)
+
+  26 Mar 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/enigma-1.00-autotools.patch, +enigma-1.00-r2.ebuild:
+  Use external enet
 
   07 Feb 2007; Tristan Heaven <nyhm@gentoo.org> enigma-1.00-r1.ebuild:
   Use mirror://berlios
diff --git a/games-puzzle/enigma/enigma-1.00-r2.ebuild b/games-puzzle/enigma/enigma-1.00-r2.ebuild
new file mode 100644
index 000000000000..22b30bd4eee7
--- /dev/null
+++ b/games-puzzle/enigma/enigma-1.00-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/enigma-1.00-r2.ebuild,v 1.1 2007/03/26 19:25:09 nyhm Exp $
+
+inherit autotools eutils games
+
+DESCRIPTION="puzzle game similar to Oxyd"
+HOMEPAGE="http://www.nongnu.org/enigma/"
+SRC_URI="mirror://berlios/enigma-game/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE="nls"
+
+RDEPEND="media-libs/sdl-ttf
+	media-libs/libsdl
+	media-libs/sdl-mixer
+	media-libs/sdl-image
+	dev-libs/xerces-c
+	net-libs/enet
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	cp /usr/share/gettext/config.rpath .
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	eautoreconf
+}
+
+src_compile() {
+	egamesconf \
+		--disable-dependency-tracking \
+		$(use_enable nls) \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc ACKNOWLEDGEMENTS AUTHORS CHANGES README doc/HACKING
+	dohtml -r doc/*
+	doman doc/enigma.6
+	prepgamesdirs
+}
diff --git a/games-puzzle/enigma/files/digest-enigma-1.00-r2 b/games-puzzle/enigma/files/digest-enigma-1.00-r2
new file mode 100644
index 000000000000..7577edefaf11
--- /dev/null
+++ b/games-puzzle/enigma/files/digest-enigma-1.00-r2
@@ -0,0 +1,3 @@
+MD5 428a9cce666cd45812e785f00a483ef9 enigma-1.00.tar.gz 10466968
+RMD160 a2ddd9600cddaf6b52c02af1c5631c8c4cd69045 enigma-1.00.tar.gz 10466968
+SHA256 c44f36ef28c8bed1f5d5090edbe4cedda6f37472e729eed3406a350365ca32be enigma-1.00.tar.gz 10466968
diff --git a/games-puzzle/enigma/files/enigma-1.00-autotools.patch b/games-puzzle/enigma/files/enigma-1.00-autotools.patch
new file mode 100644
index 000000000000..68116e1c0fbf
--- /dev/null
+++ b/games-puzzle/enigma/files/enigma-1.00-autotools.patch
@@ -0,0 +1,109 @@
+--- configure.ac
++++ configure.ac
+@@ -260,7 +260,6 @@
+ 	CXXFLAGS="$CXXFLAGS -O2 -ffast-math -fomit-frame-pointer"
+ 	AC_MSG_RESULT(yes)
+ else
+-	CXXFLAGS="$CXXFLAGS -g"
+ 	AC_MSG_RESULT(no)
+ fi
+ 
+@@ -321,7 +320,6 @@
+ dnl Configure libraries
+ dnl ----------------------------------------------------------
+ AC_CONFIG_SUBDIRS(lib-src/zipios++)
+-AC_CONFIG_SUBDIRS(lib-src/enet)
+ 
+ AC_CONFIG_FILES([Makefile m4/Makefile  intl/Makefile 
+            data/Makefile
+--- etc/Makefile.am
++++ etc/Makefile.am
+@@ -1,14 +1,14 @@
+ # if !MINGW32
+ # Comply with xdg icon theme specification
+-icondir = $(prefix)/share/icons/hicolor/48x48/apps
++icondir = /usr/share/icons/hicolor/48x48/apps
+ icon_DATA = enigma.png
+ 
+ # Backwards-compatible global search location for images
+-pixmapdir = $(prefix)/share/pixmaps
++pixmapdir = /usr/share/pixmaps
+ pixmap_DATA = enigma.png
+ 
+ # Install .desktop file in xdg standard location
+-desktopdir = $(prefix)/share/applications
++desktopdir = /usr/share/applications
+ desktop_DATA = enigma.desktop
+ # endif !MINGW32
+ 
+--- lib-src/Makefile.am
++++ lib-src/Makefile.am
+@@ -1 +1 @@
+-SUBDIRS = oxydlib lua zipios++ enet enigma-core
++SUBDIRS = oxydlib lua zipios++ enigma-core
+--- Makefile.am
++++ Makefile.am
+@@ -3,11 +3,9 @@
+ #   tools -> lib-src/lua
+ #   src   -> tools, lib-src
+ #
+-SUBDIRS = m4 lib-src tools intl src data doc po etc
++SUBDIRS = m4 lib-src tools intl src data po etc
+ EXTRA_DIST = enigma CHANGES ACKNOWLEDGEMENTS
+ 
+-docdir = @datadir@/doc/enigma
+-doc_DATA = README CHANGES COPYING ACKNOWLEDGEMENTS
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+--- po/Makefile.in.in
++++ po/Makefile.in.in
+@@ -24,12 +24,12 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = /usr/share/locale
+ gettextsrcdir = $(datadir)/gettext/po
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-MKINSTALLDIRS = @MKINSTALLDIRS@ 
++MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs
+ #install_sh@ -d
+ mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+ 
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -12,12 +12,11 @@
+ 
+ CXXFLAGS = @CXXFLAGS@\
+ 	-DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \
+-	-DLOCALEDIR=\"$(localedir)\" \
++	-DLOCALEDIR=\"/usr/share/locale\" \
+ 	-I$(top_srcdir)/lib-src/zipios++  \
+ 	-I$(top_builddir)/lib-src/zipios++ \
+ 	-I$(top_srcdir)/lib-src/lua \
+ 	-I$(top_srcdir)/lib-src/enigma-core \
+-	-I$(top_srcdir)/lib-src/enet/include \
+ 	-I$(top_srcdir)/lib-src \
+ 	-I$(top_builddir)/intl @SDL_CFLAGS@
+ 
+@@ -193,7 +192,7 @@
+ 
+ else # not MINGW32
+ 
+-  localedir = $(datadir)/locale
++  localedir = /usr/share/locale
+   mingw_ldadd =
+ 
+ endif
+@@ -202,7 +201,7 @@
+ 	@LIBINTL@ \
+ 	$(top_builddir)/lib-src/enigma-core/libecl.a \
+ 	$(top_builddir)/lib-src/lua/liblua.a \
+-	$(top_builddir)/lib-src/enet/libenet.a \
++	-lenet \
+ 	$(top_builddir)/lib-src/oxydlib/liboxyd.a \
+ 	$(top_builddir)/lib-src/zipios++/src/libzipios.a \
+ 	-lz \