From: Tristan Heaven Date: Mon, 26 Mar 2007 19:25:09 +0000 (+0000) Subject: Use external enet X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=937246c3f315b21ca62835a416c2038035eb5534;p=gentoo.git Use external enet Package-Manager: portage-2.1.2.2 --- 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 + +files/enigma-1.00-autotools.patch, +enigma-1.00-r2.ebuild: + Use external enet 07 Feb 2007; Tristan Heaven enigma-1.00-r1.ebuild: Use mirror://berlios diff --git a/games-puzzle/enigma/Manifest b/games-puzzle/enigma/Manifest index a7859a1d2d75..de55c09d9919 100644 --- a/games-puzzle/enigma/Manifest +++ b/games-puzzle/enigma/Manifest @@ -1,6 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX enigma-1.00-autotools.patch 2865 RMD160 a8415815e2f73be9f89066e58e712ffc8cc784c8 SHA1 4b9dd11660428438a32d5a5cee8304e8a5045279 SHA256 141ea4b51ee272c2842983cab09e5631755f8738e367408de37fb435b84131e1 +MD5 0ebf44b61d46e359f8a4ddd291491fd4 files/enigma-1.00-autotools.patch 2865 +RMD160 a8415815e2f73be9f89066e58e712ffc8cc784c8 files/enigma-1.00-autotools.patch 2865 +SHA256 141ea4b51ee272c2842983cab09e5631755f8738e367408de37fb435b84131e1 files/enigma-1.00-autotools.patch 2865 AUX enigma-1.00-build.patch 2350 RMD160 42766cc37b6136d38ba1e68f9767998f2f48e84c SHA1 5131a807f2fbdf164ca161268518ffe49408280d SHA256 d0ed7b661620672147180cc3c5ee73738d1e49b879eed9c552df0efcb38265ac MD5 881beb5eecee4fd2d8906bdef43b797f files/enigma-1.00-build.patch 2350 RMD160 42766cc37b6136d38ba1e68f9767998f2f48e84c files/enigma-1.00-build.patch 2350 @@ -10,10 +14,14 @@ EBUILD enigma-1.00-r1.ebuild 1032 RMD160 e0f0ae4efb5b28b9aa4a939156917432edc524f MD5 6f8a1f078476d2d4c37c2cb3a06c5d96 enigma-1.00-r1.ebuild 1032 RMD160 e0f0ae4efb5b28b9aa4a939156917432edc524f4 enigma-1.00-r1.ebuild 1032 SHA256 9a1443b896fd91169e2e649f6f8c73693754ad88fee958474147c71a14566814 enigma-1.00-r1.ebuild 1032 -MISC ChangeLog 5006 RMD160 3cccd04b9344d8eff270c4dddd171160c180734c SHA1 89ddd9393ff8f021c8086837e56ae9698f7c6c8b SHA256 1acfdc44f37b9a6c479c6342580b55a63454604cd4170bf8ee25fdb32dbd75ff -MD5 f4623ef4bc5ec3196410c074b4571802 ChangeLog 5006 -RMD160 3cccd04b9344d8eff270c4dddd171160c180734c ChangeLog 5006 -SHA256 1acfdc44f37b9a6c479c6342580b55a63454604cd4170bf8ee25fdb32dbd75ff ChangeLog 5006 +EBUILD enigma-1.00-r2.ebuild 1091 RMD160 41f4e341e559a2050b572a378b6d3f5794a0e55f SHA1 d4a8ca853bede7fa3851d77ce108add103c54534 SHA256 b573c78185ad29f3b670e6892fefeb4ae095c8308a5097c15d7ae10b28faac3d +MD5 d4e9507d158426b62841f5b170e00684 enigma-1.00-r2.ebuild 1091 +RMD160 41f4e341e559a2050b572a378b6d3f5794a0e55f enigma-1.00-r2.ebuild 1091 +SHA256 b573c78185ad29f3b670e6892fefeb4ae095c8308a5097c15d7ae10b28faac3d enigma-1.00-r2.ebuild 1091 +MISC ChangeLog 5168 RMD160 981e75f08866ace7709b6660c99a6c5a988962a6 SHA1 df259583e73fffb702ccfeb6e178738ae0138345 SHA256 a7c2637144f0d65775d78d2fb24353f34a8a58411521c14a1595c34752e9cd6e +MD5 b876a246dc97a80ea6df9857d12073f5 ChangeLog 5168 +RMD160 981e75f08866ace7709b6660c99a6c5a988962a6 ChangeLog 5168 +SHA256 a7c2637144f0d65775d78d2fb24353f34a8a58411521c14a1595c34752e9cd6e ChangeLog 5168 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 @@ -21,10 +29,13 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata MD5 0162e91ab0ab9e3100c64961c9b064f0 files/digest-enigma-1.00-r1 241 RMD160 015898a8e7bb4125da33da6ad67481b02951d8a8 files/digest-enigma-1.00-r1 241 SHA256 cdaae290d7150a64930cade4da974b533731c10fea9f9069932349737c3d785c files/digest-enigma-1.00-r1 241 +MD5 0162e91ab0ab9e3100c64961c9b064f0 files/digest-enigma-1.00-r2 241 +RMD160 015898a8e7bb4125da33da6ad67481b02951d8a8 files/digest-enigma-1.00-r2 241 +SHA256 cdaae290d7150a64930cade4da974b533731c10fea9f9069932349737c3d785c files/digest-enigma-1.00-r2 241 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGBAOjdz7hIScOURERApBUAJ9ZNshDl+dPIgi1xe8IqHt6xD1IygCgot3n -AiMoTIZMsxFjxNxuc1h88iQ= -=iMoF +iD8DBQFGCB4cdz7hIScOURERApzhAJ9KtdAJTR77a0ZDi+xxQa0NXjr6YQCfdE8F +JLGdRO3L/fTgfGzsirh/dqQ= +=qPLt -----END PGP SIGNATURE----- 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 \