Version bump.

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 109 insertions, 6 deletions

diff --git a/app-emulation/hercules/ChangeLog b/app-emulation/hercules/ChangeLog
index 516d4e5d4272..e3bd8de4d2ed 100644
--- a/app-emulation/hercules/ChangeLog
+++ b/app-emulation/hercules/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/hercules
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/hercules/ChangeLog,v 1.35 2013/07/28 12:01:18 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/hercules/ChangeLog,v 1.36 2013/08/27 16:29:57 vapier Exp $
+
+*hercules-3.09 (27 Aug 2013)
+
+  27 Aug 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/hercules-3.09-aliasing.patch, +hercules-3.09.ebuild:
+  Version bump.
 
   28 Jul 2013; Fabian Groffen <grobian@gentoo.org> hercules-3.08.ebuild:
   Marked ~x86-macos
diff --git a/app-emulation/hercules/Manifest b/app-emulation/hercules/Manifest
index 588c7451a45e..511f85ead822 100644
--- a/app-emulation/hercules/Manifest
+++ b/app-emulation/hercules/Manifest
@@ -3,22 +3,35 @@ Hash: SHA256
 
 AUX hercules-3.06-build.patch 600 SHA256 e4e70f398e24cc72207548319454d7e8cf64fa54e3e85908be67a0715b9b722b SHA512 09ef331e53276d3d6b1b0323d76ea88e6dcae16ff57d1fced82d4df132089b841bbd8fda4fc4c7f0a16f2a60ab3cf914ce94e693470d5c395ebe2123aa29dc5d WHIRLPOOL 713d931944bfdbfe870795372cdca65b84bc76107f54f890b1a9adba725de6116d11124f1aa2512ab36e6559c3c8804c954ee7770490dc66d83341a50eb4e32a
 AUX hercules-3.06-gcc44.patch 373 SHA256 b61175f1e9c607b4e1413695d022fbd71570bdda2866808ff7567841895ed125 SHA512 317c5165c302f23446e8a529ce59b7c3ac859d4ba8ea2074345546a75e9007a76afc9e7f95ab1aa057514ec1d8ff7c97e8e48f73473fd332ba8294ae93cdaf7a WHIRLPOOL 7c293cfd5e8e1d1396753b1263812661e4816f038e5858adfaf7a0d6818b4c33aacfdd284dcac990cc56d94423189dc2a0ef054b3f30bcae6e119f34c525de19
+AUX hercules-3.09-aliasing.patch 1720 SHA256 1bb2f4668c2792b70f23d221b0db81532c2584199b5dcde291787e918f172d9b SHA512 e995d72ea28b418f65f059f6ff2ba078c4bd4160980c7c236782e9d2ea4daf67b45036acb9e36e3e29c3d949e35ffaa7f1c87166464c59d7551bff58524d130d WHIRLPOOL 9b6d82c095f7e64685903054ad531b56a9238e0e2cd1e30f3f7d31535ea9d6dd327d73293cba183b988889d0d7f12756449bf682c080c7689949e58b223a78f0
 DIST hercules-3.04.tar.gz 2079774 SHA256 4512a7c2b86b4a92c337c99761295aa4eaa54e90da3d0881c283b69c03b1eed5 SHA512 81277072de19f357897fafca7c1e01dcb9c511d0d428f494c7c73b9a9d9b32fc2b1414f85435120f1a05edf495ad689519c9ee4d17e3d60019c04c51d89252b0 WHIRLPOOL bbf53ccc8ae774007141961bc13c11dedd12b58f3a39cf37ac99a48d66e2c0f66e14197516eb20e2ef88525299cb904721f32a178c60d9c9bc756a49649268b0
 DIST hercules-3.05.tar.gz 2470621 SHA256 f190221fa25692c0316be331f618c0675f9f9875c44b8af3efa7a431d138b1e2 SHA512 0ea3e3dfb119f90721df7bddb1bd8d5329f13ca744325454459f7e716ae8859ecc23b5bd61afe9f1ed7426a2cd9d57ce881653620c4c5601781f7ba1f5022321 WHIRLPOOL 089362403fadac9973f2f4312010a03531553cf50beaf1402b0605f903dc01add14c50627c4b08831d1bd7a6dc9e72177114805c106833411c9f58572363021d
 DIST hercules-3.06.tar.gz 2658262 SHA256 fa00b17c86a47133108c49973ba343d589f0e8777a115d827ef3da9aafbda22b SHA512 a938c2be64094ca412fb9094942088e344aa67b0af324af674d4fff73c6e936ffc6e384a5edcb48d1c31439c55322bf5e6b2e7ea36e7e7c9e416d8522240b1c5 WHIRLPOOL dbebb54e19ea5016d576153a0818ff5ce8e7114449837f127ad1c0ea82c561306a443dee2bd47d9a8c4afbd6ca257ca350348e773def86eccac76d3c754ea29c
 DIST hercules-3.07.tar.gz 2701835 SHA256 02d5f6c66d699d413a4db9ef5a799249a6645ac10f2af1edb37992e7fa1f7724 SHA512 5e4e55e9a11f0b7e78daafe9f219243d298bbdeeaf35f82c862db0c9f0de24f553239d0b76acaf7673cf54d03278193c2f93df3fba410874f95dbf93b5bb0e64 WHIRLPOOL 0b68910dc43fb49ca2e54f2e405f03cc15e86ed7f297fb81ca4f62f8e11077097d019e8d125a66fedd2666e988c017d1b8066a61857dc520b6c6f3c99059b00c
 DIST hercules-3.08.tar.gz 2684844 SHA256 85e217773587f2278d4b6cb6bc815e042cfc982d0fc14baa0da4a84dea399e9d SHA512 6fe8da6e0462f4b27f987c86b2de769e6a1a9eb3389bb612b59931590f75e7dd9d4a8456b5f36209aadf433dfe2e48686f2cda8e95b7480b9bdb971247e1eae5 WHIRLPOOL 833b2ba21a17d70cd3ba9a4f88fdaaec288acf471d43fd9c660e55c7c48f7a34b46b1defd7ffb699ed3f34af1fca9484303a09f3a020fa06367cdd291a675f5b
