dev-java/scirenderer version bump

40 files changed, 515 insertions, 436 deletions

diff --git a/dev-java/scirenderer/ChangeLog b/dev-java/scirenderer/ChangeLog
index b378af36f..5e6eb53e7 100644
--- a/dev-java/scirenderer/ChangeLog
+++ b/dev-java/scirenderer/ChangeLog
@@ -8,6 +8,12 @@
   -scirenderer-0.5.1.ebuild, +scirenderer-0.5.5.ebuild:
   version bump
 
+*scirenderer-0.5.1 (28 Jul 2012)
+
+  28 Jul 2012; Guillaume Horel <guillaume.horel@gmail.com>
+  -scirenderer-0.5.0.ebuild, +scirenderer-0.5.1.ebuild:
+  version bump
+
 *scirenderer-0.5.0 (11 Jul 2012)
 
   11 Jul 2012; Guillaume Horel <guillaume.horel@gmail.com>
diff --git a/sci-astronomy/galfit/ChangeLog b/sci-astronomy/galfit/ChangeLog
index f6ab6a615..6635ab6a3 100644
--- a/sci-astronomy/galfit/ChangeLog
+++ b/sci-astronomy/galfit/ChangeLog
@@ -2,9 +2,17 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*galfit-3.0.4-r1 (29 Jul 2012)
+
+  29 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> +galfit-3.0.4-r1.ebuild,
+  -galfit-3.0.4.ebuild:
+  sci-astronomy/galfit: add links to ncurses/tinfo
+
+  29 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> galfit-3.0.4.ebuild:
+  sci-astronomy/galfit: manifest/new tar file
+
 *galfit-3.0.4 (11 May 2012)
 
   11 May 2012; Sébastien Fabbro <bicatali@gentoo.org> +galfit-3.0.4.ebuild,
   +metadata.xml:
   sci-astronomy/galfit: Initial import
-
diff --git a/sci-astronomy/galfit/Manifest b/sci-astronomy/galfit/Manifest
index 2566d0ca7..d64e0ff3d 100644
--- a/sci-astronomy/galfit/Manifest
+++ b/sci-astronomy/galfit/Manifest
@@ -1,4 +1,4 @@
 DIST galfit-ex.tar.gz 1918422 SHA256 3761cf4247b076a4aa2842c4c8d1f4d99871ec4ef31f39145c28102aaadc0d9a SHA512 cea08755bbae9e074c30bcd8c35da9358d29cdff0450af578d9363f5c9a813696d3506ad9cfb2d4e10dfe1f7469ab397c075427473e1f250b5397e5aa82d981a WHIRLPOOL 5e6ce6be5edae3f771f4e9a78480fe144c62228892dfc16f97a4b2a4163645b6ab8511b14a5c155ca07fc52ae443e31fd6283b4d16868fef2ebf5e40596ba064
 DIST galfit.pdf 2035460 SHA256 42a7483e742a0905003bad6a3a4b7f0e58d29b9b527f4ed8bdc8a4e498d865af SHA512 dac0fe8e603b28914f8eef191bd1a783ad7edb04ce0058eac6ab1e809319533c0adfb8543c9e21958631271d13aaae96e577a53b38f3caf2ed95c34ee502a716 WHIRLPOOL 19ccd39ac8a00625c5a53d11ab8b975bd53cb473d025448c47936c72509931669a43d11c5aa67afe3362da08bcd546e8c181752576393878ab87bcdb910e4fa2
