version bump

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

5 files changed, 116 insertions, 19 deletions

diff --git a/games-board/ace/ChangeLog b/games-board/ace/ChangeLog
index 77a91cd460af..f1fc86f56f30 100644
--- a/games-board/ace/ChangeLog
+++ b/games-board/ace/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-board/ace
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ChangeLog,v 1.23 2011/09/15 07:23:31 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ChangeLog,v 1.24 2012/09/24 15:41:03 mr_bones_ Exp $
+
+*ace-1.4 (24 Sep 2012)
+
+  24 Sep 2012; Michael Sterrett <mr_bones_@gentoo.org> +ace-1.4.ebuild,
+  +files/ace-1.4-libpng15.patch, +files/ace-1.4-no-xpm.patch:
+  version bump
 
   15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> ace-1.3.ebuild,
   +files/ace-1.3-libpng15.patch:
diff --git a/games-board/ace/Manifest b/games-board/ace/Manifest
index 0960d805b76b..cce50ccb50ff 100644
--- a/games-board/ace/Manifest
+++ b/games-board/ace/Manifest
@@ -1,17 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX ace-1.3-implicit-pointer.patch 332 RMD160 3244045392a207891764db9884ad697fc0cd5472 SHA1 fbfbe2e1622e313e3bd1c524383717aab399b9f4 SHA256 eb0f02425048347f5596e93cc5c0f93bf6ef3e46823e525ab8ca244c615b1a64
-AUX ace-1.3-libpng15.patch 845 RMD160 5571a4e96fb52f4810a5e1ae15cc8366f6f2c9a0 SHA1 b3bc2d5184b6c0b01e1d95424172adccffe6dfa1 SHA256 3b24eb7e13e32515e47ea615ba6adce75dc1889aa36a0b1e61ce420f8aa45a6f
-AUX ace-1.3-no-xpm.patch 572 RMD160 f7d5675f909a274907210b846573b5937ad2dcf1 SHA1 5814cbf0131b9cc4ffceeb17431e5922b6733f03 SHA256 c2f2ad6cdcc774b8db07f69b45a9debd0b289556ff60204e61bbc0f39c0de503
-DIST ace-1.3.tar.gz 528916 RMD160 07772190956ebe2a0f78a613c40ab6e0221e0df4 SHA1 3b9b79e525c7e819e79a48c95fe2ad1bf2a33a49 SHA256 4fb6ca9e1ff34e42d9498f06e2bccaa61f5650daf48774015468d5f75c5347d3
-EBUILD ace-1.3.ebuild 1109 RMD160 184270d2df7391d7e181fed48e3c67493ef56d4e SHA1 8cf4305c16bde4e1feb6a1fae0305582d2c85aea SHA256 fd034cae74bb980d6d21899a10eb522c3f518eb96441c22aa043de8a982fc660
-MISC ChangeLog 3109 RMD160 381320395c7474c3ccc85b7ebaf7e1da7bcec9fb SHA1 7bc63eedc30507e52fb46ffe0a54373c0b1a6cd5 SHA256 f5735bd2c9d90d6e23de849ba6501505b8d35b13708b0e2db61fb24e58f7c880
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iF4EAREIAAYFAk5xqCsACgkQXkR9YqOcLPHwqwD+K6Fd6Ga9F1eSz4ISg/xQ0f88
-Ho8zGyEcHo/442jg6pUA/0WEB1Yoby62Do5xMrvR9k2h5pd4/zKjeb2VcbxAHpP3
-=XSkB
------END PGP SIGNATURE-----
+AUX ace-1.3-implicit-pointer.patch 332 SHA256 eb0f02425048347f5596e93cc5c0f93bf6ef3e46823e525ab8ca244c615b1a64 SHA512 6aca149fd4c1476fb4f36600818dfb1ff214a1a8deba1efd9aba98e3cf838e294a789159155edccd90fd456e9a54a9f49e89e91a2bac96501498f72801324e92 WHIRLPOOL c24c2587575173346e57afe2a8adfe596145b3b94d90653f17b9d8a4092c19cc720f66350f8f06caf0021fbad39949d2cc2812b1e905f3209e00c6a3c2d23323
+AUX ace-1.3-libpng15.patch 845 SHA256 3b24eb7e13e32515e47ea615ba6adce75dc1889aa36a0b1e61ce420f8aa45a6f SHA512 f403f0eb3d176e1977837536ce0f9eb806fe624cd91e9a2813a8ae9609e032143772fc7de6dc774bd366c8dbafaca64f03186448f47f7ff95689579eac4c9cfc WHIRLPOOL 1b1a0c438cb16d62db9d61714bf366c8ece4b73711e3e31d84166ce5d4502b58fe5c63b0e1020cd5ef0b05362e6dcfffdb68065430284e9cf29a40999061282e
+AUX ace-1.3-no-xpm.patch 572 SHA256 c2f2ad6cdcc774b8db07f69b45a9debd0b289556ff60204e61bbc0f39c0de503 SHA512 1b5c2cd4c5e9e9d9b29b0b25c2011a228915092d516e30334af09c0ff5654cfeb1e41fc85d28a1de7338a298cac963463dcbefc224e05573caf3dfb588e17d2b WHIRLPOOL 227328f87b5a1d95c13791746dd9c00d3105b11d43b49abc62bb81b76396938221d3fa6b15bdb40dcca0ab2d2d32682b777b00826f17d6607607cd054cc3779f
+AUX ace-1.4-libpng15.patch 845 SHA256 3b24eb7e13e32515e47ea615ba6adce75dc1889aa36a0b1e61ce420f8aa45a6f SHA512 f403f0eb3d176e1977837536ce0f9eb806fe624cd91e9a2813a8ae9609e032143772fc7de6dc774bd366c8dbafaca64f03186448f47f7ff95689579eac4c9cfc WHIRLPOOL 1b1a0c438cb16d62db9d61714bf366c8ece4b73711e3e31d84166ce5d4502b58fe5c63b0e1020cd5ef0b05362e6dcfffdb68065430284e9cf29a40999061282e
+AUX ace-1.4-no-xpm.patch 572 SHA256 c2f2ad6cdcc774b8db07f69b45a9debd0b289556ff60204e61bbc0f39c0de503 SHA512 1b5c2cd4c5e9e9d9b29b0b25c2011a228915092d516e30334af09c0ff5654cfeb1e41fc85d28a1de7338a298cac963463dcbefc224e05573caf3dfb588e17d2b WHIRLPOOL 227328f87b5a1d95c13791746dd9c00d3105b11d43b49abc62bb81b76396938221d3fa6b15bdb40dcca0ab2d2d32682b777b00826f17d6607607cd054cc3779f
+DIST ace-1.3.tar.gz 528916 SHA256 4fb6ca9e1ff34e42d9498f06e2bccaa61f5650daf48774015468d5f75c5347d3 SHA512 f318446040e884a073b6cefb9a912de4006759805045bbb139cd4ecc167a81cbac6526004613fbd1cf2ad8c874fcfddfa56ec907c4bfd09009f650056d9d61cd WHIRLPOOL 07c310b39e22c5163bd7ce44a78a217ac2232f075ec2fce628328b362c939b99805e5b8fdaf11c806eb3cf51b595750859d81329ba20a9d66fd80a19ce618715
+DIST ace-1.4.tar.gz 530490 SHA256 1fee3b0533921a42873c0623f33d873a067b1eec58f2c70c01449146e79a4cce SHA512 cd382db95dc17d75a76809c7f1e096e14f5863c1166aa5db7f93204ce949a9ed21979212946b9d3a09667f4a93b30f4cc44a220940f9b5dd8996f28ecb4a6dcc WHIRLPOOL a6a4209f8a75943673f5c46eb093fcd4f8d7f4109f4286831fad9adac63a153065872e6cfbc397375b9e1bb4e51431a317339e2b29b7488f63746c77fd40ac2a
+EBUILD ace-1.3.ebuild 1109 SHA256 fd034cae74bb980d6d21899a10eb522c3f518eb96441c22aa043de8a982fc660 SHA512 9bf565964fe21433ce2a50c7673fbad1dc1f8d59d71553bdefe908ab53b21dcef8088a1d030ca8f376edb40fe14afe36e117911973b0ac971655242b016a00e8 WHIRLPOOL 72424529dcf7f68061e6d700c86ca2b0d42e144e3d11256c0549148374716247875926ead5c7cc0f2f3f3ef40d3edc22ab7853a5cc5c2ebd623316bae14c7d86
+EBUILD ace-1.4.ebuild 1044 SHA256 4ca31be2170682ea925aba70134aea217f64e3713fce4f5789e7b1ed713167c8 SHA512 de307f07f41a41ffbc847cb9fe21dd1e79b0f0855f9091cf254aa8c57a313f87c3c57a24b755bfc32244dc43f6f844ff9b61082198fed9b24aa24ac45b3e333b WHIRLPOOL 38bd2b42a7f319c250f66eefcfcc9b3407516014f45f6987d5f12d5a11510c2e2de607c65e6586a340bbbbb2dfd2eebe0f91e63fe62b6a5897ff99e38962a486
+MISC ChangeLog 3283 SHA256 1d21b2f9cf13cebebde0de4173fc476234bb155d1c147430434ee62475d31749 SHA512 365a42a1c77d00b04b31f0afe2ab55f3726c68dc5e513644a42f83ef59e3dcd58e7efcc52f76f5b21dceba74a0ec2842b76a82a1760b54161a40230bb00dd0d2 WHIRLPOOL d6f358d9b24d50369bc2ed7fb1ba77973312e0d6358d8b749802b56ba108ba53aeccc971d3f93bfe7ada50d9eae14a2f536beac61ced7c47100c2a1007959cec
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-board/ace/ace-1.4.ebuild b/games-board/ace/ace-1.4.ebuild
new file mode 100644
index 000000000000..e3f2e0d583be
--- /dev/null
+++ b/games-board/ace/ace-1.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ace-1.4.ebuild,v 1.1 2012/09/24 15:41:03 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils games
+
+DESCRIPTION="DJ Delorie's Ace of Penguins solitaire games"
+HOMEPAGE="http://www.delorie.com/store/ace/"
+SRC_URI="http://www.delorie.com/store/ace/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	media-libs/libpng"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+PATCHES=( "${FILESDIR}"/${P}-no-xpm.patch "${FILESDIR}"/${P}-libpng15.patch )
+
+src_configure() {
+	egamesconf \
+		--disable-dependency-tracking \
+		--disable-static \
+		--program-prefix=ace-
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README
+	dohtml docs/*
+	newicon docs/as.gif ${PN}.gif
+	cd "${D}${GAMES_BINDIR}" && {
+		local p
+		for p in *
+		do
+			make_desktop_entry $p "Ace ${p/ace-/}" /usr/share/pixmaps/${PN}.gif
+		done
+	}
+	prepgamesdirs
+}
diff --git a/games-board/ace/files/ace-1.4-libpng15.patch b/games-board/ace/files/ace-1.4-libpng15.patch
new file mode 100644
index 000000000000..f0ec4e9f6359
--- /dev/null
+++ b/games-board/ace/files/ace-1.4-libpng15.patch
@@ -0,0 +1,29 @@
+--- lib/make-imglib.c
++++ lib/make-imglib.c
+@@ -86,7 +86,7 @@
+     png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0);
+     info_ptr = png_create_info_struct (png_ptr);
+ 
+-    if (setjmp (png_ptr->jmpbuf)) {
++    if (setjmp (png_jmpbuf(png_ptr))) {
+       fclose (f);
+       continue;
+     }
+--- lib/xwin.c
++++ lib/xwin.c
+@@ -824,13 +824,13 @@
+   png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0);
+   info_ptr = png_create_info_struct (png_ptr);
+ 
+-  if (setjmp (png_ptr->jmpbuf)) {
++  if (setjmp (png_jmpbuf(png_ptr))) {
+     fprintf(stderr, "Invalid PNG image!\n");
+     return;
+   }
+ 
+   file_bytes = src->file_data;
+-  png_set_read_fn (png_ptr, (voidp)&file_bytes, (png_rw_ptr)png_reader);
++  png_set_read_fn (png_ptr, (png_voidp)&file_bytes, (png_rw_ptr)png_reader);
+ 
+   png_read_info (png_ptr, info_ptr);
+ 
diff --git a/games-board/ace/files/ace-1.4-no-xpm.patch b/games-board/ace/files/ace-1.4-no-xpm.patch
new file mode 100644
index 000000000000..25b06754be42
--- /dev/null
+++ b/games-board/ace/files/ace-1.4-no-xpm.patch
@@ -0,0 +1,24 @@
+--- lib/table.c.orig	2008-01-15 15:05:27.000000000 -0500
++++ lib/table.c	2010-09-29 17:34:40.925310980 -0400
+@@ -23,7 +23,6 @@
+ #include <X11/Xutil.h>
+ #include <X11/keysym.h>
+ #include <X11/Xatom.h>
+-#include <X11/xpm.h>
+ 
+ #define CD printf("%d: %d %d %d %d\n", __LINE__, ex, ey, ew, eh)
+ #undef CD
+@@ -165,13 +164,6 @@
+   xwin_create (width, height);
+ }
+ 
+-typedef struct PicRec {
+-  Pixmap pixmap;
+-  Pixmap mask;
+-  char **xpm_data;
+-  int image_table_index;
+-} PicRec;
+-
+ int get_picture_default_width  = CARD_WIDTH;
+ int get_picture_default_height = CARD_HEIGHT;
+