version bump

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

4 files changed, 241 insertions, 3 deletions

diff --git a/games-board/scid/ChangeLog b/games-board/scid/ChangeLog
index 51d3e84b2fb2..a94d3cef670c 100644
--- a/games-board/scid/ChangeLog
+++ b/games-board/scid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-board/scid
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/scid/ChangeLog,v 1.47 2014/11/13 17:13:53 mr_bones_ Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/scid/ChangeLog,v 1.48 2015/05/09 05:19:31 mr_bones_ Exp $
+
+*scid-4.6.0 (09 May 2015)
+
+  09 May 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/scid-4.6.0-gentoo.patch, +scid-4.6.0.ebuild:
+  version bump
 
   13 Nov 2014; Michael Sterrett <mr_bones_@gentoo.org>
   -files/scid-4.4-gentoo.patch, -files/scid-4.4-parallelmake.patch,
diff --git a/games-board/scid/Manifest b/games-board/scid/Manifest
index 3d4116250386..21627d2c1e4b 100644
--- a/games-board/scid/Manifest
+++ b/games-board/scid/Manifest
@@ -1,9 +1,12 @@
 AUX scid-4.5.2-gentoo.patch 6162 SHA256 867e9613e345cb1be2b1f1eb9821db2d5d6c4065a2b2f20a6cbc81ca368d75bc SHA512 dd08bd96501aa648588accb13110df2c35e53c9e88e10283a8229beb4046293720e2337d669beb17f588e94b1c7f60635bbe2dfe2c87dd157bdbd2ccdba2cbe5 WHIRLPOOL 6ab5e507abcfb0751175a6acdec3478e9698f1bf4a25381df01391e14f228780413fce9b76394220b9a2e4f142d0caede29b6648128fb75ce5111b60e2df7d49
+AUX scid-4.6.0-gentoo.patch 5004 SHA256 c8ea6358299847e945d3bfc9ffe6690169e255e204e41471aac77a724e85792d SHA512 374c28e1acd8668459672b65b12d63a20f3b1b7899d3b2ade3f6dcc3d770568f076fe773e60d2c34df0bec631ab174415fa8f830b45c94ef6a7c8c0bf33debfb WHIRLPOOL e6ddf5f3396b29051b22afda63dc0c128331114488d7f91d2bc357e31f10a9ee338cb73a3096708595df5479a1d26b5802c594e583a0c44f52d05d714925cb0e
 DIST Scid-4.5.2.zip 10271344 SHA256 9e371e78c9fa43cbda4d5851b6bad35f72f3f4f538c4bb9b28667d8ba59bbf43 SHA512 161c2ff1b1808c7e6d4ee02b527251d935b4554546385e336c3f7370a1c47891e31b975d59f5da0ed39175365f53b3400c1fffd550ea40caa090f87fbfbe62b7 WHIRLPOOL 7a362d22588542ce96e4b0d9df03a810bfe4c618329958838261eec5dca9431534dedbd58626e335c7c6d266beec1f1e2e1c695f4f903b3d739ecdb7a92cbb3d
 DIST photos.zip 1007488 SHA256 21aca2673df908a5960875872f127e0393bda0ef1db31003dd1c0d31583ff5a4 SHA512 c04fc810b457d4dbd9a9cfaac90feaa8c32a2abee05e28a79042ae81cb01e8580e2a1cf0abeff230ec2928da883f862b8901d679cb1448fd9ca0923323fbddd6 WHIRLPOOL dbbb8dd4ae37f0d84be929f09e6b583553b6c1cb6e866806388c61c54c09fb31b2a82baa6119b614416aa36dfc5250e63ac9afabbe6c561dcad8e71fe13caa99
 DIST ratings.zip 969347 SHA256 bb41a1bf35314231201d2f7d635497002b9dbc6d0f896a611239587a8c1b2830 SHA512 9b2a7280a7e72e2b464cc3da6be82ec9825b11d3c7e2219ab03a711c69f185f7d954eb3acdd441bff210e9296613df79a7e147a2ccbb4ed37b50af762abbd243 WHIRLPOOL a2b9ece83e167f0e1b330e1aa31cc46aa2cc79c3d124f1bcbd0f0edc7f9d434d210fdc78467efd1b7acb6f299a6f3440bc8599c5d7c62a55e5dc694685e56575