+DIST hercules-3.09.tar.gz 2567052 SHA256 98a6029d908943451635ba53acf97ed61fdf6ebafc4402be7137c620851fe4e7 SHA512 0c972f62de6f780608adff3fdb614b0c6fe46349da73ec2225d809786fd5188f9e9fbb0ee5858a75cb156071c0e976d37997547d23c939aa48c3b727c5680c0a WHIRLPOOL f9eee4c11855ac08f20423f4b864b2d41315ce445af4f844b644a0399e83535442cb697571e0956ba53deae3cb755956f3cdf0a323efd07afb4be8bc8dd1c145
 EBUILD hercules-3.04.ebuild 907 SHA256 33739174e1a75c0fce6218935587641693dc44692998c3199acdf7ee04b77af6 SHA512 9227485d752ccb7b709b87fc131307b29999d938cdd0ee703ac12bafa5a5bcf688c4a552cfd1673afaee2ea4852935ccff05f83ee30de961a6e996934b6f585a WHIRLPOOL 5780c5784e4fd84a2acc219881d63220e5f11e75f56a23a3fd04240051a300c1fd889bd6b3a86c120456c477855185fc2522a0e2295f791c5eb9756fa8605387
 EBUILD hercules-3.05.ebuild 911 SHA256 93a9f45c9b1ce281b9cd881d350c4b2891559b587b0401beab2e48c7e6f34e6d SHA512 f18b0486175ea97556afc091412eed5ea79acf3720baab98ce1d1440781764a85dd10e58d10ccb860c66f4be5f8275a338d53156555a9e0cdc91c103c9c07192 WHIRLPOOL 6db0d005d7b09b63f49456fcd163afe3ddfdfc496b9d60f8aa4f5109aea62ae1d5b4c204c68a12c4d2a3c05963991a750d83444f0e33b1d548b45fc1bd7a390b
 EBUILD hercules-3.06.ebuild 1212 SHA256 f51e5ccafe8f911924d28faef0cd433b3b710ea16e1d633b970135be2290a788 SHA512 d7913639bd34817cdde611195b4cf5787682401ecc78483a08ea6e57dc7aca378c51af104b53b5af6aef5890e812f8878f302ef830cc7ab21fc65bbcd40cae21 WHIRLPOOL 0cf311c0627fb659725878df42964fd049fd81cb77cae4c35903ac1ef3d3730afc7e4be763b239aacad8e397ee85fba6cd6920ca32f4ad8e2d799978693aa2f9
 EBUILD hercules-3.07.ebuild 1133 SHA256 6e1516fc069ad96f78a4b34678620f980376adaa22fb7ef3cc4a801ab0dbbf33 SHA512 60e50fdbf6317142e74e1c19b37c31be1f353fbaa09d17bea550cc9283fe0df4b99458bbb4a75aa96a2f756ccd06e715a211b4c8063995ff5ada69af17490913 WHIRLPOOL 4264cb7eae1ae6c8e5805f495da6437c0632618cb52aa80e7cb2afd7b23bb969eb4708331dd5dc3ab8e413804b170ce6bbd66f455c40cf8d8bf8bc0736e204e3
 EBUILD hercules-3.08.ebuild 1049 SHA256 b5601f58eba8b73185c973d60ab47f68cdc880d76353440ceb8d79ebc6644a38 SHA512 351bd9a8fcf602e9e16828ea80253957219c571d8ba21ddba112faf07da7f4850f46ba2ca167f6848ef77917368d9a160a74aec678ff762d81f8d045fda38158 WHIRLPOOL f9c928cd2be82c43817eedb4512f543a4c8e2957c183adbe5d283aa216a8f59479c361cd1b4749824d80f9b79c277fe94f934feb63f95d92f9c35323cd683538
