From: Michael Sterrett Date: Sat, 7 Feb 2015 01:13:04 +0000 (+0000) Subject: version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=664dd2f0965ae5846f0f50e2c2769a81bdec919d;p=gentoo.git version bump Package-Manager: portage-2.2.14/cvs/Linux x86_64 --- diff --git a/games-puzzle/enigma/ChangeLog b/games-puzzle/enigma/ChangeLog index 6daeb1eb0e6b..9f6e4e7e4975 100644 --- a/games-puzzle/enigma/ChangeLog +++ b/games-puzzle/enigma/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for games-puzzle/enigma -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/ChangeLog,v 1.54 2013/05/08 19:44:45 mr_bones_ Exp $ +# 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 $ + +*enigma-1.21 (07 Feb 2015) + + 07 Feb 2015; Michael Sterrett +enigma-1.21.ebuild, + +files/enigma-1.21-build.patch: + version bump 08 May 2013; Michael Sterrett enigma-1.20.ebuild: whitespace diff --git a/games-puzzle/enigma/Manifest b/games-puzzle/enigma/Manifest index 21b9b2bc1fbf..3f56486dd182 100644 --- a/games-puzzle/enigma/Manifest +++ b/games-puzzle/enigma/Manifest @@ -6,9 +6,12 @@ AUX enigma-1.01-gcc47.patch 461 SHA256 9ad32cf9d58e3ee1016de6faab417c2cbbe2b9881 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 +AUX enigma-1.21-build.patch 3543 SHA256 adf8008b557e08d37cb5dc898284f1c2ea714fe87d0644bf9cbe43841cde7a79 SHA512 accfb31abaadbee476961f38cc2f76a1fceac4befbf4721d4e08061a3509d05f2e534b4f8f69f1765e082a4ed4f70ccbba0c73c4479a49ee1cfde4c1ae1cdcc4 WHIRLPOOL 787501c1e36ed53026dff7d4eafc4d805e3d649681f80e224c99cc8ed304b8caa6b8dc6896f0eb313f5b569ed35a35dde09fb63a98c5e58c9e608dfc95451032 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 +DIST enigma-1.21.tar.gz 56409951 SHA256 d872cf067d8eb560d3bb1cb17245814bc56ac3953ae1f12e2229c8eb6f82ce01 SHA512 0cca56a193f0f416e0fde02caf2e30b61eef506b6c62e151ff575f5c130f1e2e778d77149007b114ebaeec3a3e793434328555cb5190954a0ae13ed6cee229f0 WHIRLPOOL 9583eaacd75c7a3cf5af172d1209771b599e6f8b0fed2b7ea6b0a76ccc2743615d47ac3199f56dd1e39203afc09a43d9aa5d8d879e38502b47d4b77274217b87 EBUILD enigma-1.01.ebuild 1349 SHA256 2cd4413f5c4291f0ead49fdb9d30e0d1e44deecf33296a6fb805900ca3b6ada6 SHA512 0fb9f15e344bbb642b450a2d5f9c36378219f004b8635bbacf1a46c1eed280ed0cf1e5af6258aac2dadb87ea4775af772d919b2684684579efe1f2e9bbb224c5 WHIRLPOOL 445b20782bf2197566359332a13fe9aaada9f89ee2a7814e3ef9846e54145638a4eb10154dc2f237150d81fc56d5afe045ad9f1e114a6f0eb1939d31e870bec2 EBUILD enigma-1.20.ebuild 1642 SHA256 b6383e41e449004dd62c7ca8d7a6154527a16d1ac2f3e1060d527b899d514160 SHA512 e069a882e4a51768d53f123363d917d028d6cfdda7deb2b331591841321123ff68480fb1f43b8f37a7bcd08a6412251950e6c0d937558bc3014d6dd0224c7b09 WHIRLPOOL 5e2ed8b4b4b15542f70ec796f4878fb074b8619c9d81229c84c013ae12f35bcff65fc4dc5bb8acd6ec83dc52cc304287e0f464b54d107c56e08da8d5c48af2b0 -MISC ChangeLog 8275 SHA256 5849c64277256c9c6d7b78cb618f4dda18a1dd0d20ef2db75f0a112ce44e1930 SHA512 442b8cacfac771797cc5fe7969725aad1c9d807a4b68c7208e8a9ad908703b456488fff08a5a78c9f6e6fa385a10fa35f8d2baaf30b6904718231cd2aa4d00f9 WHIRLPOOL 40b335d4b02b23b870958ca082054187706791887b3ebcaeb35e36a000112bd29913d8f346d42bdf2c5eb665ec29827e27548acb5d04c36763c2fe1cc7dfd5b8 +EBUILD enigma-1.21.ebuild 1701 SHA256 216a01c9a1a19e02c1db432336bdeb686e681cb6249a0e5afe258ec537a0dd32 SHA512 ffe7f7bc13d0ea743f689f90381161e5a9a909b2ed0722ae6bf94dd17e1ec1ad8a77ea3b48d7d5b6522926b4a0e9eb8fc32374d9ce898093c65c207f4ebc2207 WHIRLPOOL 9e3d1d365cc86541c19e9021604d69b86938733ad37bd0c702145549cd9ae27ac4f7e5d5210b4d5034bf0499ebd97ce058dbc4b579e416e05ed328324a5b6229 +MISC ChangeLog 8429 SHA256 ab058f05e46811d7d0f88520759a4457d6c2717a8d66c730bd00a1b029cd9a9c SHA512 27573ede26dab7663406afc1823d44e1686d7ed1b81db468d521bc3c7878887921b2ccc3f091bd1d223bfb07a45e391c7610e5cd0b78bbd02e57a448b7ce3b72 WHIRLPOOL 53401b2a0d37a8da5e342d57acba5ebff5daed526e99891642f308669dc4b3bf7a4bb5fa1fabb72395a244c468fa6b77e49f7007a4a4f2d854937a7e0fc31094 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada diff --git a/games-puzzle/enigma/enigma-1.21.ebuild b/games-puzzle/enigma/enigma-1.21.ebuild new file mode 100644 index 000000000000..90e6db56aece --- /dev/null +++ b/games-puzzle/enigma/enigma-1.21.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/enigma-1.21.ebuild,v 1.1 2015/02/07 01:12:58 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 + nls? ( virtual/libintl )" +DEPEND="${COMMON_DEPS} + sys-devel/gettext" +RDEPEND="${COMMON_DEPS} + media-fonts/dejavu + media-fonts/ttf-bitstream-vera + x11-misc/xdg-utils" + +src_prepare() { + cp /usr/share/gettext/config.rpath . + epatch "${FILESDIR}"/${P}-build.patch + sed -i \ + -e "s:DOCDIR:\"/usr/share/doc/${P}/html\":" \ + src/main.cc || die + eautoreconf +} + +src_configure() { + egamesconf \ + --with-system-enet \ + $(use_enable nls) +} + +src_install() { + DOCS="ACKNOWLEDGEMENTS AUTHORS CHANGES README doc/HACKING" \ + default + dosym \ + /usr/share/fonts/dejavu/DejaVuSansCondensed.ttf \ + "${GAMES_DATADIR}"/${PN}/fonts/DejaVuSansCondensed.ttf + dosym \ + /usr/share/fonts/ttf-bitstream-vera/Vera.ttf \ + "${GAMES_DATADIR}"/${PN}/fonts/vera_sans.ttf + 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.21-build.patch b/games-puzzle/enigma/files/enigma-1.21-build.patch new file mode 100644 index 000000000000..6d5e91ca76e4 --- /dev/null +++ b/games-puzzle/enigma/files/enigma-1.21-build.patch @@ -0,0 +1,110 @@ +diff -ru enigma-1.21.orig/Makefile.am enigma-1.21/Makefile.am +--- enigma-1.21.orig/Makefile.am 2014-12-19 16:26:06.000000000 -0500 ++++ enigma-1.21/Makefile.am 2015-02-06 18:20:22.239518323 -0500 +@@ -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.21.orig/configure.ac enigma-1.21/configure.ac +--- enigma-1.21.orig/configure.ac 2014-12-19 16:26:06.000000000 -0500 ++++ enigma-1.21/configure.ac 2015-02-06 18:20:22.282516643 -0500 +@@ -342,7 +342,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.21.orig/etc/Makefile.am enigma-1.21/etc/Makefile.am +--- enigma-1.21.orig/etc/Makefile.am 2014-12-19 16:26:05.000000000 -0500 ++++ enigma-1.21/etc/Makefile.am 2015-02-06 18:25:44.131945494 -0500 +@@ -1,18 +1,18 @@ + # 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 + + # Install AppData file +-appdatadir = $(prefix)/share/appdata ++appdatadir = /usr/share/appdata + dist_appdata_DATA = enigma.appdata.xml + # endif !MINGW32 + +diff -ru enigma-1.21.orig/etc/enigma.desktop enigma-1.21/etc/enigma.desktop +--- enigma-1.21.orig/etc/enigma.desktop 2014-12-19 16:26:05.000000000 -0500 ++++ enigma-1.21/etc/enigma.desktop 2015-02-06 18:20:22.282516643 -0500 +@@ -1,5 +1,5 @@ + [Desktop Entry] +-Version=1.21 ++Version=1.0 + Name=Enigma + Name[be]=Enigma + Name[cs]=Enigma +@@ -44,5 +44,5 @@ + StartupNotify=false + Icon=enigma + Type=Application +-Categories=Application;Game;PuzzleGame; ++Categories=Game;X-PuzzleGame; + +diff -ru enigma-1.21.orig/po/Makefile.in.in enigma-1.21/po/Makefile.in.in +--- enigma-1.21.orig/po/Makefile.in.in 2014-12-19 16:26:06.000000000 -0500 ++++ enigma-1.21/po/Makefile.in.in 2015-02-06 18:20:22.283516604 -0500 +@@ -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.21.orig/src/Makefile.am enigma-1.21/src/Makefile.am +--- enigma-1.21.orig/src/Makefile.am 2014-12-19 16:24:38.000000000 -0500 ++++ enigma-1.21/src/Makefile.am 2015-02-06 18:20:22.283516604 -0500 +@@ -12,7 +12,7 @@ + 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 \ +@@ -440,7 +440,7 @@ + + else # not MINGW32 + +- localedir_enigma := $(datadir)/locale ++ localedir_enigma := /usr/share/locale + mingw_ldadd = + + endif