-DIST galfit3-debian.tar.gz 1153919 SHA256 fcd1658d03b3ffed75d58eaf884581dda729688c73065b06bb1b0087b9c6e217 SHA512 a9b441a51b4f4894afef3701bbb87e2a62c594d494302feaeafd045fe4f3573c5c1de73f2f5ae198f1c545c31ba53e0a20447b83916240baba5d6e9b695ad2cc WHIRLPOOL f55133411f8c456a694a68f2938a3ace46b681cc2737889c9e5e352ea341fc724a3a8681717249efa58df6b9d591b7bc7aa49041f15e8ce499a660d33257d17e
-DIST galfit3-debian64.tar.gz 1241273 SHA256 98eb301bbc7ac98b2dfe58b5bd397208e83ed165f47b3e3a78d708dd2839dc2b SHA512 d781608ea3e2b78865123252cbd5b598132fa1d636b4b31ffb49e9deb45246dd343e4c87f282ffb40cf5812d62b11f24f4f03f875da7bb50365e98508e91aef1 WHIRLPOOL cbd5e40db2e69cd5145e5e0943090a74948bd75237b07075bb59cea048609a77d2323600625da0dafaae7578b6446cac537822915d5ff930af3520c6dca6eee6
+DIST galfit3-debian32.tar.gz 1222195 SHA256 e4d2d425b8f42cf6fe36bba760434bf8d072002bdfdd7f4d87657b0d0af2ae29 SHA512 d419f4a0cd33806fb87f047c9e9f07c3bb629c54101e12d3371a9043d48c9f2774c2770c32a20637a4400a1d33185cf11d8c930b15b07deeb819e0d091bdfa5f WHIRLPOOL 2b7d8e7b0261b7cc3a6e193b26105a5382e192a862fa6c6abaa539fd42a48df64d6021ff075b6226b1cf08b56aa9035567a3948ad14edc1e4026767cb828700c
+DIST galfit3-debian64.tar.gz 1242127 SHA256 59ec7b4f15dbeeb7a763b10756f79fa4673a942672660f4b5e5341161e2092dd SHA512 aae17cf94fa71ab3908f61c2ebfc4b241255fe1aee928966c5ebeef32a4d861e777ed5f3ffb8a1d273851acb73702af1f556102cffac2a16c10fd34aeb677816 WHIRLPOOL 3824def1addafb3fc3ecac61e8fff4f67e3168668fb92efd5f792c17427cef89c573d7f18cf7d689b280e378bb0488d59d561ab95ffbf33920e0aaece5cdff8d
diff --git a/sci-astronomy/galfit/galfit-3.0.4-r1.ebuild b/sci-astronomy/galfit/galfit-3.0.4-r1.ebuild
new file mode 100644
index 000000000..6eaded084
--- /dev/null
+++ b/sci-astronomy/galfit/galfit-3.0.4-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit multilib
+
+DESCRIPTION="Galaxy morphology fitting program"
+HOMEPAGE="http://www.csua.berkeley.edu/~cyp/work/galfit/galfit.html"
+CURI="http://www.csua.berkeley.edu/~cyp/work/${PN}"
+SRC_URI="amd64? ( ${CURI}/${PN}3-debian64.tar.gz )
+	x86? ( ${CURI}/${PN}3-debian32.tar.gz )
+	doc? ( ${CURI}/README.pdf -> galfit.pdf )
+	examples? ( ${CURI}/galfit-ex.tar.gz )
+	test? ( ${CURI}/${PN}/galfit-ex.tar.gz )"
+
+RESTRICT="mirror"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND=""
+
+S="${WORKDIR}"
+
+src_test() {
+	chmod +x galfit
+	ln -s "${EROOT}"/$(get_libdir)/libncurses.so.5 libtinfo.so.5
+	ln -s "${EROOT}"/usr/$(get_libdir)/libncurses.so libtinfo.so
+	cd galfit-example/EXAMPLE
+	LD_LIBRARY_PATH=../.. ../../galfit galfit.feedme
+}
+
+src_install () {
+	dobin galfit
+	# was built on a distro where ncurses was spit with tinfo
+	dosym libncurses.so.5 /$(get_libdir)/libtinfo.so.5
+	dosym libncurses.so /usr/$(get_libdir)/libtinfo.so
+
+	use doc && newdoc "${DISTDIR}"/galfit.pdf README.pdf
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins galfit-example/*
+	fi
+}
diff --git a/sci-astronomy/galfit/galfit-3.0.4.ebuild b/sci-astronomy/galfit/galfit-3.0.4.ebuild
deleted file mode 100644
index c571deecf..000000000
--- a/sci-astronomy/galfit/galfit-3.0.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-DESCRIPTION="Galaxy morphology fitting program"
-HOMEPAGE="http://www.csua.berkeley.edu/~cyp/work/galfit/galfit.html"
-SRC_URI="amd64? ( http://www.csua.berkeley.edu/~cyp/work/${PN}/${PN}3-debian64.tar.gz )
-	x86? ( http://www.csua.berkeley.edu/~cyp/work/${PN}/${PN}3-debian.tar.gz )
-	doc? ( http://www.csua.berkeley.edu/~cyp/work/${PN}/README.pdf -> galfit.pdf )
-	examples? ( http://www.csua.berkeley.edu/~cyp/work/${PN}/galfit-ex.tar.gz )
-	test? ( http://www.csua.berkeley.edu/~cyp/work/${PN}/galfit-ex.tar.gz )"
-
-RESTRICT="mirror"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="doc examples"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND=""
-
-S="${WORKDIR}"
-
-src_test() {
-	cd galfit-example/EXAMPLE
-	../../galfit galfit.feedme
-}
-
-src_install () {
-	dobin galfit
-	use doc && newdoc "${DISTDIR}"/galfit.pdf README.pdf
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins galfit-example/*
-	fi
-}
diff --git a/sci-astronomy/psfex/ChangeLog b/sci-astronomy/psfex/ChangeLog
index 518772900..64ab64403 100644
--- a/sci-astronomy/psfex/ChangeLog
+++ b/sci-astronomy/psfex/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> psfex-3.9.1-r1.ebuild:
+  sci-astronomy/psfex: fixed for newer plplot
+
 *psfex-9999 (04 Jul 2012)
 
   04 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> psfex-3.9.1-r1.ebuild,
@@ -16,4 +19,3 @@
 
   04 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml:
   Switched herd to sci-astronomy
-
diff --git a/sci-astronomy/psfex/Manifest b/sci-astronomy/psfex/Manifest
index 35cf5aa17..0cb52a1e7 100644
--- a/sci-astronomy/psfex/Manifest
+++ b/sci-astronomy/psfex/Manifest
@@ -1 +1 @@
-DIST psfex-3.9.1.tar.gz 2364495 RMD160 54c1a32c7f9305a91b973a974c4ae527a4dc3143 SHA1 af164b4e3d1bf61cdd738e8c52730f8564460ae0 SHA256 1758a1a40166ef59475d8fab6abda33ca0ed0a837531ff7ad577d8bce4e511f7 SHA512 5304d044b26c8e9c0ec5912326a1579650976a6710303d7822f5270bd23ce9e4b8ab8a06f50a212e4a3fda504436cd59db174021156a2158f299cd788e81fc00 WHIRLPOOL 28dc1cc454c103392392e367b92ca955d82d18d165e77290693329c3593066b11e621d8d97c5bcb1b1610d3a88372b95efa17bd8dc18647f105dc4b1bffbd359
+DIST psfex-3.9.1.tar.gz 2364495 SHA256 1758a1a40166ef59475d8fab6abda33ca0ed0a837531ff7ad577d8bce4e511f7 SHA512 5304d044b26c8e9c0ec5912326a1579650976a6710303d7822f5270bd23ce9e4b8ab8a06f50a212e4a3fda504436cd59db174021156a2158f299cd788e81fc00 WHIRLPOOL 28dc1cc454c103392392e367b92ca955d82d18d165e77290693329c3593066b11e621d8d97c5bcb1b1610d3a88372b95efa17bd8dc18647f105dc4b1bffbd359
diff --git a/sci-astronomy/psfex/psfex-3.9.1-r1.ebuild b/sci-astronomy/psfex/psfex-3.9.1-r1.ebuild
index 3806da3ee..aa54f2c6d 100644
--- a/sci-astronomy/psfex/psfex-3.9.1-r1.ebuild
+++ b/sci-astronomy/psfex/psfex-3.9.1-r1.ebuild
@@ -36,6 +36,8 @@ src_prepare() {
 		-e "s/-llapack/-l${myclapack}/g" \
 		-e "s/AC_CHECK_LIB(lapack/AC_CHECK_LIB(${myclapack}/g" \
 		acx_atlas.m4 || die
+	# fix for newer plplot
+	sed -i -e 's/plcol(/plcol0(/g' src/cplot.c || die
 	eautoreconf
 }
 
diff --git a/sci-chemistry/nmrpipe/ChangeLog b/sci-chemistry/nmrpipe/ChangeLog
index 5e2b18b08..87651f341 100644
--- a/sci-chemistry/nmrpipe/ChangeLog
+++ b/sci-chemistry/nmrpipe/ChangeLog
@@ -2,6 +2,22 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  31 Jul 2012; Justin Lecher <jlec@gentoo.org>
+  +files/7.5.2012.204.11.07-lib.patch, -files/7.3.2012.114.11.33-lib.patch,
+  -nmrpipe-7.3.2012.114.11.33.ebuild, +nmrpipe-7.5.2012.204.11.07.ebuild:
+  Version Bump, bring x11-libs/xview back into the game
+
+  31 Jul 2012; Justin Lecher <jlec@gentoo.org>
+  +files/7.5.2012.204.11.07-lib.patch, -files/7.3.2012.114.11.33-lib.patch,
+  -nmrpipe-7.3.2012.114.11.33.ebuild, +nmrpipe-7.5.2012.204.11.07.ebuild:
+  Version Bump, bring x11-libs/xview back into the game
+
+*nmrpipe-7.5.2012.204.11.07 (31 Jul 2012)
+
+  31 Jul 2012; Justin Lecher <jlec@gentoo.org>
+  -nmrpipe-7.3.2012.114.11.33.ebuild, +nmrpipe-7.5.2012.204.11.07.ebuild:
+  Version Bump, bring x11-libs/xview back into the game
+
   02 May 2012; Justin Lecher <jlec@gentoo.org>
   +files/7.3.2012.114.11.33-lib.patch, -files/7.1.2012.029.12.03-lib.patch,
   -nmrpipe-7.1.2012.029.12.03.ebuild, +nmrpipe-7.3.2012.114.11.33.ebuild:
diff --git a/sci-chemistry/nmrpipe/Manifest b/sci-chemistry/nmrpipe/Manifest
index edd3ee817..d096fcb4c 100644
--- a/sci-chemistry/nmrpipe/Manifest
+++ b/sci-chemistry/nmrpipe/Manifest
@@ -1,5 +1,5 @@
-DIST NMRPipeX.tZ 121186289 SHA256 b83c1a50867ebc3672cba74803f66c7bf1caccdded8c449ac6d246073113ce69 SHA512 7dd91256967a3e803e3c44ea53bae5818716c870330a94f2d4070edf472c322630e7e2f8f2062f9e3b0b6608b3735e1ea979f5872a0a59d105edb412f1f8e478 WHIRLPOOL 6799adb28d91c1e5666e68dcd36bc5d579726ababdf731fe8cf2265f828f984032a6610d00993e59c2d9126d6051e06092236183cdcc786b799daf507b9869f8
+DIST NMRPipeX.tZ 121070804 SHA256 988866c2d96ede3a33800836d8d610f4ad5c81b13707c6c5d46e65e8b1533617 SHA512 fa8b87cb7b509e3459eb93abae9408327676ed1a73924aa8a5ae3fe6ea1a0deb07b413b0ea79ec2cec2c32a8691fc4aebb1fcfd731448aba0a4d3c320b53ba45 WHIRLPOOL 2085e4ee8999e3f329acbb7db033d737d0511f9e2af7b7b938dc9a3162f40ef7129f38497839d2629c52a1fce9d6202eecf4ecade588bdd56ed16a03fe85796f
 DIST binval.com 3865 SHA256 5742154bed54087130fa6093ff62bdc991d12960d7c1ef7e74436aa97e730975 SHA512 6bce8a2bfdb10b4e0997d54043c5447025f6d7e24501fc63591b9184a22523c152a76aebec56a9b8ae9ab01674986d998fde7a77b63477468aa099cdf1791a57 WHIRLPOOL 10e257fefe9905dacd0ee159e80ac488c8781cb6464c01599b0a227023de83bfe9075b34f422f2ab14e4964a75886d53ea43cb0f5cbac3470e6ea96b45355ca0
 DIST dyn.tZ 144122013 SHA256 23e81f523a80b33ed8a01b954807c06b15354f02ba8fd01cf4d11ae4094c57d9 SHA512 eca3a89a0c3fe58a58751cde2c4505a4d249ed7d6c0c44a9e276465b813bf12d070614f081e17396bd29dd13586d671d5aa1587fad05eaad653d92fea5390e2c WHIRLPOOL 7b629a34870d2c2c0558bb1bfec3b376345d80b0c6a98992e3abc361b92dc8ad91e080b91a998080e48043dc6105d139b52d3ec73c7ba4a8e4fbf95b85913871
-DIST install.com 42705 SHA256 dda96dc52ec47b9d24f2d8afdc650b6e6dbfb19afc28dfda258744ebda924441 SHA512 7637321c8aa52fa53523384ddf53f6dfc618fd405829f50940236d838d38205e423f81bd9b0096fac5c5f44d4a4fa1ca103c04d1009140f0794ff5ea75ee2ae1 WHIRLPOOL cf7150197ef086055231f8551321f14131aa1635dac1024e13a79de9c73c34d8877fb4ac76fe48b9c4be2f62771d6a98ca6b5a58391870214ebf85bc49853ca9
+DIST install.com 42691 SHA256 75bae839de4e5dc94506030b5670f6db7e376362f6a45d32e5104634b9a421f7 SHA512 f95e6bd93400e0bda2f350e46ffe266bcbced8f1fb97769f711ec5c0bfe0a55871663dabde2526d6bbb631eb1f3cb355bfa2e7142418b7a4a8806ee5c8c7cb0f WHIRLPOOL 95c3992dbb780bc4ad9923a41e23811a496d2d6ae845341a009a9f9af08aa1be71a5179efc9f988ce0d2387df1c255f4a552b1afc0eefb4f979e95f56c68a8fb
 DIST talos.tZ 56676241 SHA256 a0444844210ed582944a4a956969e151d31b2e3ed426945aee8c4d0d7cdbc6fa SHA512 686974732aa03c1bb906c46ade38d4dd3b1cfaa5da5b42f968789da57c3bd4c56facda9185eb38df71c43117e0b136874f8db7abb923a64052262c0b60b59832 WHIRLPOOL ce140f404ba16a34bef7c00878a00087a923df4b5ef858f5e49f6772e01c1fbcd7b4789c95c17751c95c9fe9dd805980b5df557dda478142a5a1640fb12b4c8c
diff --git a/sci-chemistry/nmrpipe/files/7.3.2012.114.11.33-lib.patch b/sci-chemistry/nmrpipe/files/7.5.2012.204.11.07-lib.patch
index 91abd611d..91abd611d 100644
--- a/sci-chemistry/nmrpipe/files/7.3.2012.114.11.33-lib.patch
+++ b/sci-chemistry/nmrpipe/files/7.5.2012.204.11.07-lib.patch
diff --git a/sci-chemistry/nmrpipe/nmrpipe-7.3.2012.114.11.33.ebuild b/sci-chemistry/nmrpipe/nmrpipe-7.5.2012.204.11.07.ebuild
index 16a99887a..7d84f8a4b 100644
--- a/sci-chemistry/nmrpipe/nmrpipe-7.3.2012.114.11.33.ebuild
+++ b/sci-chemistry/nmrpipe/nmrpipe-7.5.2012.204.11.07.ebuild
@@ -4,7 +4,7 @@
 
 # Versioning is output of nmrPipe -help
 
-EAPI=3
+EAPI=4
 
 inherit eutils prefix virtualx
 
@@ -39,13 +39,14 @@ RDEPEND="${DEPEND}
 	sys-libs/ncurses
 	x11-apps/xset
 	x11-libs/libX11
+	x11-libs/xview
 	amd64? (
 		app-emulation/emul-linux-x86-baselibs
 		app-emulation/emul-linux-x86-xlibs
 	)"
-#	x86? ( x11-libs/xview )"
 
 S="${WORKDIR}"
+
 NMRBASE="/opt/${PN}"
 ENMRBASE="${EPREFIX}/${NMRBASE}"
 
@@ -126,7 +127,7 @@ src_install() {
 		nmrbin.{linux,mac,sgi6x,sol,winxp} nmruser format \
 		|| die "Failed to remove unnecessary libraries."
 	# As long as xview is not fixed for amd64 we do this
-	#use amd64 || rm nmrbin.linux9/lib/{libxview.so*,libolgx.so*}
+	rm nmrbin.linux9/lib/{libxview.so*,libolgx.so*} || die
 	# Remove the initialisation script generated during the installation.
 	# It contains incorrect hardcoded paths; only the "nmrInit.com" script
 	# should be used.
diff --git a/sci-libs/scotch/ChangeLog b/sci-libs/scotch/ChangeLog
deleted file mode 100644
index 57c2a3a6b..000000000
--- a/sci-libs/scotch/ChangeLog
+++ /dev/null
@@ -1,63 +0,0 @@
-# ChangeLog for sci-libs/scotch
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/ChangeLog,v 1.5 2011/05/17 10:08:20 xarthisius Exp $
-
-  12 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
-  scotch-5.1.12b.ebuild:
-  sci-libs/scotch: Shared library fixes and prefix love
-
-  28 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> scotch-5.1.12b.ebuild:
-  keyword amd64-linux and x86-linux
-
-  28 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> scotch-5.1.12b.ebuild:
-  add pthread for as-needed
-
-  12 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> scotch-5.1.12b.ebuild,
-  metadata.xml:
-  added 64bits integer flag and described the tools flag
-
-*scotch-5.1.12b (12 Mar 2012)
-
-  12 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> +scotch-5.1.12b.ebuild,
-  +files/scotch-5.1.12b-as-needed.patch, +metadata.xml:
-  Version bump. Dropped metis compatibility, it needs some work (probably
-  upstream). Added parallel build and as-needed fix
-
-  01 Jun 2011; Sébastien Fabbro <bicatali@gentoo.org> scotch-5.1.11-r1.ebuild,
-  files/metis-header.patch:
-  Fixed shared libs and cleaning.
-
-*scotch-5.1.11-r1 (23 May 2011)
-
-  23 May 2011; Sébastien Fabbro <bicatali@gentoo.org>
-  +scotch-5.1.11-r1.ebuild, +files/Makefile.inc.in, +files/metis-header.patch,
-  +files/respect-ldflags.patch, +metadata.xml:
-  Adapted for alternatives and virtual/metis
-
-  17 May 2011; Kacper Kowalik <xarthisius@gentoo.org> files/Makefile.inc.in:
-  Fix underlinking wrt #367495. Thanks to Diego Elio Pettenò
-  <flameeyes@gentoo.org> for the report.
-
-  15 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org> scotch-5.1.11.ebuild:
-  Added linking with zlib, librt and libm for as-needed
-
-*scotch-5.1.11 (05 Mar 2011)
-
-  05 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org> -scotch-5.1.6.ebuild,
-  +scotch-5.1.11.ebuild, +files/Makefile.inc.in, +files/respect-ldflags.patch,
-  -files/Makefile.inc, -files/mmkt-typo.patch, metadata.xml:
-  Version bump. Rewrote from scratch. Closing bug #324561 and bug #335468.
-
-*scotch-5.1.7 (15 Jan 2010)
-
-  15 Jan 2010; Patrick Lauer <pal@gentoo.org> +scotch-5.1.7.ebuild,
-  +files/Makefile.inc_5.1.7, +files/shared-libs_5.1.7.patch:
-  Bump, thanks to Oliver Borm. Fixes #301012 and #297656
-
-*scotch-5.1.6 (03 Sep 2009)
-
-  03 Sep 2009; Patrick Lauer <patrick@gentoo.org> +scotch-5.1.6.ebuild,
-  +files/Makefile.inc, +files/metis-header.patch, +files/mmkt-typo.patch,
-  +files/shared-libs.patch, +metadata.xml:
-  Initial import of scotch, dependency of OpenFoam. Ebuild by Richard
-  Westwell and Oliver Borm. Fixes #220823
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
deleted file mode 100644
index 322beb426..000000000
--- a/sci-libs/scotch/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST scotch_5.1.12b_esmumps.tar.gz 3989632 SHA256 82654e63398529cd3bcc8eefdd51d3b3161c0429bb11770e31f8eb0c3790db6e SHA512 8d6e085029f1ec13b74bd583b8fb378db9aef8a005b96bfb726b68a4608caeb31bf7ecaf1af27566e2e4a38dfea03a017d5c2e8dd262562b238cfb113b223671 WHIRLPOOL 85679809826ce09df8a05b09026179dcf4a1424f9f9c44ce97ba172fd18b7dc3af669c686d4ea5b169501dcb011ceab419d0391ae378712302977fb55f35abb8
diff --git a/sci-libs/scotch/files/scotch-5.1.12b-as-needed.patch b/sci-libs/scotch/files/scotch-5.1.12b-as-needed.patch
deleted file mode 100644
index 73888d879..000000000
--- a/sci-libs/scotch/files/scotch-5.1.12b-as-needed.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -Nur src.orig/esmumps/Makefile src/esmumps/Makefile
---- src.orig/esmumps/Makefile	2012-03-12 00:14:14.536109811 +0000
-+++ src/esmumps/Makefile	2012-03-12 04:26:12.884108074 +0000
-@@ -44,7 +44,7 @@
- 				$(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -c $(<) -o $(@)
- 
- %$(EXE)	:	%.c
--		 		$(CC) $(CFLAGS) -I$(includedir) $(<) -o $(@) -L$(libdir) $(LDFLAGS) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit
-+		 		$(CC) $(CFLAGS) -I$(includedir) $(<) -L$(libdir) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@)
- 
- ##
- ##  Project rules.
-@@ -57,9 +57,9 @@
- 					libesmumps$(LIB)							\
- 					main_esmumps$(EXE)
- 
--ptscotch			:	clean
-+ptscotch			:	clean common.h
- 					$(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC=$(CCP) SCOTCHLIB=ptscotch ESMUMPSLIB=ptesmumps	\
--					libesmumps$(LIB)										\
-+					libptesmumps$(LIB)										\
- 					main_esmumps$(EXE)
- 
- install				:
-@@ -142,7 +142,7 @@
- 					common.h				\
- 					esmumps.h
- 
--libesmumps$(LIB)		:	graph_graph$(OBJ)			\
-+lib$(ESMUMPSLIB)$(LIB)		:	graph_graph$(OBJ)			\
- 					order$(OBJ)				\
- 					order_scotch_graph$(OBJ)		\
- 					dof$(OBJ)				\
-diff -Nur src.orig/libscotch/Makefile src/libscotch/Makefile
---- src.orig/libscotch/Makefile	2012-03-12 00:14:14.496108751 +0000
-+++ src/libscotch/Makefile	2012-03-12 01:32:28.562403624 +0000
-@@ -43,7 +43,7 @@
- 				$(CC) $(CFLAGS) $(CLIBFLAGS) -c $(<) -o $(@)
- 
- %$(EXE)	:	%.c
--		 		$(CC) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
-+		 		$(CC) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LDFLAGS) -o $(@)
- 
- ##
- ##  Project rules.
-@@ -2543,7 +2543,7 @@
- 					mapping.h				\
- 					order.h					\
- 					parser.h
--			 		$(CCD) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
-+			 		$(CCD) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<)  $(LDFLAGS) -o $(@)
- 
- scotch.h			:	dummysizes$(EXE)			\
- 					library.h
-diff -Nur src.orig/libscotchmetis/Makefile src/libscotchmetis/Makefile
---- src.orig/libscotchmetis/Makefile	2012-03-12 00:14:14.456107691 +0000
-+++ src/libscotchmetis/Makefile	2012-03-12 01:35:00.166422784 +0000
-@@ -44,7 +44,7 @@
- 				$(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@)
- 
- %$(EXE)	:	%.c
--		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) $(LDFLAGS)
-+		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) $(LDFLAGS) -o $(@) 
- 
- ##
- ##  Project rules.
-diff -Nur src.orig/scotch/Makefile src/scotch/Makefile
---- src.orig/scotch/Makefile	2012-03-12 00:14:14.536109811 +0000
-+++ src/scotch/Makefile	2012-03-12 00:50:22.033571205 +0000
-@@ -41,13 +41,13 @@
- include ../Makefile.inc
- 
- %$(EXE)	:	%$(OBJ)
--		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS)
-+		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@)
- 
- %$(OBJ)	:	%.c
- 				$(CC) $(CFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@)
- 
- %$(EXE)	:	%.c
--		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS)
-+		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@)
- 
- ##
- ##  Project rules.
-@@ -205,7 +205,7 @@
- 					$(libdir)/libptscotch$(LIB)		\
- 					$(libdir)/libptscotcherrexit$(LIB)	\
- 					dgmap.h
--			 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS)
-+			 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@)
- 
- dgscat$(EXE)			:	dgscat.c				\
- 					../libscotch/module.h			\
-@@ -315,7 +315,7 @@
- 					gout_o.c				\
- 					$(includedir)/scotch.h			\
- 					$(libdir)/libscotch$(LIB)
--					$(CC) $(CFLAGS) -I../libscotch -I$(includedir) gout_c.c gout_o.c -o $(@) -L$(libdir) -lscotch -lscotcherrexit $(LDFLAGS)
-+					$(CC) $(CFLAGS) -I../libscotch -I$(includedir) gout_c.c gout_o.c -L$(libdir) -lscotch -lscotcherrexit $(LDFLAGS) -o $(@) 
- 
- gpart$(EXE)			:	gmap.c					\
- 					../libscotch/module.h			\
-@@ -324,7 +324,7 @@
- 					$(libdir)/libscotch$(LIB)		\
- 					$(libdir)/libscotcherrexit$(LIB)	\
- 					gmap.h
--			 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS)
-+			 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@)
- 
- 
- gscat$(EXE)			:	gscat.c					\
diff --git a/sci-libs/scotch/metadata.xml b/sci-libs/scotch/metadata.xml
deleted file mode 100644
index 16d2bae62..000000000
--- a/sci-libs/scotch/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
-  SCOTCH is a software package and libraries for graph, mesh and
-  hypergraph partitioning, static mapping, and sparse matrix block
-  ordering.
-  Its purpose of Scotch is to apply graph theory, with a divide and
-  conquer approach, to scientific computing problems such as graph and
-  mesh partitioning, static mapping, and sparse matrix ordering, in
-  application domains ranging from structural mechanics to operating
-  systems or bio-chemistry.
-  The SCOTCH distribution is a set of programs and libraries which
-  implement the static mapping and sparse matrix reordering algorithms
-  developed within the SCOTCH project.
-</longdescription>
-<use>
-  <flag name='int64'>Build the 64 bits integer library (needed for > 2^31 vertices)</flag>
-  <flag name='tools'>Build and install extra exec tools</flag>
-</use>
-
-</pkgmetadata>
diff --git a/sci-libs/scotch/scotch-5.1.12b.ebuild b/sci-libs/scotch/scotch-5.1.12b.ebuild
deleted file mode 100644
index 994c1f682..000000000
--- a/sci-libs/scotch/scotch-5.1.12b.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils toolchain-funcs versionator flag-o-matic multilib
-
-# use esmumps version to allow linking with mumps
-MYP="${PN}_${PV}_esmumps"
-# download id on gforge changes every goddamn release
-DID=28978
-
-DESCRIPTION="Software for graph, mesh and hypergraph partitioning"
-HOMEPAGE="http://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/"
-SRC_URI="http://gforge.inria.fr/frs/download.php/${DID}/${MYP}.tar.gz"
-
-LICENSE="CeCILL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples int64 mpi static-libs tools"
-
-DEPEND="sys-libs/zlib
-	mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MYP/b}"
-
-static_to_shared() {
-	local libstatic=${1}; shift
-	local libname=$(basename ${libstatic%.a})
-	local soname=${libname}$(get_libname $(get_version_component_range 1-2))
-	local libdir=$(dirname ${libstatic})
-
-	einfo "Making ${soname} from ${libstatic}"
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
-			-Wl,-all_load -Wl,${libstatic} \
-			"$@" -o ${libdir}/${soname} || die "${soname} failed"
-	else
-		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-			-shared -Wl,-soname=${soname} \
-			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
-			"$@" -o ${libdir}/${soname} || die "${soname} failed"
-		[[ $(get_version_component_count) -gt 1 ]] && \
-			ln -s ${soname} ${libdir}/${libname}$(get_libname $(get_major_version))
-		ln -s ${soname} ${libdir}/${libname}$(get_libname)
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	sed -e "s/-O3/${CFLAGS} -pthread/" \
-		-e "s/gcc/$(tc-getCC)/" \
-		-e "s/ ar/ $(tc-getAR)/" \
-		-e "s/ranlib/$(tc-getRANLIB)/" \
-		src/Make.inc/Makefile.inc.i686_pc_linux2 > src/Makefile.inc || die
-	use int64 && append-cflags -DIDXSIZE64
-}
-
-src_compile() {
-	emake -C src CLIBFLAGS=-fPIC
-	static_to_shared lib/libscotcherr.a
-	static_to_shared lib/libscotcherrexit.a
-	static_to_shared lib/libscotch.a -Llib -lz -lm -lrt -lscotcherr
-	static_to_shared lib/libesmumps.a -Llib -lscotch
-	static_to_shared lib/libscotchmetis.a -Llib -lscotch
-
-	if use mpi; then
-		emake -C src CLIBFLAGS=-fPIC ptscotch
-		export LINK=mpicc
-		static_to_shared lib/libptscotcherr.a
-		static_to_shared lib/libptscotcherrexit.a
-		static_to_shared lib/libptscotch.a -Llib -lptscotcherr -lz -lm -lrt
-		static_to_shared lib/libptesmumps.a -Llib -lptscotch
-		static_to_shared lib/libptscotchparmetis.a -Llib -lptscotch
-	fi
-	if use static-libs; then
-		emake -C src clean
-		emake -C src
-		use mpi && emake -C src ptscotch
-	fi
-}
-
-src_install() {
-	dolib.so lib/lib*$(get_libname)*
-	use static-libs && dolib.a lib/*.a
-
-	insinto /usr/include/scotch
-	doins include/*
-
-	cat <<-EOF > scotchmetis.pc
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: scotchmetis
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lscotchmetis -lscotcherr -lscotch
-		Private: -lm -lz -lrt
-		Cflags: -I\${includedir}/scotch
-	EOF
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins scotchmetis.pc
-
-	# not sure it is actually a full replacement of metis
-	#alternatives_for metis scotch 0 \
-	#	/usr/$(get_libdir)/pkgconfig/metis.pc scotchmetis.pc
-
-	if use mpi; then
-		cat <<-EOF > ptscotchparmetis.pc
-			prefix=${EPREFIX}/usr
-			libdir=\${prefix}/$(get_libdir)
-			includedir=\${prefix}/include
-			Name: ptscotchparmetis
-			Description: ${DESCRIPTION}
-			Version: ${PV}
-			URL: ${HOMEPAGE}
-			Libs: -L\${libdir} -lptscotchparmetis -lptscotcherr -lptscotch
-			Private: -lm -lz -lrt
-			Cflags: -I\${includedir}/scotch
-			Requires: scotchmetis
-		EOF
-			insinto /usr/$(get_libdir)/pkgconfig
-			doins ptscotchparmetis.pc
-			# not sure it is actually a full replacement of parmetis
-			#alternatives_for metis-mpi ptscotch 0 \
-			#	/usr/$(get_libdir)/pkgconfig/metis-mpi.pc ptscotchparmetis.pc
-	fi
-
-	dodoc README.txt
-
-	if use tools; then
-		local b m
-		pushd bin > /dev/null
-		for b in *; do
-			newbin ${b} scotch_${b}
-		done
-		popd > /dev/null
-
-		pushd man/man1 > /dev/null
-		for m in *; do
-			newman ${m} scotch_${m}
-		done
-		popd > /dev/null
-	fi
-
-	use doc && dodoc doc/*.pdf
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/* tgt grf
-	fi
-}
diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
index f8414abe2..49cab70c5 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild
@@ -10,7 +10,10 @@ IUSE="emacs optimization"
 
 ESVN_REPO_URI="svn://svn.macaulay2.com/Macaulay2/trunk/M2"
 
+# Those packages will be built internally, Macaulay2 always wants the
+# latest and greatest
 BOEHM_GC="gc-7.3alpha1.2012.01.23"
+GCLIBATOMIC_OPS="gc-libatomic_ops-7.3alpha2"
 FACTORY="factory-3-1-4-1"
 LIBFAC="libfac-3-1-4"
 
@@ -20,7 +23,8 @@ SRC_BASE="http://www.math.uiuc.edu/${PN}/Downloads/"
 SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/${LIBFAC}.tar.gz
 		 ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-gftables.tar.gz
 		 http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/${FACTORY}.tar.gz
-		 http://www.math.uiuc.edu/Macaulay2/Extra/${BOEHM_GC}.tar.gz"
+		 http://www.math.uiuc.edu/Macaulay2/Extra/${BOEHM_GC}.tar.gz
+		 http://www.math.uiuc.edu/Macaulay2/Extra/${GCLIBATOMIC_OPS}.tar.gz"
 # Somebody changed the tarball after release... grrr.
 #		 ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/${FACTORY}.tar.gz
 
@@ -85,6 +89,8 @@ src_prepare() {
 	# The resulting QA warning is known.
 	cp "${DISTDIR}/${BOEHM_GC}.tar.gz" "${S}/BUILD/tarfiles/" \
 		|| die "copy failed"
+	cp "${DISTDIR}/${GCLIBATOMIC_OPS}.tar.gz" "${S}/BUILD/tarfiles/" \
+		|| die "copy failed"
 
 	eautoreconf
 }
diff --git a/sci-mathematics/Macaulay2/Manifest b/sci-mathematics/Macaulay2/Manifest
index d68ebfe64..d2d3fb35c 100644
--- a/sci-mathematics/Macaulay2/Manifest
+++ b/sci-mathematics/Macaulay2/Manifest
@@ -1,4 +1,5 @@
 DIST factory-3-1-4-1.tar.gz 707733 SHA256 7691308866a47e405be0f26b15e553850ead6034f76b6bc311e7a84a4c6b3e6a SHA512 404ef7c3afa6c3f868efbd13e5d3e80f7655d6f0615dc6feb21892743d804057344174133497027f5f49ead0d48e792a4a9b0749311092c5883e22a4bba9dd4c WHIRLPOOL 79366c2bc1bec781affdaa36264d4c726f447f8faf2694e9ce7fa5169b2ba3949f26ac6c108579a34ba8aa09f76a5eddc652d14a34de7123ee5d4fe8d9998256
 DIST factory-gftables.tar.gz 2961892 SHA256 4cd6b3de2fd5eea694a5d843328ab8f6dba1da05ae93efcd2ca0fa5d7658a6fb SHA512 49dfb52e030f04c0b940ce124eb633bb34dacb7ab2faf7f5fee82b3e1ce5331af600b9b684a53eb766c643e38a45f361028940cfd26b8a699c919cfb63d12535 WHIRLPOOL f5d15ac5dcb8e126ecffb42cde5bf5472dbb81e7cb7b2abc1306ee36ef8d85067d0c13b7fa58b65eb09b69da1409a81ea02c0f7ca0e3d1ac71f5c21d8e8b5f81
 DIST gc-7.3alpha1.2012.01.23.tar.gz 10520461 SHA256 c366975817bbbf8e070c715828212487d5a85e681550b441e8db9cefb4bc455e SHA512 dff823cf2374da6920d2b888d0bfdf2f9a8e101a72e0213ebbc50e0d38a6c73e1204857846ba0217f536ae0a59fcc3d379434bd67b365862d25151a7f753d45e WHIRLPOOL 8c6a60a6f565344c96a6f438aef9a4fb845d7a4dff631cf6565b72b589da0a22f32e98b70bac10143aba10a52c1001c911a2cc0ade4d9f76ca08a4700b506764
+DIST gc-libatomic_ops-7.3alpha2.tar.gz 1454218 SHA256 b51ae5de3c43186e6c54d820b5b823acffa497868f70d4bcf43a454cfc0cea05 SHA512 bd7ff73ce275823af8375ca5a0406bfce5c623b142d0ec42d6ec7a9d3849f6e4f6ee5fe60f048d8940b43592dd757bb712d034906138a734fd1b02056199bd4a WHIRLPOOL 5c09dc990138089beccb692c87d2e791e5efb41822ee48d990cbb0e68713e64622d61561b972a0d4a9f5762f2aaf6331e81e35b291a3da2a1e515b37a6e1d6bc
 DIST libfac-3-1-4.tar.gz 82499 SHA256 12e83baae591e2d2920d87d5fcbb079e9cdd95fa18d989c47df25fdeab339d50 SHA512 e7c155bd1e5b93a050574532f6630e5954ad9e7f010cd7e5a76b175bdf6b95866ac49f80409f6a0e7b41d8c3b052f89a02e77049211030f04ea8a5b47e669b49 WHIRLPOOL 91682eb69d632ac67a3897f62070b562a95903eba0ea6da01c85c540d5da3e0b645f61d787f7d8f6daee3b1b22de2c7826478016c309f8243a39f41f0dcf95eb
diff --git a/sci-misc/foma/ChangeLog b/sci-misc/foma/ChangeLog
index 4918b470c..f5af3ae7c 100644
--- a/sci-misc/foma/ChangeLog
+++ b/sci-misc/foma/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sci-misc/foma
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*foma-0.9.16_alpha (31 Jul 2012)
+
+  31 Jul 2012; Flammie Pirinen <flammie@gentoo.org> +foma-0.9.16_alpha.ebuild:
+  Bump foma to version 0.9.16alpha, install headers
+
   25 Oct 2011; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Removed no-herd from herd tag in metadata.xml
 
diff --git a/sci-misc/foma/Manifest b/sci-misc/foma/Manifest
index f0f7c4ebe..8af0fee78 100644
--- a/sci-misc/foma/Manifest
+++ b/sci-misc/foma/Manifest
@@ -1 +1,2 @@
-DIST foma-0.9.14alpha.tar.gz 306549 RMD160 f5fc03910a76bb0e95b3e0a0008cae5d369dca16 SHA1 85947de3c71ad06448dc7848945ff1deef4e540c SHA256 8ae2f9681e1ecd8c1bc5b1914e755736a839c620b6111c5ab38e2e253ef3255f
+DIST foma-0.9.14alpha.tar.gz 306549 SHA256 8ae2f9681e1ecd8c1bc5b1914e755736a839c620b6111c5ab38e2e253ef3255f SHA512 deb1a2086d21020d84941025f4e131b6a20262b816def2a43261dedfa928823e59704336cdecf28a56b5fb270786b8a7cc2f3ad8b861920e3e0d5a6fd51a7add WHIRLPOOL 1eb73691cf0d710b41a6e9f7a54da0794a2afa526f0f4185e689d3e3fdee9fdc6fd946c80af8ab47ca9cfefb66cea07b46ebee9d31d064697c5632591e20dace
+DIST foma-0.9.16alpha.tar.gz 328482 SHA256 dc019dcdf6dc8f7e881394f3d76821006e7f0cf6e3fe1c12ac2887fa48d81208 SHA512 8c33de29be11dbbf808243222369ee1e8c17f4659fb2d88ce7b1e53f1161538415e50792981110cf46e50890933573f70d034b258a7d7c596e3c61317d56f369 WHIRLPOOL 2cf481210eef4f46eb42f8c98f157074985d2030fbf0aea8cf1f89b1827f7fabf43c0607cefe40d831a5fb15f92f81a04b546a878b299939c1895d8a4c829787
diff --git a/sci-misc/foma/foma-0.9.16_alpha.ebuild b/sci-misc/foma/foma-0.9.16_alpha.ebuild
new file mode 100644
index 000000000..81c050324
--- /dev/null
+++ b/sci-misc/foma/foma-0.9.16_alpha.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+MY_P=${P/_alpha/alpha}
+
+DESCRIPTION="Finite state toolkit compatible with Xerox tools"
+HOMEPAGE="http://code.google.com/p/foma/"
+SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+RDEPEND="
+	sys-libs/libtermcap-compat
+	sys-libs/readline"
+DEPEND="${RDEPEND}
+	>=sys-devel/bison-2.3
+	>=sys-devel/flex-2.5.35"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	sed \
+		-e "s/^CFLAGS =/CFLAGS = ${CFLAGS} -fPIC/" \
+		-e 's/ltermcap/lcurses/' \
+		-e 's/ldconfig/true/g' \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake
+	emake libfoma
+}
+
+src_install() {
+	# since install target doesn't have DESTDIR
+	dobin foma flookup cgflookup
+	dolib.so libfoma.so.${PV/_alpha/}
+	insinto /usr/include
+	doins foma.h fomalib.h fomalibconf.h
+	dodoc README README.symbols
+}
diff --git a/sci-misc/hfst/ChangeLog b/sci-misc/hfst/ChangeLog
index a1485e928..67c498d5e 100644
--- a/sci-misc/hfst/ChangeLog
+++ b/sci-misc/hfst/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-misc/hfst
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*hfst-3.3.12 (31 Jul 2012)
+
+  31 Jul 2012; Flammie Pirinen <flammie@gentoo.org> +hfst-3.3.12.ebuild, 
+  metadata.xml:
+  Version bump hfst to 3.3.12
+
   25 Oct 2011; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Removed no-herd from herd tag in metadata.xml
 
diff --git a/sci-misc/hfst/Manifest b/sci-misc/hfst/Manifest
index c6dd95cb9..5998805eb 100644
--- a/sci-misc/hfst/Manifest
+++ b/sci-misc/hfst/Manifest
@@ -1,2 +1,3 @@
-DIST hfst-2.2.tar.gz 3608685 RMD160 d10006421670ce3f1c9d44115b6916a84f4b0063 SHA1 51f9ad1008124c310047e79798d76498bc01dbab SHA256 0b63d60dd331f7bcf32908015cada8920127215564735036696a0e877ab69337
-DIST hfst-3.0.2.tar.gz 1110799 RMD160 f068c8a70528201e2b76c9ff406316cadbf486e1 SHA1 1bfc94590fde4ee6ff70466edeae5f983005db4f SHA256 8d02fa5b2ee490c9a6bdf62b7b98918b94cea080c41e8c404a6bce6d123c0a31
+DIST hfst-2.2.tar.gz 3608685 SHA256 0b63d60dd331f7bcf32908015cada8920127215564735036696a0e877ab69337 SHA512 24444ddbf762df9e52a1fe8be5aa7a4be3a18e9ca9f5878a3df18b8fe8b4b1ae84dcf88bfeac749e9b76a9fb364227a6ac52d475f40c4956f7c8ea0026f070c2 WHIRLPOOL 32716d690bf8807644a4c677ff0b254c3ff274ef404e3f338290b79803f3e560ace5ab0604a581ff32a007fb08a129c9c7c268689a3e3b148888be06a2946363
+DIST hfst-3.0.2.tar.gz 1110799 SHA256 8d02fa5b2ee490c9a6bdf62b7b98918b94cea080c41e8c404a6bce6d123c0a31 SHA512 2891f8f45bd410af3ca83f08d93527c5a7e34c80942f8cffb45d9dd83914bf69e778790f114e2b8a3308a25a01b5aa1bb995085ed0f04097ca3f83a764cfeff7 WHIRLPOOL e259cfd6381cf3e4b917e4f6b4a437a6a1acb9bc1830936c666ba430ff33d7a8c1a0cd8424d1543f3482474db56856c88a7d8cc6be70fe22f680a1daebd016b9
+DIST hfst-3.3.12.tar.gz 1419137 SHA256 6424b3055fa4a96ff1b502a39907d30b3fb5be0e48c2ef4670206ace684d6f7a SHA512 b4b754767cb750cb420b9c8eafbc33dd89a6deec58012f5a4aa90c0219d7e0737a08215b7f4c3277f40180a7fe970c9ee9aafc8077520d0e49eba398b7d8f269 WHIRLPOOL 71a9b232fb043db755f1d5cd643936e89877f2eb1d81330a80680a5222fec8dbd1f2eb4fb1be97d62326dc3b23e32d0a79da3238446cb1bb714ae1dab1e6bb91
diff --git a/sci-misc/hfst/hfst-2.2.ebuild b/sci-misc/hfst/hfst-2.2.ebuild
index 7e7d56fbb..dd7a3610d 100644
--- a/sci-misc/hfst/hfst-2.2.ebuild
+++ b/sci-misc/hfst/hfst-2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,7 +6,7 @@ EAPI=4
 
 DESCRIPTION="Helsinki Finite State Transducer API and tools"
 HOMEPAGE="http://hfst.sourceforge.net/"
-SRC_URI="mirror://sourceforge/hfst/hfst-2.2.tar.gz"
+SRC_URI="mirror://sourceforge/hfst/archive/hfst-2.2.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/sci-misc/hfst/hfst-3.0.2.ebuild b/sci-misc/hfst/hfst-3.0.2.ebuild
index 9ed89b652..7c1b02bc8 100644
--- a/sci-misc/hfst/hfst-3.0.2.ebuild
+++ b/sci-misc/hfst/hfst-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,7 +6,7 @@ EAPI=4
 
 DESCRIPTION="Helsinki Finite State Transducer API and tools"
 HOMEPAGE="http://hfst.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/sci-misc/hfst/hfst-3.3.12.ebuild b/sci-misc/hfst/hfst-3.3.12.ebuild
new file mode 100644
index 000000000..45be9b7f3
--- /dev/null
+++ b/sci-misc/hfst/hfst-3.3.12.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+DESCRIPTION="Helsinki Finite State Transducer API and tools"
+HOMEPAGE="http://hfst.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="+openfst sfst foma xml +glib"
+
+RDEPEND="
+	openfst? ( >sci-misc/openfst-1.2 )
+	sfst? ( >sci-misc/sfst-1.3 )
+	foma? ( >sci-misc/foma-0.9.13 )
+	xml? ( dev-libs/libxml2 dev-cpp/libxmlpp )
+	glib? ( dev-libs/glib )"
+DEPEND="${RDEPEND} 
+	>=sys-devel/flex-2.5.35
+	sys-devel/bison"
+
+src_configure() {
+	econf \
+		$(use_with openfst) \
+		$(use_with sfst) \
+		$(use_with foma) \
+		$(use_enable xml apertium2fst) \
+		$(use_with glib unicodehandler glib) \
+		--enable-lexc
+}
diff --git a/sci-misc/hfst/metadata.xml b/sci-misc/hfst/metadata.xml
index 4093d00b1..efb69747d 100644
--- a/sci-misc/hfst/metadata.xml
+++ b/sci-misc/hfst/metadata.xml
@@ -6,11 +6,23 @@
 		traditional FST-based linguistic morphology tools.
 	</longdescription>
 	<use>
-		<flag name="openfst">Add optional support for openfst backend
-		library (<pkg>sci-misc/openfst</pkg>)</flag>
-		<!--		<flag name="foma">Add optional support for foma backend
-		library (<pkg>sci-misc/foma</pkg>)</flag> -->
-		<flag name="sfst">Add optional support for sfst backend
-		library (<pkg>sci-misc/sfst</pkg>)</flag>
+		<flag name="openfst">
+			Add optional support for openfst backend library
+			(<pkg>sci-misc/openfst</pkg>)
+		</flag>
+		<flag name="foma">
+			Add optional support for foma backend library
+			(<pkg>sci-misc/foma</pkg>)</flag>
+		<flag name="sfst">
+			Add optional support for sfst backend library
+			(<pkg>sci-misc/sfst</pkg>)
+		</flag>
+		<flag name="glib">
+			Parse UTF-8 and collate unicode using glib instead of
+			homebrewn methods
+		</flag>
+		<flag name="xml">
+			Include parsers for grammars and formats that require XML support
+		</flag>
 	</use>
 </pkgmetadata>
diff --git a/sci-misc/openfst/ChangeLog b/sci-misc/openfst/ChangeLog
index 08df6aa0a..e2ca5a189 100644
--- a/sci-misc/openfst/ChangeLog
+++ b/sci-misc/openfst/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sci-misc/openfst
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openfst-1.3.2 (30 Jul 2012)
+
+  30 Jul 2012; Flammie Pirinen <flammie@gentoo.org> +openfst-1.3.2.ebuild:
+  Version bump.
+
   25 Oct 2011; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Removed no-herd from herd tag in metadata.xml
 
diff --git a/sci-misc/openfst/Manifest b/sci-misc/openfst/Manifest
index 244fadf3c..6c0467fd1 100644
--- a/sci-misc/openfst/Manifest
+++ b/sci-misc/openfst/Manifest
@@ -1 +1,2 @@
-DIST openfst-1.2.7.tar.gz 668134 RMD160 a24279f4deb85f79875b237c548f0b600c3a6af8 SHA1 75aa24fe050c295e16aaeb31a216c1d97952c84e SHA256 a38b10a7a1b6c054fb15035f3197f566ac6b23bc2acd5958052165ae7ce5c11c
+DIST openfst-1.2.7.tar.gz 668134 SHA256 a38b10a7a1b6c054fb15035f3197f566ac6b23bc2acd5958052165ae7ce5c11c SHA512 899297a12b51acef51a82148a04160acd4bb4e1925da18e20a810814401542aaa582928ae3b80b96f49890420796cae7acd7cbf1d21fb6bc6c755254f1ae2c67 WHIRLPOOL b9c1d9a7b592a43cd77aa6778451c9de8bbf135f39f1415d467b25279c6a360c9537dcdb8b9795023e482462668e61ad66de8e843f211b72a7986b448d6e200a
+DIST openfst-1.3.2.tar.gz 723259 SHA256 4e1c2e4f6c54aef15cf13f4f01611ac72122a97214dfa7dab0b7d1a7e1214602 SHA512 5cbaebc3e99c2156379bdaeddef6972b37019cbdce7e2744cf5020f300e959410dce8d1fb1b354c3691975a2d1c0f40123feab46ded59919e4b13a010bbb78f0 WHIRLPOOL a0ca8e814ff1f7c09fd64687dacadf66da3945560e3b16f9afc797df391dc85b7d124314354ddd823ee142131b3d7bbd7914f5659e8c6fc49e8b0abac74be0b2
diff --git a/sci-misc/openfst/openfst-1.3.2.ebuild b/sci-misc/openfst/openfst-1.3.2.ebuild
new file mode 100644
index 000000000..98cbaa76e
--- /dev/null
+++ b/sci-misc/openfst/openfst-1.3.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="Finite State Transducer tools by Google et al."
+HOMEPAGE="http://www.openfst.org"
+SRC_URI="http://www.openfst.org/twiki/pub/FST/FstDownload/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+
+SLOT="0"
+
+KEYWORDS="~x86"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc AUTHORS NEWS README || die "docs missing"
+}
+
+src_test() {
+	einfo "make test can take a few hours on moderately modern systems"
+	make test || die "check failed"
+}
diff --git a/sci-misc/sfst/ChangeLog b/sci-misc/sfst/ChangeLog
index 127bdf946..ac6a40d94 100644
--- a/sci-misc/sfst/ChangeLog
+++ b/sci-misc/sfst/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sci-misc/sfst
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*sfst-1.4.6g (01 Aug 2012)
+
+  01 Aug 2012; Flammie Pirinen <flammie@gentoo.org> +sfst-1.4.6g.ebuild:
+  Version bump sfst to 1.4.6g.
+
   24 Oct 2011; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Removed no-herd from herd tag in metadata.xml
 
diff --git a/sci-misc/sfst/Manifest b/sci-misc/sfst/Manifest
index 03d6f2d1e..3fea2be41 100644
--- a/sci-misc/sfst/Manifest
+++ b/sci-misc/sfst/Manifest
@@ -1,3 +1,4 @@
-DIST SFST-1.4.2.tar.gz 490458 RMD160 77b0fd451026067ce91f6837d16cd6f55064ba35 SHA1 948f73fb6e66f30aadfb12311cbd4a8c7101494d SHA256 0f3040f9e79faa7fee083d3344a87db533dfd84340b43eb86e79a208c70ad7be
-DIST sfst.el 4752 RMD160 b322b17fc4a0b9d22938af5438524cfac18f7a02 SHA1 779b36a5f60ea6ff6894950f82cce186397a6802 SHA256 b47ff59f5ff24482dbbb2f1e71a8b9ca234c4154487f83eb2118f1a62bb9eb5f
-DIST vim-mode.tar.gz 1104 RMD160 c7e3f79fb5bd466724c3d456a92fbeb07d355515 SHA1 83b9651a7e4ca9642b16be416e616734e8c3f88c SHA256 a62ba91c40da75be389a334db62cc2b4904bedfac657b185012b10f3f55dfe09
+DIST SFST-1.4.2.tar.gz 490458 SHA256 0f3040f9e79faa7fee083d3344a87db533dfd84340b43eb86e79a208c70ad7be SHA512 9466d929e33141db7e2e19eb9dbcdf095a561677ba0e0ae9158a813a92ac3b389462a47a253fca5c61d14413c2559e0f1cfe3d3222f456836b5b5f93b33b42ea WHIRLPOOL e1aa43b8902812a75aa8d4ac598aa029cf38e23e52c9cc8c140eda03d5b514bcc5cc60f820b0eedd00d060b175aff74e05ce72c860337297553a228ab3b6425b
+DIST SFST-1.4.6g.tar.gz 486283 SHA256 5ed88df7ca993fc62e9ca85464ffc78fde83425344826e26debc984f32621bf8 SHA512 cd92a952389e5ec1cf965362b249f992bc20dca58c9dd3f8cc873ccbdc80507d4962681725943d2611956d92c116338a0b46f18653d89486f0a4986fb58fbd13 WHIRLPOOL 79f0dadb16f12507b58bf3971df0b6aba42f2f7b5fe95a796e6d2c15ddfdf95fc30dea4e387f77080f440810acdbfbba0ebe29f3fe7de1102f79edfec540129c
+DIST sfst.el 4752 SHA256 b47ff59f5ff24482dbbb2f1e71a8b9ca234c4154487f83eb2118f1a62bb9eb5f SHA512 88c808044919d49b7c647c16caffb0e67d6fae9ae948434247dbcef7d78168a7b67e7a5b64c5dbeb634f273d6b8ccb93d449af097a1418a6d48a7852f6ad9bbe WHIRLPOOL c8075858fde4c0986acdebab6e5935b1a8022065db09f722d0844d5a020414e8b19d3f321a6f1eeb96e4609643ed4dc62375d8c11be471b5d2e6b7212f6af273
+DIST vim-mode.tar.gz 1104 SHA256 a62ba91c40da75be389a334db62cc2b4904bedfac657b185012b10f3f55dfe09 SHA512 8b808553dbf7a6d6aebb0d6382339bfbe56584effe0b1b0b9096969f81324305e4b66760188dc8fdfbb69118aa5688c66e2bd880dabb57b494068fd620ff540d WHIRLPOOL 252b7bd1110f3522caf0e2921550a52a552611227fd0da0029485f6eaf467ad476758deaee2774cf3c0e882d5dca63b82362e3e5a8fd378171286f7c1682fa77
diff --git a/sci-misc/sfst/sfst-1.4.6g.ebuild b/sci-misc/sfst/sfst-1.4.6g.ebuild
new file mode 100644
index 000000000..6222fddd1
--- /dev/null
+++ b/sci-misc/sfst/sfst-1.4.6g.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit elisp-common eutils
+
+MY_PN="SFST"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Uni Stuttgart Finite State Transducer tools"
+HOMEPAGE="http://www.ims.uni-stuttgart.de/projekte/gramotron/SOFTWARE/SFST.html"
+SRC_URI="
+	ftp://ftp.ims.uni-stuttgart.de/pub/corpora/${MY_PN}/${MY_P}.tar.gz
+	vim-syntax? ( ftp://ftp.ims.uni-stuttgart.de/pub/corpora/${MY_PN}/vim-mode.tar.gz )
+	emacs? ( http://www.cis.uni-muenchen.de/~wastl/emacs/sfst.el )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="emacs vim-syntax"
+
+RDEPEND="sys-libs/readline"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	sys-apps/sed
+	emacs? ( virtual/emacs )"
+
+S="${WORKDIR}/${MY_PN}"
+
+src_prepare() {
+	# settings in makefile are a bit hacky
+	#epatch "${FILESDIR}"/SFST-1.3-gcc43.patch || die "patch failed"
+	sed \
+		-e "s/^CFLAGS = -O3/CFLAGS = ${CFLAGS}/g" \
+		-e "s/local//g" \
+		-e 's/strip/echo strip removed: /g' \
+		-e 's/# FPIC/FPIC/' \
+		-e 's/ $(PREFIX/ $(DESTDIR)$(PREFIX/g' \
+		-e 's/ldconfig/true/' \
+		-e 's/$(INSTALL_LIBS)/$(INSTALL_DIR) $(DESTDIR)$(PREFIX)\/lib\n\t\0/' \
+		-i "${S}"/src/Makefile || die "sed failed"
+	cd "${S}"
+	if use emacs ; then
+		cp "${DISTDIR}/sfst.el" "${S}"
+	fi
+	if use vim-syntax ; then
+		mv "${WORKDIR}"/INSTALL "${S}"/INSTALL-vim-syntax
+		mv "${WORKDIR}"/sfst.vim "${S}"/
+	fi
+}
+
+src_compile() {
+	emake -C "${S}/src"
+	if use emacs ; then
+		cd "${S}"
+		elisp-compile *.el || die "could not compile elisp"
+	fi
+}
+
+src_install() {
+	cd "${S}/src"
+	# destdir works but prefix fails
+	emake DESTDIR="${D}" install maninstall libinstall
+	cd "${S}"
+	dodoc README
+	insinto /usr/share/doc/${PF}/
+	doins doc/SFST-Manual.pdf doc/SFST-Tutorial.pdf
+	insinto /usr/share/${PN}
+	doins -r data/*
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax/
+		doins sfst.vim
+		insinto /usr/share/vim/vimfiles/ftdetect/
+		newins "${FILESDIR}"/ftdetect-sfst.vim sfst.vim
+		dodoc INSTALL-vim-syntax
+	fi
+	if use emacs ; then
+		elisp-install ${PN} *.el *.elc || die "could not install elisp"
+	fi
+}
diff --git a/x11-libs/xview/ChangeLog b/x11-libs/xview/ChangeLog
index c281a436f..5716bc176 100644
--- a/x11-libs/xview/ChangeLog
+++ b/x11-libs/xview/ChangeLog
@@ -1,7 +1,18 @@
 # ChangeLog for x11-libs/xview
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  31 Jul 2012; Justin Lecher <jlec@gentoo.org> xview-3.2-r6.ebuild,
+  xview-3.2-r7.ebuild:
+  Add missing inherit of multilib
+
+*xview-3.2-r7 (31 Jul 2012)
+
+  31 Jul 2012; Justin Lecher <jlec@gentoo.org> +xview-3.2-r7.ebuild,
+  +files/xview-3.2-impl-dec.patch, metadata.xml:
+  Use everything from debian; build only 32bit libs everywhere; be carefully
+  this is very hacky approach
+
   25 Jun 2011; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Fixed herd entry in metadata.xml
 
diff --git a/x11-libs/xview/Manifest b/x11-libs/xview/Manifest
index 238314363..b024f62b2 100644
--- a/x11-libs/xview/Manifest
+++ b/x11-libs/xview/Manifest
@@ -1,2 +1,4 @@
-DIST xview-3.2-gcc-4.1-v0.1.patch.bz2 8018 RMD160 0387c073d7f4c8303467f3065ba2a573fdb6710e SHA1 f06eb2412e4d61dffaee7db436527d7933a50931 SHA256 2b26f10122535eff43a4f87fc97ffb54eac88c312a3688b05bce806ce9a273ba
-DIST xview-3.2p1.4-19c.tar.gz 3350088 RMD160 6e0e90a737df7de8d30dbbd647527d599f13e8dd SHA1 1a2023945edef33ea4251fcb3b9e69bcf35a531c SHA256 ce05762918ccaa0bd86819e1347b57b6d0e5d515b148f9f740d3ffd1fa9eea83
+DIST xview-3.2-gcc-4.1-v0.1.patch.bz2 8018 SHA256 2b26f10122535eff43a4f87fc97ffb54eac88c312a3688b05bce806ce9a273ba SHA512 d4c80bccc2b8d57ff6906002b1b3e12f0cb480c7873ef118423d7bd566a6b655f422c61782893f796889052b1ab19f1328fcf670a1e0ef93e6b2e28aec2eb80b WHIRLPOOL f42e871a21c06bb213e9726edd88e58b9024320e95798b4acf32222dd3b0efd6b5183dcdfe64c3b257429fee1524d010e3f8e75f5428642d87fd81ef99244deb
+DIST xview-3.2p1.4-19c.tar.gz 3350088 SHA256 ce05762918ccaa0bd86819e1347b57b6d0e5d515b148f9f740d3ffd1fa9eea83 SHA512 d0e29de2d540d0cc8ec2739e61e0ccdf36cf97f4e87fcffe469733e1649ee837d3ed115b944f92843612752fdb823227df7ffd55ec62c093aea1b04d9f2f3af9 WHIRLPOOL 78b87f49c2605b418e4c6294a7323ed4a85f4fa741ab80f3013b934877bae07c969c1a7fde5b422f6a7eb88217bf7c48d43c01f2633e5886aa21925dd669ab3a
+DIST xview_3.2p1.4-28.debian.tar.gz 95902 SHA256 38458016e3cabb2264a0aa0f8fd0e8ddb00dda5659755eb6dc35d2af58243ec0 SHA512 80beaf7a3fad6aa8d410913ab218426b3bd2dda0b9ad3242989973cf3f2cdd9a43238f939f9a6d72ca8859dfa867365513b5ab5f226ba4c4a75a8a3579d90f28 WHIRLPOOL 31b065a9b22d116a5b3e648583d4b6237781ecace7d31d5d701fefe5f180f90f7e549fed3cbe7d72e8794ab5a3278eb5e15cdc01d1e0c9c0374f3eed0e52eae6
+DIST xview_3.2p1.4.orig.tar.gz 3227552 SHA256 fcc88f884a6cb05789ed800edea24d9c4cf1f60cb7d61f3ce7f10de677ef9e8d SHA512 5dd55529aee68d5ca7f2ff4e899b790b59cefb1bcd95706eef9b9e2c5545dc4ca6c866a55ed06ca91914ebde5d6ca4dcd038ce9e2ae97bfe240595b045a69315 WHIRLPOOL 4c1ef22107350659ec4b91beb48c52060f94a82e6ab30641b47afbd42d99d1f46e806b007b90c36fb3079869ba57ef9d41c59ffce0d648cb8ef2088608474a59
diff --git a/x11-libs/xview/files/xview-3.2-impl-dec.patch b/x11-libs/xview/files/xview-3.2-impl-dec.patch
new file mode 100644
index 000000000..0296a9aeb
--- /dev/null
+++ b/x11-libs/xview/files/xview-3.2-impl-dec.patch
@@ -0,0 +1,30 @@
+ lib/libxview/misc/hashfn.c |    1 +
+ lib/libxview/win/win_env.c |    3 +++
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/lib/libxview/misc/hashfn.c b/lib/libxview/misc/hashfn.c
+index f127e2b..a7b27b9 100644
+--- a/lib/libxview/misc/hashfn.c
++++ b/lib/libxview/misc/hashfn.c
+@@ -17,6 +17,7 @@ static char     sccsid[] = "@(#)hashfn.c 20.12 93/06/28";
+ #define hashfn_c
+ 
+ #include <xview_private/hashfn.h>
++#include <stdlib.h>
+ 
+ /*
+  * hashfn_new_table(size, hash_fn, cmp_fn) -- create a new hash table object
+diff --git a/lib/libxview/win/win_env.c b/lib/libxview/win/win_env.c
+index d8e7fcc..72f1def 100644
+--- a/lib/libxview/win/win_env.c
++++ b/lib/libxview/win/win_env.c
+@@ -18,6 +18,9 @@ static char     sccsid[] = "@(#)win_env.c 20.16 93/06/28";
+ #include <xview/rect.h>
+ #include <xview/win_env.h>
+ #include <xview/win_struct.h>
++#include <stdlib.h>
++#include <string.h>
++#include <stdio.h>
+ 
+ /*
+  * Public routines
diff --git a/x11-libs/xview/metadata.xml b/x11-libs/xview/metadata.xml
index 59d99c304..04b998aab 100644
--- a/x11-libs/xview/metadata.xml
+++ b/x11-libs/xview/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
-    <name>Justin Lecher</name>
-  </maintainer>
+	<herd>sci</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+		<name>Justin Lecher</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/xview/xview-3.2-r6.ebuild b/x11-libs/xview/xview-3.2-r6.ebuild
index 0d3849589..5da5aad1d 100644
--- a/x11-libs/xview/xview-3.2-r6.ebuild
+++ b/x11-libs/xview/xview-3.2-r6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/x11-libs/xview/Attic/xview-3.2-r6.ebuild,v 1.6 2008/12/21 09:03:33 ssuominen dead $
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs multilib
 
 MY_PN="${P}p1.4-19c"
 GCC_PATCHVER="0.1"
diff --git a/x11-libs/xview/xview-3.2-r7.ebuild b/x11-libs/xview/xview-3.2-r7.ebuild
new file mode 100644
index 000000000..a69274f9c
--- /dev/null
+++ b/x11-libs/xview/xview-3.2-r7.ebuild
@@ -0,0 +1,108 @@
+## Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/x11-libs/xview/Attic/xview-3.2-r6.ebuild,v 1.6 2008/12/21 09:03:33 ssuominen dead $
+
+EAPI=4
+
+inherit eutils toolchain-funcs flag-o-matic multilib
+
+MY_PN="${P}p1.4"
+
+DESCRIPTION="The X Window-System-based Visual/Integrated Environment for Workstations"
+HOMEPAGE="http://physionet.caregroup.harvard.edu/physiotools/xview/"
+# We usr the debian tarball so that the debian patches apply
+SRC_URI="
+	mirror://debian/pool/main/x/xview/xview_3.2p1.4.orig.tar.gz
+	mirror://debian/pool/main/x/xview/xview_3.2p1.4-28.debian.tar.gz"
+
+LICENSE="XVIEW"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux -*"
+IUSE="static-libs"
+
+RDEPEND="
+	media-fonts/font-bh-75dpi
+	media-fonts/font-sun-misc
+	x11-libs/libXpm
+	x11-misc/xbitmaps
+	x11-proto/xextproto"
+
+DEPEND="${RDEPEND}
+	app-text/rman
+	x11-misc/gccmakedep
+	x11-misc/imake"
+
+S=${WORKDIR}/${MY_PN}
+
+src_prepare() {
+	append-flags -m32
+	append-ldflags -m32
+
+	EPATCH_OPTS="-p1"
+
+	epatch \
+		"${FILESDIR}"/${P}-impl-dec.patch \
+		"${WORKDIR}"/debian/patches/{debian-changes-3.2p1.4-26,display_setting}
+
+	# Do not build xgettext and msgfmt since they are provided by the gettext
+	# package. Using the programs provided by xview breaks many packages
+	# including vim, grep and binutils.
+	sed \
+		-e 's/MSG_UTIL = xgettext msgfmt/#MSG_UTIL = xgettext msgfmt/' \
+		-i util/Imakefile || die "gettext sed failed"
+
+	# (#120910) Look for imake in the right place
+	sed -i -e 's:\/X11::' imake || die "imake sed failed"
+
+	sed -i -e 's:/usr/X11R6:/usr:' config/XView.cf Build-LinuxXView.bash || die
+
+	# Nasty hacks to force CC and CFLAGS
+	sed \
+		-e "s:^\(IMAKEINCLUDE=.*\)\"$:\1 -DCcCmd=$(tc-getCC)\":" \
+		-e "s:usr/lib/X11/config:usr/$(get_libdir)/X11/config:" -i Build-LinuxXView.bash || die
+	sed -e "s:\(.*STD_DEFINES =.*\)$:\1 -D_GNU_SOURCE ${CFLAGS}:" -i config/XView.obj || die
+	sed -e "s:\(.*define LibXViewDefines .*\)$:\1 -D_GNU_SOURCE ${CFLAGS}:" -i config/XView.cf || die
+	sed -e "s:^\(MORECCFLAGS.*\)$:\1 -D_GNU_SOURCE ${CFLAGS}:" -i clients/olvwm-4.1/Imakefile
+	sed -e "s:\(-Wl,-soname\):${LDFLAGS} \1:g" -i config/XView.rules || die
+}
+
+src_compile() {
+	export OPENWINHOME="/usr"
+	export X11DIR="/usr"
+	export MANDIR="/usr/share/man"
+
+	# This is crazy and I know it, but wait till you read the code in
+	# Build-LinuxXView.bash.
+	bash Build-LinuxXView.bash libs \
+		|| die "building libs failed"
+#	bash Build-LinuxXView.bash clients \
+#		|| die "building clients failed"
+#	bash Build-LinuxXView.bash contrib \
+#		|| die "building contrib failed"
+#	bash Build-LinuxXView.bash olvwm \
+#		|| die "building olvwm failed"
+}
+
+src_install() {
+	export OPENWINHOME="/usr"
+	export X11DIR="/usr"
+	export MANDIR="/usr/share/man"
+	export DESTDIR="${ED}"
+
+	bash Build-LinuxXView.bash instlibs \
+		|| die "installing libs failed"
+#	bash Build-LinuxXView.bash instclients \
+#		|| die "installing clients failed"
+#	bash Build-LinuxXView.bash instcontrib \
+#		|| die "installing contrib failed"
+#	bash Build-LinuxXView.bash instolvwm \
+#		|| die "installing olvwm failed"
+#	cd "${ED}"/usr
+
+	use static-libs || \
+		find "${ED}" -type f -name "*.a" -delete
+
+	cd "${S}"/doc
+	dodoc README xview-info olgx_api.txt olgx_api.ps sel_api.txt dnd_api.txt whats_new.ps
+	rm -rf "${ED}"/usr/X11R6/share/doc/xview "${ED}"/usr/X11R6/share/doc "${ED}"/usr/bin || die
+}