+DIST scid-4.6.0.zip 9868031 SHA256 09b46a262aba51b70d51efdca83b98ce2995ff0a27313c2d811be71443a2db4e SHA512 f05efa64df96c6fe0c2569ce69b30a1527ec97ea27e9207785e6ccfa3a9cd2bebea7837e5f1eddbafb826e17b3c464f8f5ec692f990614bb60f427c8530d89c4 WHIRLPOOL 7286e6de5686041fcfaed35f38d1afecdc795a50d3d2faa4b07fab36f1b7b714cb18e08c69e59e40b5fc0d75b474e1e3e119f24f3e489c23435618577e5ff824
 DIST scidlet40k.zip 242632 SHA256 fbab2a31e37f2d606140144ac1086ece035b991a756eef804a660c8ecb0f56bb SHA512 e8cb4ca276ca94378f224fad972b0659f3e8159668fa395dcae4be1de6cdd9d29082fdddba393bbea6c909bab4f388042ea05c7dff41edf850d731bc7479850d WHIRLPOOL f0965d6197518c5dda62d5ff73e1052ced68487a738d288522fdb649aab8a63de1b34e0392c7479885164f4245bc8c33618d0206905ba9d2a9cf0ce2e46f9d54
 DIST spelling.zip 3147998 SHA256 63d8c8f7b99f6b6d5a4b6d4b0cd0a8e279f19173c98de3a989d7b05ee7dde624 SHA512 394a8835f23336b6f4bebe4e33ab9f64ffa505e9d9bb984de82396e671df0b57b088aab28c5cf648c1a11bc28370b431cb6db54765ac4ab6056a707276ba8f42 WHIRLPOOL f83ecfa03a817f491f25d48fc461156d1b8aea86e800e4ff7dcaa2a233958c7b4b9979d330fe71ba39028554206ec51f7e39344b7ff01194b3ed3fc949fbfbac
 EBUILD scid-4.5.2.ebuild 2207 SHA256 e3170af3acbe8c39c5c5c8b0f46ba83ae08e6f33bcc888e3027704b0da3f8107 SHA512 8fb65c1451f5a10610ddacd8b0cd8182765d26989944d9264a92391a230474843a49b1d0027318beec33cfe08f8bde8d6647b974fec59efc0cfc1462a558269a WHIRLPOOL cec1076d96f8d6b381c66075375e9be44dbf4b77344b997304fe4a9bab76100969dd0c505c59498c11af8b64f844d76ca3c54eddc0424ee726530c6abc9c8a66
-MISC ChangeLog 6316 SHA256 5bcd782aeebc89fe7d3051d02fa5e63d15d53079309ab6c5a38a0fc7de4ba7ec SHA512 b7a6ec3e88d42f8e541ef3cbdc230d78f76ceb54ab8f8edc217365b9e82051f2f31f786e2c04054be4d30c0a07a8781745c4feac5a067092e6ed11ed27d598a0 WHIRLPOOL 75384912fe994778057f9b99ce3a7b217156f1be0c2afee35886acedd35402a959d45acfe49856fc5a3bafd59142e424e1b82b55103b068baa4401d29cdcaf2e
+EBUILD scid-4.6.0.ebuild 2255 SHA256 3d202921858bfdda2885e4ddf3a499ff490803f5d01d3a4b0acb33f422f0cd88 SHA512 6bb92172534f20b5766eb8683c87afba20d9da7cf3480398ee1fd97a82d6defa950fb8cdb945f36e80a47f0cfebe6b5e9d69c66b81b1ef266d586ef9874e1f8e WHIRLPOOL d1d461bf1b71351ceca0446f1b2e06164858b69321f38bff57ace325ca70c68817e553f5d1cada81e743f3787e10e39e4b547f6564aec40cdb945a57f385b3ad
+MISC ChangeLog 6468 SHA256 2772c43868413c6cb097785715af32bdfd0c54fef84e177bdf1eca79d7a9827b SHA512 7d2e375dd4ac4be8fe08760be1b4bd211b570328ea9a2f2db238b15ec0b0d445a4804060d2ce33c29f8414c67f039d56d19c6ff6e66bc60070880be7e2593620 WHIRLPOOL 5e7a843b1e012b229b7f95afdec839a973ca04873e3d2b2fa34a1a854b38fdcb1e8db5124cede33de7ddb427e85add97aa60b2e7d36fb6aa99a6cb30cc7e9894
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-board/scid/files/scid-4.6.0-gentoo.patch b/games-board/scid/files/scid-4.6.0-gentoo.patch
new file mode 100644
index 000000000000..45d028bbbd21
--- /dev/null
+++ b/games-board/scid/files/scid-4.6.0-gentoo.patch
@@ -0,0 +1,128 @@
+diff -ru scid-4.6.0.orig/engines/togaII1.2.1a/src/Makefile scid-4.6.0/engines/togaII1.2.1a/src/Makefile
+--- scid-4.6.0.orig/engines/togaII1.2.1a/src/Makefile	2015-04-27 15:19:48.000000000 -0400
++++ scid-4.6.0/engines/togaII1.2.1a/src/Makefile	2015-05-05 17:53:00.820096470 -0400
+@@ -18,23 +18,16 @@
+ 

+ # general

+ 

+-CXX      = g++

+-CXXFLAGS = -pipe -Wall

+-LDFLAGS  = -lm