-MISC ChangeLog 3955 SHA256 70910811668337f0c9a0349c56960745801d2323df62d03b3a788467625d650b SHA512 daa815c5fbdaa4ad0b05b59dc80c2c038e21cf6cdbf21b1e5e66cbf9318854cd0a94e4d5ec8c194de7e8454564ace6eaf6e5c6eda3f9900ed56a03d6c19ad179 WHIRLPOOL 709b6eaf73262e47bb991aa38deca4d00967cdbed5b63301c8476ac62a467cdbaf587ed4ce0f2d51ffb67fc7347e1f805ee5ea09ff000a0990156f5ec192f338
+EBUILD hercules-3.09.ebuild 1116 SHA256 07cd04a5a058fd22e4f5eb91bdfc7eb2399fc370dd21f537794af797dd59d398 SHA512 53ae8d279ad4cb81d42bfc06007d28d7598cd326813eeeff314820f9631ad0f99dcb8d5e8374fe33a1a8986ba0ca6ba93ea1d8c0bd83b0f8bf6a3ab55c3802ed WHIRLPOOL 7399b29e49636658fadcfc23b018a06d538c40176f04dec2b2d3bc7b86c94c8f0f63a98196dace373e8b9622b4fca0ad6107c154435aa22d6f48d8aed91a2377
+MISC ChangeLog 4113 SHA256 fa7e52d58f5015ee4d226d629e0b7877bc772cfe367baa02d5206e300cf1346b SHA512 1e41fac5eb7ac3b6b2280f1ea15e1f77f43f124738fc9c3c499979599bd7507c3e6a05920a0634390ac49414dcae57ba22aad143e3665be2cb30914f6c997f33 WHIRLPOOL 6785e321c1333818570cff2c3f8656fedcc33945eafc9f287f02ec93af645b7e3f7bacd9a07ff7f2960d2f74c13c4418805b8a5c7c855814bd25f13e714c903d
 MISC metadata.xml 474 SHA256 1d248ce2197dc0dedcaecd01e23fa6bc133b12f33527782c952c5873141d335c SHA512 0309c62240c5990878cd324e92666ef35e621fdcbd92ce3b43592453097aac658e5a9d6d0abdf88febf6de2759342a3b8489a22f5f6630e23573d31d14b3686e WHIRLPOOL 2975a866ad71096a2fee221452715861d295243a7aa751a4fcf83505ce5fb27f8b6c1ae3fad7188126436282b44dc27fffe807af952d9a13747c10aceba13ff7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (SunOS)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlH1CBAACgkQX3X2B8XHTolAngCeNqHrRPfqYfLuEuLTI6++8wCS
