Ebuild improvements

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

5 files changed, 89 insertions, 58 deletions

diff --git a/games-board/stockfish/ChangeLog b/games-board/stockfish/ChangeLog
index 304ceb3ed0b7..42f913a9660d 100644
--- a/games-board/stockfish/ChangeLog
+++ b/games-board/stockfish/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-board/stockfish
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/stockfish/ChangeLog,v 1.1 2015/02/05 20:09:33 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/stockfish/ChangeLog,v 1.2 2015/02/07 11:54:20 yngwin Exp $
+
+*stockfish-6-r1 (07 Feb 2015)
+
+  07 Feb 2015; Ben de Groot <yngwin@gentoo.org> -stockfish-6.ebuild,
+  +stockfish-6-r1.ebuild, metadata.xml:
+  Ebuild improvements
 
 *stockfish-6 (05 Feb 2015)
 
diff --git a/games-board/stockfish/Manifest b/games-board/stockfish/Manifest
index aed95e1890ad..b289f9abe281 100644
--- a/games-board/stockfish/Manifest
+++ b/games-board/stockfish/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 DIST stockfish-6-src.zip 161183 SHA256 a69a371d3f84338cefde4575669bd930d186b046a10fa5ab0f8d1aed6cb204c3 SHA512 8381b7a8616281629f04c6dc4cbe5a279b06067f7af3faff271461f694122eeba9d83a0c4a295b9064142bcaa3b31eca8139b58eb9441684845aad45888402dc WHIRLPOOL 56672a5730ce1f9adef13b658e960f808a990752b749ab3c658e1dbdd54e81bbee9c32ab91c892cd6f8b91ad4d8fe5bcff2c5d0942616b5dda5e77c196ad5092
-EBUILD stockfish-6.ebuild 1025 SHA256 a26f8db903bbc971c54c889f3c906af32e1348dc18ee14ab0cb46432149fe35b SHA512 1bc33d34884254326861f64fb49bc856baff5e69c44e35d2e2449da4d7612f6ea7a6001bf7c6f5f2ddab90853a162f60958112dd6e7dc77f85635f255651fdca WHIRLPOOL 62c645032428af9d28fcb075685ee595c2024dcff0a9583666d597b217b7fdddd2c522b9f3b90e7bbd233cab81a2e40a9d9a351326d47813862f414bc851b9f4
-MISC ChangeLog 360 SHA256 cd091e570b505b39bc812803dc18eab50d87a670f7953eb76e4b404fb98dcea4 SHA512 345938df6e6dd43c044e6fbca3058a4afb47604aad632d56db9d5e4fa384b16a6ecc6073ce09dd2591d6c0b2416e06a8f4ec039221a486fb496b67131e029537 WHIRLPOOL e83237cfc21e6e1227eef9522863df4333f2f844c793bab1a4556b2f4ec4d47b23e54339c9882fe958e98aab0c26033b9c65703d5340bc6ab1dabc04774a3f9f
-MISC metadata.xml 237 SHA256 184b645af068016765dbc0fea5dc7ebdac3939bff4c5c3cea4c3a954c36aa515 SHA512 2f439c02f625469233818a0b28dd77a40b82606b1cd9d9bca37412103b9c4f8122cc78cd4d53446ce434b3c0cea12c9c6133d2433c7df869231d129f14ecf867 WHIRLPOOL 422c80f167c97179c1cb022108676f9a41b603f0c8031a709c993563b6c84d661bc6b61a3a0609b1da952efa3f4a44004b2267b9142ac564093a07a99bd5de23
+EBUILD stockfish-6-r1.ebuild 1588 SHA256 c76b1445878a0e91a802497ebff7b318f48fab47f6338a79b730caeb2a554af3 SHA512 85fc83eb6d9a127b6e58a2f3037559292a063fa2360897d4aef9cf8a21563dee50cf118a996a1aeb76e6dfef07e016c40221f677d77185270df3dd47c29bc978 WHIRLPOOL d9fa723aab1ab0e8559e6edb583a970a2f9c27e4acee2bde3b93227f85b32b280e7b108a370bdc32198ef8686868cd88e43fcffe2c6e23fcc4c3361b0fdb208f
+MISC ChangeLog 523 SHA256 cf2d0a3b5d91fd76fb5af25c44ebd6fbaaf680e3ef78be02271e04b14dd84dfe SHA512 83985ccfa280503b645b64f73230e20bd5b00de2e01772dd845cb9668cc7be932451fdf43f4e9e939c9b7413dd5a980cf487fbcd317abea29b4fbc40c67a1162 WHIRLPOOL 380319b3397dc7f7307e5bbfda7f63864b8a67ce3d5780ccb78fe4b6737b0a31bfae0ce6ab5ad51ba07bc643dda2e077e5c21ba56afcedd62221d7e8fea77a63
+MISC metadata.xml 536 SHA256 d8afff337378fd04e542b0b20149e1779f486b5ecbe6d2b1a417be18cfeac778 SHA512 be0ab821f899914d0aa34208abd268e863c86bdd5f37c7dcb74c312b0dd11237b458c276f23d0257bb5597b65930fcb3724e4456483a6b7d445a0e1ea511570c WHIRLPOOL 67fbcbfd38b82181ff25bd27199d8a9f3c395c68b3517b6eab34f1dc4cd1d62bd7e391e4ea121975e30564102354ef942bde05311cc0abf58757922c142d58e3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU084DXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJU1fzxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFO2vYP/jXDSOm8D2YrMQ90Mnc2YMaJ
-1Zm+pqELyRF+52SSeCRGvBXkNUA+qi/STT7tvsCVDeE9My8n3BPkp7xE/qjujQlV
-yyJ8jUL8RzyFt/5X3dCdbtZDqjd3A6yMlaMVIPpKXv5CHUzesgAGyhao/HgvCBvf
-0BUO0aZPjfO6qnXXQM0P8sUd0zPUWrU9lMbnWbR/1cwUv70jS4ugXhfFSfKM9MgF
-gm+bHzMtztvrBj4ueeuB2WqqdZQhwcbXGeje5s9YnJR1PrpkM2hs+xh60GoZ1ROo
-nv46TTJ5gYNQLRIbD5lNGgpIPS6rssOH20tsSTBwDhzQuAtZUjSsrzV11RnW4kWM
-4qdZbDK607ii+MoMQqo0syPopWbqDn8zzLYb81Vk+TRG5ljULr6PJxsotso0nD0Y
-QfyAACryx+rzurWP0IaGmWBHE8PAg9oXSKNfrazQQP0T0MZByu9fAUc4aehH4eDC
-nu6Bb1kHaRA8JRUujkxzsyI5B+c3elzVzynCZY1NzF+u63TZBurnFkQsoniw/9CI
-USiYXket6Idx1rNHQStj7j1UZHecph/kfG1abGj80Q2IaNnOAV+3w26EJFt+LmOB
-RDgHGvn4RiBs7YLY7Pg1W3dyJRUAb2RtezbcwoxhmZDand4tg/FfRVtZ6cgDdCHT
-AfWYyhKpFSL4RkjgV9tH
-=gwR/
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOySgQAIxE3ecOqKzofJy3y2yAYuFw
+VOXuPPqz3l2ovZDccnx8vnTjj8BhHlT37OdCSC87ayzv56Z12vaf6r7l3SEkpGIF
+RLthdziprVPFzjla6LOmxKgqpM4afl1nvfoRyNeIO9FBoT6jgctwrfCVKYCeQTzt
+OZ/Pw+/Ihs2+3qpFNNN7GlEGdwwbqY17qeSkFrYvO3of8n2I6lIQvbP2RoNfmtmq
+cqUGH1bN9XL0RfkAGbWnyj/qea4eoYgP6kyI+YHJtyu+7avAtS9pPyma2STpiY9+
+zclAhKrsEZmwUcOyMg9Qk2WzyAy3uFMd5jNc/PZuq71y2CHzQeT4CNmfERfBDlXS
+XTkfSEQRptmm1m3GwFYNwxewDdJ6JyCbPkbImzUDtY1deXxXFxZJOFwQg1+C1ZYq
+hH8lt7Bo8cv0xisz3XCAtNaVXF18SRmXmVVg73pjGkadM9MXNmX2P9v92qsHHvpo
+L74J0ufJpg3Xn2yZGHVRravtjJERGzvV51x8JzwksbOCBZ5ce1apP+Zv4ww5Tl8Y
+uzLQxjH51vbkFKROXapLbP5RGB2sY4Ql3mq0qnXppG5Q8+cceGyvnMNzQab1fDQi
+jKOFCWrageC//uqqruu1YXkrCX6TcO9byWhxp8p7nvKFgBs3UixZJH9J2nlzi5fK
+PVk6Dmqks4dTzpwJ03vh
+=SX9B
 -----END PGP SIGNATURE-----