+ 

+ # C++

+ 

+-CXXFLAGS += -fno-exceptions -fno-rtti

+ 

+ # optimisation

+ 

+-CXXFLAGS += -O3 -fstrict-aliasing

+-CXXFLAGS += -fomit-frame-pointer

+ # CXXFLAGS += -march=athlon-xp # SELECT ME

+ 

+ # strip

+ 

+-LDFLAGS += -s

+ 

+ # dependencies

+ 

+diff -ru scid-4.6.0.orig/Makefile.conf scid-4.6.0/Makefile.conf
+--- scid-4.6.0.orig/Makefile.conf	2015-04-27 15:19:48.000000000 -0400
++++ scid-4.6.0/Makefile.conf	2015-05-05 17:58:21.860098005 -0400
+@@ -157,32 +157,31 @@
+ install: $(INSTALL)
+ 
+ install_scid: all_scid
+-	install -m 755 -d "$(SHAREDIR)"
+-	install -m 755 -d "$(BINDIR)"
+-	install -m 755 $(SCRIPTS) $(EXECS) "$(BINDIR)"
+-	rm -f "$(BINDIR)/scid"
+-	@echo "#!/bin/sh" > "$(BINDIR)/scid"
+-	@echo 'exec "$(BINDIR)/tkscid" "$(SHAREDIR)/tcl/start.tcl" "$$@"' >> "$(BINDIR)/scid"
+-	chmod 755 "$(BINDIR)/scid"
+-	chmod +x "$(BINDIR)/scid"
+-	install -m 644 -p scid.eco "$(SHAREDIR)"
+-	install -m 755 -d "$(SHAREDIR)/books"
+-	install -m 666 ./books/*.* "$(SHAREDIR)/books/"
+-	install -m 755 -d "$(SHAREDIR)/bases"
+-	if test -d ./bases; then install -m 666 ./bases/*.* "$(SHAREDIR)/bases/" ; fi
+-	install -m 755 -d "$(SHAREDIR)/html"
+-	cp -r ./html/* "$(SHAREDIR)/html/"
+-	install -m 755 -d "$(SHAREDIR)/img/"
+-	cp -r ./img/* "$(SHAREDIR)/img/"
+-	install -m 755 -d "$(SHAREDIR)/tcl/"
+-	cp -r ./tcl/* "$(SHAREDIR)/tcl/"
++	install -m 755 -d "$(DESTDIR)$(SHAREDIR)"
++	install -m 755 -d "$(DESTDIR)$(BINDIR)"
++	install -m 755 $(SCRIPTS) $(EXECS) "$(DESTDIR)$(BINDIR)"
++	@echo "#!/bin/sh" > "$(DESTDIR)$(BINDIR)/scid"
++	@echo 'exec "$(BINDIR)/tkscid" "$(SHAREDIR)/tcl/start.tcl" "$$@"' >> "$(DESTDIR)$(BINDIR)/scid"
++	chmod 755 "$(DESTDIR)$(BINDIR)/scid"
++	chmod +x "$(DESTDIR)$(BINDIR)/scid"
++	install -m 644 -p scid.eco "$(DESTDIR)$(SHAREDIR)"
++	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/books"
++	install -m 666 ./books/*.* "$(DESTDIR)$(SHAREDIR)/books/"
++	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/bases"
++	if test -d ./bases; then install -m 666 ./bases/*.* "$(DESTDIR)$(SHAREDIR)/bases/" ; fi
++	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/html"
++	cp -r ./html/* "$(DESTDIR)$(SHAREDIR)/html/"
++	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/img/"
++	cp -r ./img/* "$(DESTDIR)$(SHAREDIR)/img/"
++	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/tcl/"
++	cp -r ./tcl/* "$(DESTDIR)$(SHAREDIR)/tcl/"
+ 
+ install_engines: all_engines
+-	install -m 755 -d "$(SHAREDIR)/engines"
+-	install -m 755 -d "$(SHAREDIR)/engines/phalanx-scid"
+-	install ./engines/phalanx-scid/phalanx-scid "$(SHAREDIR)/engines/phalanx-scid"
+-	install -m 755 -d "$(SHAREDIR)/engines/togaII1.2.1a"
+-	install ./engines/togaII1.2.1a/src/togaII "$(SHAREDIR)/engines/togaII1.2.1a/"
++	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines"
++	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"
++	install ./engines/phalanx-scid/phalanx-scid "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"
++	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a"
++	install ./engines/togaII1.2.1a/src/togaII "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a/"
+ 
+ install_mac: all
+ 	install -m 755 -d dist/Scid.app/Contents/MacOS
+diff -ru scid-4.6.0.orig/tcl/start.tcl scid-4.6.0/tcl/start.tcl
+--- scid-4.6.0.orig/tcl/start.tcl	2015-04-27 15:19:48.000000000 -0400
++++ scid-4.6.0/tcl/start.tcl	2015-05-05 18:00:43.988229032 -0400
+@@ -93,7 +93,7 @@
+ 
+   # scidShareDir, scidImgDir, scidTclDir, scidBooksDir, scidBasesDir, ecoFile:
+   # Location of Scid resources
+-  set scidShareDir [file normalize [file join $scidExeDir "../share/scid"]]
++  set scidShareDir "@GENTOO_DATADIR@"
+   if {! [file isdirectory $::scidShareDir]} {
+     set scidShareDir $::scidExeDir
+   }
+@@ -785,7 +785,7 @@
+ }
+ 
+ ### Audio move announcement options:
+-set ::utils::sound::soundFolder [file nativename [file join $::scidExeDir sounds]]
++set ::utils::sound::soundFolder "@GENTOO_DATADIR@/sounds"
+ set ::utils::sound::announceNew 0
+ set ::utils::sound::announceForward 0
+ set ::utils::sound::announceBack 0
+@@ -794,7 +794,7 @@
+ if {$windowsOS} {
+   set spellCheckFile [file join $scidDataDir "spelling.ssp"]
+ } else {
+-  set spellCheckFile "/usr/local/share/scid/spelling.ssp"
++  set spellCheckFile "@GENTOO_DATADIR@//spelling.ssp"
+ }
+ 
+ # book configuration
+diff -ru scid-4.6.0.orig/tcl/utils/sound.tcl scid-4.6.0/tcl/utils/sound.tcl
+--- scid-4.6.0.orig/tcl/utils/sound.tcl	2015-04-27 15:19:48.000000000 -0400
++++ scid-4.6.0/tcl/utils/sound.tcl	2015-05-05 17:53:14.320633946 -0400
+@@ -43,7 +43,7 @@
+   variable soundFolder
+ 
+   set hasSound 1
+-  if {[catch {package require snack 2.0}]} {
++  if {[catch {package require snack}]} {
+     if {$::windowsOS} {
+       catch {
+         set ::utils::sound::pipe [open "| scidsnd.exe" "r+"]
diff --git a/games-board/scid/scid-4.6.0.ebuild b/games-board/scid/scid-4.6.0.ebuild
new file mode 100644
index 000000000000..9f3ec9418099
--- /dev/null
+++ b/games-board/scid/scid-4.6.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/scid/scid-4.6.0.ebuild,v 1.1 2015/05/09 05:19:31 mr_bones_ Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit eutils toolchain-funcs gnome2-utils python-any-r1 games
+
+DESCRIPTION="a free chess database application"
+HOMEPAGE="http://scid.sourceforge.net/"
+SRC_URI="mirror://sourceforge/scid/${P}-ae199eb3496714b50d2cbd204492d61022b2da76.zip -> ${P}.zip
+	mirror://sourceforge/scid/spelling.zip
+	mirror://sourceforge/scid/ratings.zip
+	mirror://sourceforge/scid/photos.zip
+	mirror://sourceforge/scid/scidlet40k.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+CDEPEND="dev-lang/tk
+	dev-tcltk/tkimg
+	>=sys-libs/zlib-1.1.3"
+RDEPEND="${CDEPEND}
+	!games-board/chessdb"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	app-arch/unzip"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	games_pkg_setup
+}
+
+src_unpack() {
+	default
+	mv scid-code-* ${P} || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	edos2unix engines/togaII1.2.1a/src/Makefile
+	sed -i \
+		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
+		tcl/start.tcl || die
+	sed -i \
+		-e "/COMPILE.*testzlib/s:\$var(COMPILE):$(tc-getCXX):" \
+		configure || die
+	gzip ../ratings.ssp || die
+	python_fix_shebang .
+}
+
+src_configure() {
+	# configure is not an autotools script
+	./configure \
+		COMPILE="$(tc-getCXX)" \
+		LINK="$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS}" \
+		CC="$(tc-getCC)" \
+		OPTIMIZE="${CXXFLAGS}" \
+		TCL_INCLUDE="" \
+		BINDIR="${GAMES_BINDIR}" \
+		SHAREDIR="${GAMES_DATADIR}/${PN}" || die
+}
+
+src_compile() {
+	emake all_scid
+}
+
+src_install() {
+	emake DESTDIR="${D}" install_scid
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r sounds
+
+	dodoc ChangeLog TODO
+	dohtml help/*.html
+
+	newicon -s scalable svg/scid_app.svg ${PN}.svg
+	make_desktop_entry scid Scid
+
+	doins ../spelling.ssp ../ratings.ssp.gz ../*.spf
+	newins ../scidlet40k.sbk scidlet.sbk
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+	elog "To enable speech, emerge dev-tcltk/snack"
+	elog "To enable Xfcc support, emerge dev-tcltk/tdom"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}