-fQkAoIFpQR37aUNAg6S+q7mF5kno62FJ
-=mRdN
+iQIcBAEBCAAGBQJSHNQJAAoJELEHsLL7fEFW2NMP/iIxh2RmP1dTk3reP7l2EztM
+64L5dmLFwriEK071cBXxpntRkNSJOazDjTLw1nH7r46HiNrgOqZPKmR9CNydubg3
+bIJ3hJvBu8bMXJA4TTylI6mo+/0q3Q1PNUqrp5yCHUsR3emcGwrlBulz88iGFBHU
+STFLpCCdXHyTZkIqYk+NKNYgJGJBLuSOT2ULFQqJCwuq3AFEOubopr8GBRSVN3wE
+mxJZdYPHo0c+Wcl6q0UQB+cBBAm9ZUmApxgVxWatlWAwO/PBK9ZC03qaoUSoa0Eb
+ZtUgnyetRr0KpWda49LAXWe2Mq/brjAfA072uzQYKoljRMjGrtBKfptsNmh9+6gn
+N0L+RQak5SywZ0oU48l/sb9jNMNdKw7hBUp65gYUGfW/oo5Zr/Oqbyr8MalxXTWS
+or30nBC7RKsZ78F/wu82NLqZeExoNHYCiNP+RJVra5gG9y9wlLhCf2qMcEqPIgj0
+qsIK87na0wmf0WnoSs0JCR6Z7JR9jBZ2iMN9LYF0OgpvdtZPQJUK+WpWqmU8E7FO
+zjGQNM5Ue6IG8wXoHNPAajEjKxeKdCXLwW79/8QPeF+Ug7CEgTu8UQdZlN1ar9cW
+ruaHoArxmwWl+PzKy88c+xrulJ5skviXleUzrwmDl9Qr8WF5G/9nTCXHW6y2f3xC
+d3/qPqLKRmdXICJHQNCq
+=tX5H
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/hercules/files/hercules-3.09-aliasing.patch b/app-emulation/hercules/files/hercules-3.09-aliasing.patch
new file mode 100644
index 000000000000..78f6e7705675
--- /dev/null
+++ b/app-emulation/hercules/files/hercules-3.09-aliasing.patch
@@ -0,0 +1,41 @@
+From 7d3255a18ad845953cc8083371e8623e771ad4f5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 27 Aug 2013 12:25:49 -0400
+Subject: [PATCH] sha: fix strict aliasing warnings
+
+sha256.c:492:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
+sha256.c:784:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
+sha256.c:785:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ crypto/sha256.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/crypto/sha256.c b/crypto/sha256.c
+index 1a6a243..b1e90b4 100644
+--- a/crypto/sha256.c
++++ b/crypto/sha256.c
+@@ -489,7 +489,7 @@ SHA256_Final(u_int8_t digest[], SHA256_CTX *context)
+    *context->buffer = 0x80;
+   }
+   /* Set the bit count: */
+-  *(u_int64_t *)&context->buffer[SHA256_SHORT_BLOCK_LENGTH] = context->bitcount;
++  memcpy (&context->buffer[SHA256_SHORT_BLOCK_LENGTH], &context->bitcount, 8);
+ 
+   /* Final transform: */
+   SHA256_Transform(context, context->buffer);
+@@ -781,8 +781,8 @@ SHA512_Last(SHA512_CTX *context)
+   *context->buffer = 0x80;
+  }
+  /* Store the length of input data (in bits): */
+- *(u_int64_t *)&context->buffer[SHA512_SHORT_BLOCK_LENGTH] = context->bitcount[1];
+- *(u_int64_t *)&context->buffer[SHA512_SHORT_BLOCK_LENGTH+8] = context->bitcount[0];
++ memcpy (&context->buffer[SHA512_SHORT_BLOCK_LENGTH], &context->bitcount[1], 8);
++ memcpy (&context->buffer[SHA512_SHORT_BLOCK_LENGTH+8], context->bitcount[0], 8);
+ 
+  /* Final transform: */
+  SHA512_Transform(context, context->buffer);
+-- 
+1.8.3.2
+
diff --git a/app-emulation/hercules/hercules-3.09.ebuild b/app-emulation/hercules/hercules-3.09.ebuild
new file mode 100644
index 000000000000..55c83a3a9a0d
--- /dev/null
+++ b/app-emulation/hercules/hercules-3.09.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/hercules/hercules-3.09.ebuild,v 1.1 2013/08/27 16:29:57 vapier Exp $
+
+EAPI="4"
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Hercules System/370, ESA/390 and zArchitecture Mainframe Emulator"
+HOMEPAGE="http://www.hercules-390.eu/"
+SRC_URI="http://downloads.hercules-390.eu/${P}.tar.gz"
+
+LICENSE="QPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x64-macos ~x86-macos"
+IUSE="bzip2 custom-cflags +suid"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-aliasing.patch
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	ac_cv_lib_bz2_BZ2_bzBuffToBuffDecompress=$(usex bzip2) \
+	econf \
+		$(use_enable bzip2 cckd-bzip2) \
+		$(use_enable bzip2 het-bzip2) \
+		$(use_enable suid setuid-hercifc) \
+		--enable-custom="Gentoo ${PF}.ebuild" \
+		--disable-optimization
+}
+
+src_install() {
+	default
+	insinto /usr/share/hercules
+	doins hercules.cnf
+	dodoc README.* RELEASE.NOTES
+	dohtml -r html
+}