diff --git a/games-board/stockfish/metadata.xml b/games-board/stockfish/metadata.xml
index f2b4a5d1d932..1f5c48a54c2b 100644
--- a/games-board/stockfish/metadata.xml
+++ b/games-board/stockfish/metadata.xml
@@ -5,4 +5,10 @@
     <email>yngwin@gentoo.org</email>
     <name>Ben de Groot</name>
   </maintainer>
+  <use>
+    <flag name='armv7'>Build for armv7; enables PIE</flag>
+    <flag name='general-32'>Generic unoptimized 32-bits build</flag>
+    <flag name='general-64'>Generic unoptimized 64-bits build</flag>
+    <flag name='optimize'>Enable upstream -O3 optimizations (default enabled)</flag>
+  </use>
 </pkgmetadata>
diff --git a/games-board/stockfish/stockfish-6-r1.ebuild b/games-board/stockfish/stockfish-6-r1.ebuild
new file mode 100644
index 000000000000..37b6a857b872
--- /dev/null
+++ b/games-board/stockfish/stockfish-6-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/stockfish/stockfish-6-r1.ebuild,v 1.1 2015/02/07 11:54:20 yngwin Exp $
+
+EAPI=5
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/official-stockfish/Stockfish.git"
+	KEYWORDS=""
+	S=${WORKDIR}/${P}/src
+else
+	SRC_URI="https://stockfish.s3.amazonaws.com/${P}-src.zip"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${P}-src/src
+fi
+
+DESCRIPTION="Free UCI chess engine, claimed to be the strongest in the world"
+HOMEPAGE="http://stockfishchess.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="armv7 cpu_flags_x86_avx2 cpu_flags_x86_popcnt cpu_flags_x86_sse debug
+	general-32 general-64 +optimize"
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	# prevent pre-stripping
+	sed -e 's:-strip $(BINDIR)/$(EXE)::' -i Makefile || die
+}
+
+src_compile() {
+	local my_arch
+	# generic unoptimized first
+	use general-32 && my_arch=general-32
+	use general-64 && my_arch=general-64
+	# x86
+	use x86 && my_arch=x86-32-old
+	use cpu_flags_x86_sse && my_arch=x86-32
+	# amd64
+	use amd64 && my_arch=x86-64
+	use cpu_flags_x86_popcnt && my_arch=x86-64-modern
+	# both bmi2 and avx2 are part of hni (haswell new instructions)
+	use cpu_flags_x86_avx2 && my_arch=x86-64-bmi2
+	# other architectures
+	use armv7 && my_arch=armv7
+	use ppc && my_arch=ppc
+	use ppc64 && my_arch=ppc64
+
+	emake build ARCH=${my_arch} \
+		debug=$(usex debug "yes" "no") \
+		optimize=$(usex optimize "yes" "no")
+}
+
+src_install() {
+	emake PREFIX="${D}/usr" install
+	dodoc ../AUTHORS ../Readme.md
+}
diff --git a/games-board/stockfish/stockfish-6.ebuild b/games-board/stockfish/stockfish-6.ebuild
deleted file mode 100644
index 53a35518c7cf..000000000000
--- a/games-board/stockfish/stockfish-6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/stockfish/stockfish-6.ebuild,v 1.1 2015/02/05 20:09:33 yngwin Exp $
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="The strongest chess engine in the world"
-HOMEPAGE="http://stockfishchess.org/"
-SRC_URI="https://stockfish.s3.amazonaws.com/${P}-src.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_avx2 cpu_flags_x86_popcnt cpu_flags_x86_sse"
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}/${P}-src/src
-
-src_prepare() {
-	sed -e 's:-strip $(BINDIR)/$(EXE)::' -i Makefile
-}
-
-src_compile() {
-	local my_arch
-	use x86 && my_arch=x86-32-old
-	use cpu_flags_x86_sse && my_arch=x86-32
-	use amd64 && my_arch=x86-64
-	use cpu_flags_x86_popcnt && my_arch=x86-64-modern
-	use cpu_flags_x86_avx2 && my_arch=x86-64-bmi2
-
-	emake build ARCH=${my_arch} CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	emake PREFIX="${D}/usr" install
-	dodoc ../AUTHORS ../Readme.md
-}