old

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 5 insertions, 204 deletions

diff --git a/games-puzzle/enigma/ChangeLog b/games-puzzle/enigma/ChangeLog
index 9f6e4e7e4975..a5c40f3ecc13 100644
--- a/games-puzzle/enigma/ChangeLog
+++ b/games-puzzle/enigma/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/enigma
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/ChangeLog,v 1.55 2015/02/07 01:12:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/ChangeLog,v 1.56 2015/02/07 01:55:07 mr_bones_ Exp $
+
+  07 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org> -enigma-1.20.ebuild,
+  -files/enigma-1.20-autotools.patch:
+  old
 
 *enigma-1.21 (07 Feb 2015)
 
diff --git a/games-puzzle/enigma/enigma-1.20.ebuild b/games-puzzle/enigma/enigma-1.20.ebuild
deleted file mode 100644
index 083521a22a00..000000000000
--- a/games-puzzle/enigma/enigma-1.20.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/enigma-1.20.ebuild,v 1.2 2013/05/08 19:44:45 mr_bones_ Exp $
-
-EAPI=5
-inherit autotools eutils gnome2-utils games
-
-DESCRIPTION="puzzle game similar to Oxyd"
-HOMEPAGE="http://www.nongnu.org/enigma/"
-SRC_URI="mirror://sourceforge/enigma-game/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-
-COMMON_DEPS="media-libs/sdl-ttf
-	media-libs/libsdl[video]
-	media-libs/sdl-mixer
-	media-libs/sdl-image[jpeg,png]
-	media-libs/libpng:0=
-	sys-libs/zlib
-	net-misc/curl
-	|| ( >=dev-libs/xerces-c-3[icu] >=dev-libs/xerces-c-3[-icu,-iconv] )
-	net-libs/enet:0
-	media-fonts/dejavu
-	nls? ( virtual/libintl )"
-DEPEND="${COMMON_DEPS}
-	sys-devel/gettext"
-RDEPEND="${COMMON_DEPS}
-	x11-misc/xdg-utils"
-
-src_prepare() {
-	rm -rf lib-src/enet
-	cp /usr/share/gettext/config.rpath .
-	epatch "${FILESDIR}"/${P}-autotools.patch
-	sed -i \
-		-e "s:DOCDIR:\"/usr/share/doc/${P}/html\":" \
-		src/main.cc || die
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf $(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	#rm -f "${GAMES_DATADIR}"/${PN}/fonts/DejaVuSansCondensed.ttf
-	dosym \
-		/usr/share/fonts/dejavu/DejaVuSansCondensed.ttf \
-		"${GAMES_DATADIR}"/${PN}/fonts/DejaVuSansCondensed.ttf
-	dodoc ACKNOWLEDGEMENTS AUTHORS CHANGES README doc/HACKING
-	dohtml -r doc/*
-	doman doc/enigma.6
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/enigma/files/enigma-1.20-autotools.patch b/games-puzzle/enigma/files/enigma-1.20-autotools.patch
deleted file mode 100644
index 632c10ba099a..000000000000
--- a/games-puzzle/enigma/files/enigma-1.20-autotools.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff -ru enigma-1.20.orig/Makefile.am enigma-1.20/Makefile.am
---- enigma-1.20.orig/Makefile.am	2013-04-01 14:31:58.000000000 -0400
-+++ enigma-1.20/Makefile.am	2013-05-07 18:50:08.624851119 -0400
-@@ -3,12 +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
- 
- .PHONY: tolua
-diff -ru enigma-1.20.orig/configure.ac enigma-1.20/configure.ac
---- enigma-1.20.orig/configure.ac	2013-04-01 14:33:05.000000000 -0400
-+++ enigma-1.20/configure.ac	2013-05-07 18:47:52.420666003 -0400
-@@ -292,7 +292,6 @@
- 	CXXFLAGS="$CXXFLAGS -O2 -ffast-math -fomit-frame-pointer"
- 	AC_MSG_RESULT(yes)
- else
--	CXXFLAGS="$CXXFLAGS -g"
- 	AC_MSG_RESULT(no)
- fi
- 
-diff -ru enigma-1.20.orig/etc/Makefile.am enigma-1.20/etc/Makefile.am
---- enigma-1.20.orig/etc/Makefile.am	2013-04-01 14:31:57.000000000 -0400
-+++ enigma-1.20/etc/Makefile.am	2013-05-07 18:48:20.707666061 -0400
-@@ -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
- 
-diff -ru enigma-1.20.orig/etc/enigma.desktop enigma-1.20/etc/enigma.desktop
---- enigma-1.20.orig/etc/enigma.desktop	2013-04-01 14:31:57.000000000 -0400
-+++ enigma-1.20/etc/enigma.desktop	2013-05-07 18:49:07.889998154 -0400
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Version=1.0
- 
- Name=Enigma
-@@ -8,7 +7,6 @@
- Comment=Uncover pairs of stones while navigating obstacles using a marble
- Comment[eo]=Malkovru parojn de ŝtonojn dum vi navigas obstaklojn kun globeto
- 
--FilePattern=enigma;
- TryExec=enigma
- Exec=enigma
- Terminal=false
-@@ -17,5 +15,5 @@
- StartupNotify=false
- 
- Type=Application
--Categories=Application;Game;PuzzleGame;
-+Categories=Game;X-PuzzleGame;
- 
-diff -ru enigma-1.20.orig/lib-src/Makefile.am enigma-1.20/lib-src/Makefile.am
---- enigma-1.20.orig/lib-src/Makefile.am	2013-04-01 14:33:52.000000000 -0400
-+++ enigma-1.20/lib-src/Makefile.am	2013-05-07 18:49:37.009968740 -0400
-@@ -1 +1 @@
--SUBDIRS = oxydlib lua zipios++ enet enigma-core
-+SUBDIRS = oxydlib lua zipios++ enigma-core
-diff -ru enigma-1.20.orig/po/Makefile.in.in enigma-1.20/po/Makefile.in.in
---- enigma-1.20.orig/po/Makefile.in.in	2013-04-01 14:34:35.000000000 -0400
-+++ enigma-1.20/po/Makefile.in.in	2013-05-07 18:50:47.291484194 -0400
-@@ -25,12 +25,12 @@
- exec_prefix = @exec_prefix@
- datarootdir = @datarootdir@
- 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)
- 
-diff -ru enigma-1.20.orig/src/Makefile.am enigma-1.20/src/Makefile.am
---- enigma-1.20.orig/src/Makefile.am	2013-04-01 14:33:59.000000000 -0400
-+++ enigma-1.20/src/Makefile.am	2013-05-07 18:51:50.173261187 -0400
-@@ -12,12 +12,11 @@
- CXXFLAGS = @CXXFLAGS@\
- 	-DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \
- 	-DDOCDIR=\"$(docdir)\" \
--	-DLOCALEDIR=\"$(localedir_enigma)\" \
-+	-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@
- 
-@@ -433,7 +432,7 @@
- 
- else # not MINGW32
- 
--  localedir_enigma := $(datadir)/locale
-+  localedir_enigma := /usr/share/locale
-   mingw_ldadd =
- 
- endif
-@@ -442,7 +441,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 \