version bump (bug #468922)

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64

4 files changed, 215 insertions, 13 deletions

diff --git a/games-puzzle/enigma/ChangeLog b/games-puzzle/enigma/ChangeLog
index 8026bcfb914d..0b7f4474a59e 100644
--- a/games-puzzle/enigma/ChangeLog
+++ b/games-puzzle/enigma/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-puzzle/enigma
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/ChangeLog,v 1.52 2012/09/28 12:24:34 tupone Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/ChangeLog,v 1.53 2013/05/08 05:05:35 mr_bones_ Exp $
+
+*enigma-1.20 (08 May 2013)
+
+  08 May 2013; Michael Sterrett <mr_bones_@gentoo.org> +enigma-1.20.ebuild,
+  +files/enigma-1.20-autotools.patch:
+  version bump (bug #468922)
 
   28 Sep 2012; Tupone Alfredo <tupone@gentoo.org> enigma-1.01.ebuild,
   +files/enigma-1.01-gcc47.patch:
diff --git a/games-puzzle/enigma/Manifest b/games-puzzle/enigma/Manifest
index 40f79989fd30..1ce8e2a6a267 100644
--- a/games-puzzle/enigma/Manifest
+++ b/games-puzzle/enigma/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX enigma-1.01-autotools.patch 2865 SHA256 141ea4b51ee272c2842983cab09e5631755f8738e367408de37fb435b84131e1 SHA512 04bcb4f5a59c7e900f94c9843d39cc9e082eefd024a5b95dd4f5a03f79e26cd5b6115d7b8715b97d6235d5b7136c18a07048656c486f3ed81a529054445a8ebe WHIRLPOOL e9f55ef6b03095feac955092678b866c6b59a2ba12b943e0b13c3ebed82c2e88a04d81395c9e2ce0251a08f14513f9612a77acc031ad0ecfcc1b20516795f11c
 AUX enigma-1.01-gcc43.patch 813 SHA256 24f5f4f4b4235622d84bc5fd4c954aeffa7c3f2fccd1daa78ad458e44afca897 SHA512 ab5a4c37c1b6053904e60e11012e0aa9da2436860662085412a1b033e6c4b398f05e2b1d9fb6e8d531cef1d8ab84fe8788da2be216aac21be36a85ce41a40f9f WHIRLPOOL 5711326539e25d66047144f25c5dd1ca506c468dae967849b4a74664d01949ea773da02c275f7841574f987d2697a344e057ecf729af95a68e8d896d257e0151
 AUX enigma-1.01-gcc44.patch 1693 SHA256 77b9fd58a843a21afb8c8769e562e86c5d7e5fcaf87067ef4dd91cbe09b207ff SHA512 f65bce6c40a1d28128ced7b5fcf412a8314e4a37a592eedc5e2e973c9427233d2e6c48cc25df4db9ea4d831e8e5cd2d652978805fe810b726c87844b96b6caff WHIRLPOOL 31b85ab5075234883daa9f8baca4e74f9e67f63d437fcf3582d1b0e4e44b43081532e0fca1d9c18779a9e0b95c36b244ef3415f3d447b6c804097be1f7bce26b
@@ -8,14 +5,10 @@ AUX enigma-1.01-gcc46.patch 548 SHA256 712f8ffaf4e32c4603e8d977bc94feaadef7d5dfe
 AUX enigma-1.01-gcc47.patch 461 SHA256 9ad32cf9d58e3ee1016de6faab417c2cbbe2b9881f30502b7cad61fe398b5694 SHA512 cfc36af8af57526dc72509aedb9bdf8f5d29f09a6ccf7b151002d024a7dff3e43e12961b9921c1ff720dae3513b4b8afe870fb14a314a37bb3650697738a68c6 WHIRLPOOL 67a013d70fff1614e4a64f38f047329876f6141231bfe3e6bc5490f25cf99951fe3941f396f7b0eb1448d37c4b9c0ae795c0f336bf6b51d56879a647ee584eda
 AUX enigma-1.01-libpng15.patch 393 SHA256 1351bfa3518b79bfab3473dd44bc6256b05c52d0d24c0706f52356603ecfac09 SHA512 2c2f2bdd4ab6916ea9d49ea25ae2e5404d07bf8bc59516e8e456acc0a460206c69f87f3a8f56b604416f73adcbc0b879441682f7fea1a8714dca20a95e97a146 WHIRLPOOL b3ff61a4917369ad7e091f76912f6d4ad3c8a37ba57fa968bf1baf6f7ffa315a614c86489753f992930846137ea229059e82d5060f1482f645c3819166aefbe8
 AUX enigma-1.01-xerces-c.patch 3824 SHA256 9868afa6bbb4f430bc708f6c5ce2c7c9b434ea044e9ccf239d706d56071c710f SHA512 db5ee4e19578ffc721f23ec92372557a1f77103db21b80dc33a11351d9bfb5e4a4353169daec563dd95631b1e4e072fa950cd43d3fc3991e8cb3333c00994134 WHIRLPOOL 259f7b8b0bcc8e471a7959d3a36477a61695de31a65d15dbe16db64d387b4a2f8036e19765e065a619f270e8e9ecb217c6fb25524f57d5cadb438f452fe30238
+AUX enigma-1.20-autotools.patch 4371 SHA256 3d40f89404732cdb240d03b903aa0c2f36363881c15e8a1e91934b428849d3a5 SHA512 9cf0ea54acedafa032c032c3a3b5b22174e9a9839409299d25474140301da21a4925d6000fe42205d5fe29dc1177b269c7c632556c94628927a6652782c34089 WHIRLPOOL 9979ec82a4300940c9f2e3e31dfaa7250e5e7e22c396945004fa4651ecb2ae9bf49c13b83a66a6ef7ca7dd88f993a83273f8230cc872676971c3c69051732dc8
 DIST enigma-1.01-64bit.tar.gz 10891095 SHA256 ae87ecf635bd89bec143a8011e30a4a3b546edb3fe2ed2fca243d366bb599736 SHA512 345034bcdb7d237cd3e70d2439657e738456e5fd0c761ff3257f17e7c6adee78ee48673ce24f562cedf46040c4749081beaf568e0d823900c9179078fefd8686 WHIRLPOOL 6ae0955272bb443db22ce5f2f55103440a22077e260957168277f14f3f4be68c087aac245aebc81234f66a3225618283800f9a1bc8e3822d4b88ae741e6e3d93
+DIST enigma-1.20.tar.gz 36510060 SHA256 f2ae2377a37a1fba85ef884f3762b50e191107e1d4520d4e2e0c21901d19758b SHA512 a84e783b0a27d6dd0f20154fb32f7b22ecc2428a09ad54efcd504da1cdd0d0ec7591cd2ef49e4d5e67cb398ca01c25c4280aec7f4c25f17b80fd14882c158dc3 WHIRLPOOL cc254d70559b584b5dfcc76255dd497ff056d75a64e8a88a71f2aa8436ae85880d77f70076a78985f68a2f15caf44bca40bf44b4aa6f76ab9dc99ab5283a17d8
 EBUILD enigma-1.01.ebuild 1349 SHA256 2cd4413f5c4291f0ead49fdb9d30e0d1e44deecf33296a6fb805900ca3b6ada6 SHA512 0fb9f15e344bbb642b450a2d5f9c36378219f004b8635bbacf1a46c1eed280ed0cf1e5af6258aac2dadb87ea4775af772d919b2684684579efe1f2e9bbb224c5 WHIRLPOOL 445b20782bf2197566359332a13fe9aaada9f89ee2a7814e3ef9846e54145638a4eb10154dc2f237150d81fc56d5afe045ad9f1e114a6f0eb1939d31e870bec2
-MISC ChangeLog 8011 SHA256 e10a00e45d556eee894623293c829c3022dfbf8315c8fda97f5e671b59c1fd5c SHA512 e7748767890ff4411f34575d2fa3aadf3637d264469930f94938488b1a3b66154d539ac09efba0c8d81b8a82f081b22a5b5abeb038320a85f34d751c231a5d07 WHIRLPOOL 7726c761dbea98bc08d00bc4a88735dde83b39ab4540f8eb0766412d8b2424f529db7e1fbbea4ab0dbafcd6c65373d69dc59e09d251a8f510c353f40ea2e2d00
+EBUILD enigma-1.20.ebuild 1657 SHA256 d35bbf96713fef5d5bc4af72ae17b3d9763f8408dec21cd7697b214d1a1f9fb2 SHA512 488fea3acbbc7a93a0189ba90524f56758a7a91ef2edbbea60052bf5811b041423b0a687abac77b29e461ead0891056cbc8ba96f8f1d4e144eaaf14807918270 WHIRLPOOL ce830121f3c87f5a51abdac941fa370af6bbfc5ea2d8566d4c6693707f34ce68d31497db0ca5a1d709b2e9a9f9b018b77066558fe1067299a78ded229e3e0012
+MISC ChangeLog 8186 SHA256 3738188603393571a13cfd953059e8d76037cdce4e0576550f10eee3b047b758 SHA512 91e2a1d2d66c9e89057aae88e11695bb70a84176336a4b1a7b324da5c43cf9ac48b7a5eb1d1d967b99950d55442cab20610c253d513935e9d1aeb4e8af1fbc74 WHIRLPOOL 7ddd4105e4fef89200d216d1253d1d7ff16f64f886f317f288a831d06fcad207a15c658575c860c96aa2dea0b65c25fb1ca13cc540174ca0331c45bc1416f232
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlBllxEACgkQIY77eQFFFC3UqgCgzxJAEl9LJZ+3gGqKadAg6Bp1
-xyIAoKmZ9xj6zCVoBD2Vse4UcD0fEpo9
-=giHj
------END PGP SIGNATURE-----
diff --git a/games-puzzle/enigma/enigma-1.20.ebuild b/games-puzzle/enigma/enigma-1.20.ebuild
new file mode 100644
index 000000000000..4208c9e119cb
--- /dev/null
+++ b/games-puzzle/enigma/enigma-1.20.ebuild
@@ -0,0 +1,71 @@
+# 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.1 2013/05/08 05:05:35 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
new file mode 100644
index 000000000000..632c10ba099a
--- /dev/null
+++ b/games-puzzle/enigma/files/enigma-1.20-autotools.patch
@@ -0,0 +1,132 @@
+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 \