initial check-in

72 files changed, 4002 insertions, 0 deletions

diff --git a/app-misc/fslint/Manifest b/app-misc/fslint/Manifest
new file mode 100644
index 0000000..cfe430d
--- /dev/null
+++ b/app-misc/fslint/Manifest
@@ -0,0 +1,2 @@
+DIST fslint-2.42.tar.gz 111520 RMD160 23e825cd7d798b750c4fe435b731c6e77f15badb SHA1 607a1a8cc391537151660e1129a4c95908509b80 SHA256 babbef4a34f42ab1d396152fd79b4353adc114b2e8d68b838e20a8067c5a3273
+EBUILD fslint-2.42.ebuild 2702 RMD160 ae28a3051d0374d9764dac374fd8ff1d5fa173ce SHA1 f8d3e2bd40ef7b5d0f0bde07789212bf0d56bd28 SHA256 4dc58d6ef5c8586332c81b3abc8f119d82ae7a460cee4f72478a2a39f51a9907
diff --git a/app-misc/fslint/fslint-2.42.ebuild b/app-misc/fslint/fslint-2.42.ebuild
new file mode 100644
index 0000000..079f1dc
--- /dev/null
+++ b/app-misc/fslint/fslint-2.42.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+# original ebuild by bearingspacer@free.fr
+# updated  ebuild by mobidyc@msn.com
+# updated  ebuild by davide.bettio@kdemail.net
+
+DESCRIPTION="A utility to find and clean various forms of lint on a filesystem."
+HOMEPAGE="http://www.pixelbeat.org/fslint/"
+SRC_URI="http://www.pixelbeat.org/fslint/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* x86 amd64"
+IUSE=""
+
+DEPEND=">=x11-libs/gtk+-2.4
+		>=dev-lang/python-2.3
+		gnome-base/libglade
+		>=dev-python/pygtk-2.4"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	if [ "${A}" != "" ]; then
+		unpack ${A}
+	fi
+}
+
+src_install() {
+	echo ${S}
+	pwd
+
+# GUI executable
+	dodir /usr/bin
+	exeinto /usr/bin
+	doexe fslint-gui
+
+# GUI file
+	dodir /usr/share/fslint
+	insinto /usr/share/fslint
+	doins fslint.glade
+
+# other executables
+	dodir /usr/share/fslint/fslint
+	exeinto /usr/share/fslint/fslint
+	doexe fslint/find* fslint/zipdir fslint/fslint
+
+	dodir /usr/share/fslint/fslint/fstool
+	exeinto /usr/share/fslint/fslint/fstool
+	doexe fslint/fstool/*
+
+	dodir /usr/share/fslint/fslint/supprt
+	exeinto /usr/share/fslint/fslint/supprt
+	doexe fslint/supprt/get* fslint/supprt/fslver fslint/supprt/md5sum_approx
+
+	dodir /usr/share/fslint/fslint/supprt/rmlint
+	exeinto /usr/share/fslint/fslint/supprt/rmlint
+	doexe fslint/supprt/rmlint/*
+
+# icon
+	dodir /usr/share/pixmaps
+	insinto /usr/share/pixmaps
+	doins fslint_icon.png
+
+# shortcut
+	dodir /etc/X11/applnk/System
+	insinto /etc/X11/applnk/System
+	doins fslint.desktop
+
+# locales
+	cd po
+	emake DESTDIR=${D}/usr DATADIR=share install
+	cd ..
+
+# docs
+	cd doc
+	dodoc FAQ NEWS README TODO
+	cd ..
+
+	cd man
+	doman fslint-gui.1 fslint.1
+	cd ..
+
+# create python init file
+# Other option here is to instead edit fslint-gui itself so that:
+#   ^liblocation = '/usr/share/fslint/'
+#   ^locale_base = None
+	python_site=`python -c "import sys ; \
+		print '%s/lib/python%s/site-packages' % (sys.exec_prefix,sys.version[:3])"`
+	dodir $python_site/fslint
+	echo "liblocation = '/usr/share/fslint/'" > ${D}/$python_site/fslint/__init__.py
+
+# link to icon in main fslint dir
+	dosym /usr/share/pixmaps/fslint_icon.png /usr/share/fslint/fslint_icon.png
+}
+
+pkg_postinst() {
+	einfo "Note the fslint tools do a lot of inode access and to speed them"
+	einfo "up you can use the following method to not update access times"
+	einfo "on disk while gathering inode information:"
+	einfo "mount -o remount,noatime mountpoint"
+	einfo "fslint or fslint-gui"
+	einfo "mount -o remount,atime mountpoint"
+	einfo ""
+	einfo "Command Line Executables are installed in:"
+	einfo "/usr/share/fslint/fslint"
+	einfo "you may want to add them in your PATH."
+}
diff --git a/app-misc/mendeleydesktop/Manifest b/app-misc/mendeleydesktop/Manifest
new file mode 100644
index 0000000..b386805
--- /dev/null
+++ b/app-misc/mendeleydesktop/Manifest
@@ -0,0 +1,18 @@
+DIST mendeleydesktop-0.9.6.3-linux-x86_64.tar.bz2 23168726 RMD160 ef52fa071285072930a933ca48798c1db2df89f9 SHA1 90b730e72176402fe2e2dae32ee8f87d896c8a1a SHA256 c6a89e11dbd5348b96fa9eac4dd4276388326c7160e9959dd2b19d9128a56018
+DIST mendeleydesktop-0.9.7.1-linux-x86_64.tar.bz2 31653285 RMD160 57aedc7490b9024b5f6897d70c413303426da13c SHA1 e8f8781a58d47baf3464e0278aef57b0c73e5b83 SHA256 5b6935a34225bac6c92ebc1535106934f41d2c4112c0669b68cf3d0d2bbc209d
+DIST mendeleydesktop-0.9.8.1-linux-x86_64.tar.bz2 32615789 RMD160 ec255ca75326aa5b168228a6c443cb51bcefe8ae SHA1 947b517be6560560e8a71677a8602e0a8e102e8d SHA256 2ef4cb5f6d8b2c63955ad480d6b85aa451faa1fdd4f5042b30fa5695fab6ef13
+DIST mendeleydesktop-0.9.8.2-linux-x86_64.tar.bz2 32862729 RMD160 78f69187a0f86215b4e2a34472341e1bffcf7a44 SHA1 7e599321609aa5276e969caf4b6648d7c7f4b0a2 SHA256 d6672eb4fe339b52a939afa7dea451a61300109b028d37d4b1109ac0a50703e2
+DIST mendeleydesktop-0.9.9-linux-x86_64.tar.bz2 33319773 RMD160 5f612ec0227c9364a8c8f38d94ab36c49cc502b1 SHA1 2fe90c714137d93c78eb59ee8ed12e38d8a541a7 SHA256 f50edef24d595b318fc4681c27d6672881a2720c5dc5ef8ef379f0af2a3d8d27
+DIST mendeleydesktop-0.9.9.2-linux-x86_64.tar.bz2 33345234 RMD160 426c42bdefee97b047aa7e6390019e54386e0606 SHA1 3a4717616841b9395531e789d4d7891866f6fe68 SHA256 77c2c7b851f0c99816555c86d7b94072ab049903e147fb0c0f5bbec9129df697
+DIST mendeleydesktop-1.0-linux-x86_64.tar.bz2 33484854 RMD160 fd812e5b980d826f460fdbf0dc3d66aab42d295f SHA1 b45209d92f3dde6b8342b807b0552653170e2b32 SHA256 04bbacffeabf5341c669a0eb1c25e0d634019738f63cbe94179ed6ed8768db6c
+DIST mendeleydesktop-1.0.1-linux-x86_64.tar.bz2 33484854 RMD160 fd812e5b980d826f460fdbf0dc3d66aab42d295f SHA1 b45209d92f3dde6b8342b807b0552653170e2b32 SHA256 04bbacffeabf5341c669a0eb1c25e0d634019738f63cbe94179ed6ed8768db6c
+EBUILD mendeleydesktop-0.9.6.3.ebuild 2223 RMD160 d1bb1345166209f969c1351ac30907e6abfc38e5 SHA1 6b0392d50bfea8bc0bdfcb76d9dea9cb6340b749 SHA256 b0724e502527fdb5ac8ad777c6f219e2008ea8158349eda37e7bc0eed2d9237c
+EBUILD mendeleydesktop-0.9.7.1.ebuild 1593 RMD160 02458506d5cd5947f43654eb6be23e84c91c21f7 SHA1 975b5f90197c5680c949a7299a6a2f25b2321a47 SHA256 13d7d7d150c5ea615afb55ac68c4a65ded97d1a6783ec16b0fb234ab6045e6e5
+EBUILD mendeleydesktop-0.9.8.1.ebuild 1593 RMD160 02458506d5cd5947f43654eb6be23e84c91c21f7 SHA1 975b5f90197c5680c949a7299a6a2f25b2321a47 SHA256 13d7d7d150c5ea615afb55ac68c4a65ded97d1a6783ec16b0fb234ab6045e6e5
+EBUILD mendeleydesktop-0.9.8.2.ebuild 1749 RMD160 6c9fd293bbd2f065d7a826bd31915642031b5b5a SHA1 c1750d601045dd847f62b9a671006ffdbe39731e SHA256 f73622d1274af2830e1dbcb599a843e060ec8676255746bf50a19763ecaae6bd
+EBUILD mendeleydesktop-0.9.9.2.ebuild 1742 RMD160 4711940050a239edaca165112232813b881cae63 SHA1 342958bb5be92c8c3dd2332e55eaaa1eb74eb021 SHA256 923362184100e359418eec5a4dc5332c3061a4cfadc8ae1a78342dc40313b06c
+EBUILD mendeleydesktop-0.9.9.ebuild 1742 RMD160 4711940050a239edaca165112232813b881cae63 SHA1 342958bb5be92c8c3dd2332e55eaaa1eb74eb021 SHA256 923362184100e359418eec5a4dc5332c3061a4cfadc8ae1a78342dc40313b06c
+EBUILD mendeleydesktop-1.0.1.ebuild 1747 RMD160 e34c3d4109c9a247dbf39625376aecff292c6e48 SHA1 c72456d035aee08fbac5ea2f294574abd5cd5d8b SHA256 72a361a126d876162ddd497b220c5c6c0aa948be5df47753b4bce8e386eeb9b3
+EBUILD mendeleydesktop-1.0.ebuild 1742 RMD160 4711940050a239edaca165112232813b881cae63 SHA1 342958bb5be92c8c3dd2332e55eaaa1eb74eb021 SHA256 923362184100e359418eec5a4dc5332c3061a4cfadc8ae1a78342dc40313b06c
+MISC mendeleydesktop-0.9.9.ebuild~ 1702 RMD160 f1bc60d1185f0007c1f433fd95732890f212d701 SHA1 1e928e2943354b8b569de23ba70a0b36a9ccb06a SHA256 31ce569213e6b3117cb59c35972a093db44a6446a152353adda466304da2d79b
+MISC mendeleydesktop-1.0.1.ebuild~ 1742 RMD160 4711940050a239edaca165112232813b881cae63 SHA1 342958bb5be92c8c3dd2332e55eaaa1eb74eb021 SHA256 923362184100e359418eec5a4dc5332c3061a4cfadc8ae1a78342dc40313b06c
diff --git a/app-misc/mendeleydesktop/mendeleydesktop-0.9.6.3.ebuild b/app-misc/mendeleydesktop/mendeleydesktop-0.9.6.3.ebuild
new file mode 100644
index 0000000..68c4804
--- /dev/null
+++ b/app-misc/mendeleydesktop/mendeleydesktop-0.9.6.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:  $
+
+EAPI=2
+
+inherit eutils
+
+if [ "${ARCH}" = "amd64" ] ; then
+        LNXARCH="linux-x86_64"
+else
+        LNXARCH="linux-i486"
+fi
+
+DESCRIPTION="A free research management tool for desktop & web"
+HOMEPAGE="http://www.mendeley.com/"
+SRC_URI="http://www.mendeley.com/downloads/linux/${P}-${LNXARCH}.tar.bz2"
+
+LICENSE="Mendelay-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror strip"
+RDEPEND="media-libs/libpng:1.2"
+
+S="${WORKDIR}/${P}-${LNXARCH}"
+
+MENDELEY_INSTALL_DIR="/opt/${PN}"
+
+src_install() {
+	# install menu
+	domenu ${S}/share/applications/${PN}.desktop || die "Installing desktop files failed."
+	# Install commonly used icon sizes
+	for res in 16x16 22x22 32x32 48x48 64x64 128x128 ; do
+		insinto /usr/share/icons/hicolor/${res}/apps
+		doins share/icons/hicolor/${res}/apps/${PN}.png || die "Installing icons failed."
+	done
+	insinto /usr/share/pixmaps
+	doins share/icons/hicolor/48x48/apps/${PN}.png || die "Installing pixmap failed."
+
+
+	# dodoc
+	dodoc ${S}/share/doc/${PN}/* || die "Installing docs failed."
+
+	dodir ${MENDELEY_INSTALL_DIR}
+	dodir ${MENDELEY_INSTALL_DIR}/lib
+	dodir ${MENDELEY_INSTALL_DIR}/share
+	#mv ${S}/share/icons ${D}/usr/share
+	mv ${S}/bin ${D}${MENDELEY_INSTALL_DIR} || die "Installing bin failed."
+	mv ${S}/lib ${D}${MENDELEY_INSTALL_DIR} || die "Installing libs failed."
+	mv ${S}/share/${PN} ${D}${MENDELEY_INSTALL_DIR}/share || die "Installing shared files failed."
+
+	dosym /opt/${PN}/bin/${PN} /opt/bin/${PN} || die "Installing launcher symlinks failed."
+
+}
+
+pkg_postinst() {
+
+	einfo "If you have an error message \"Cannot mix incompatible Qt libraries\","
+	einfo "when you run mendeleydesktop, follow the instructions below:"
+	echo
+	einfo "- To disable the default widget style, run Mendeley with the "
+	einfo "'-style cleanlooks' argument (where 'cleanlooks' can also be substituted"
+    einfo "with 'gtk' or 'plastique' amongst others)."
+	echo
+	einfo "- To disable the 'platform integration' plugin (new feature in Qt >= 4.6),"
+	einfo "set the QT_PLATFORM_PLUGIN environment variable to some nonsense value "
+	einfo "(eg. \"ignoreme\") before running Mendeley."
+}
diff --git a/app-misc/mendeleydesktop/mendeleydesktop-0.9.7.1.ebuild b/app-misc/mendeleydesktop/mendeleydesktop-0.9.7.1.ebuild
new file mode 100644
index 0000000..286ebb8
--- /dev/null
+++ b/app-misc/mendeleydesktop/mendeleydesktop-0.9.7.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:  $
+
+EAPI=2
+
+inherit eutils
+
+if [ "${ARCH}" = "amd64" ] ; then
+        LNXARCH="linux-x86_64"
+else
+        LNXARCH="linux-i486"
+fi
+
+DESCRIPTION="A free research management tool for desktop & web"
+HOMEPAGE="http://www.mendeley.com/"
+SRC_URI="http://www.mendeley.com/downloads/linux/${P}-${LNXARCH}.tar.bz2"
+
+LICENSE="Mendelay-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror strip"
+RDEPEND=""
+
+S="${WORKDIR}/${P}-${LNXARCH}"
+
+MENDELEY_INSTALL_DIR="/opt/${PN}"
+
+src_install() {
+	# install menu
+	domenu ${S}/share/applications/${PN}.desktop || die "Installing desktop files failed."
+	# Install commonly used icon sizes
+	for res in 16x16 22x22 32x32 48x48 64x64 128x128 ; do
+		insinto /usr/share/icons/hicolor/${res}/apps
+		doins share/icons/hicolor/${res}/apps/${PN}.png || die "Installing icons failed."
+	done
+	insinto /usr/share/pixmaps
+	doins share/icons/hicolor/48x48/apps/${PN}.png || die "Installing pixmap failed."
+
+
+	# dodoc
+	dodoc ${S}/share/doc/${PN}/* || die "Installing docs failed."
+
+	dodir ${MENDELEY_INSTALL_DIR}
+	dodir ${MENDELEY_INSTALL_DIR}/lib
+	dodir ${MENDELEY_INSTALL_DIR}/share
+	#mv ${S}/share/icons ${D}/usr/share
+	mv ${S}/bin ${D}${MENDELEY_INSTALL_DIR} || die "Installing bin failed."
+	mv ${S}/lib ${D}${MENDELEY_INSTALL_DIR} || die "Installing libs failed."
+	mv ${S}/share/${PN} ${D}${MENDELEY_INSTALL_DIR}/share || die "Installing shared files failed."
+
+	dosym /opt/${PN}/bin/${PN} /opt/bin/${PN} || die "Installing launcher symlinks failed."
+
+}
diff --git a/app-misc/mendeleydesktop/mendeleydesktop-0.9.8.1.ebuild b/app-misc/mendeleydesktop/mendeleydesktop-0.9.8.1.ebuild
new file mode 100644
index 0000000..286ebb8
--- /dev/null
+++ b/app-misc/mendeleydesktop/mendeleydesktop-0.9.8.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:  $
+
+EAPI=2
+
+inherit eutils
+
+if [ "${ARCH}" = "amd64" ] ; then
+        LNXARCH="linux-x86_64"
+else
+        LNXARCH="linux-i486"
+fi
+
+DESCRIPTION="A free research management tool for desktop & web"
+HOMEPAGE="http://www.mendeley.com/"
+SRC_URI="http://www.mendeley.com/downloads/linux/${P}-${LNXARCH}.tar.bz2"
+
+LICENSE="Mendelay-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror strip"
+RDEPEND=""
+
+S="${WORKDIR}/${P}-${LNXARCH}"
+
+MENDELEY_INSTALL_DIR="/opt/${PN}"
+
+src_install() {
+	# install menu
+	domenu ${S}/share/applications/${PN}.desktop || die "Installing desktop files failed."
+	# Install commonly used icon sizes
+	for res in 16x16 22x22 32x32 48x48 64x64 128x128 ; do
+		insinto /usr/share/icons/hicolor/${res}/apps
+		doins share/icons/hicolor/${res}/apps/${PN}.png || die "Installing icons failed."
+	done
+	insinto /usr/share/pixmaps
+	doins share/icons/hicolor/48x48/apps/${PN}.png || die "Installing pixmap failed."
+
+
+	# dodoc
+	dodoc ${S}/share/doc/${PN}/* || die "Installing docs failed."
+
+	dodir ${MENDELEY_INSTALL_DIR}
+	dodir ${MENDELEY_INSTALL_DIR}/lib
+	dodir ${MENDELEY_INSTALL_DIR}/share
+	#mv ${S}/share/icons ${D}/usr/share
+	mv ${S}/bin ${D}${MENDELEY_INSTALL_DIR} || die "Installing bin failed."
+	mv ${S}/lib ${D}${MENDELEY_INSTALL_DIR} || die "Installing libs failed."
+	mv ${S}/share/${PN} ${D}${MENDELEY_INSTALL_DIR}/share || die "Installing shared files failed."
+
+	dosym /opt/${PN}/bin/${PN} /opt/bin/${PN} || die "Installing launcher symlinks failed."
+
+}
diff --git a/app-misc/mendeleydesktop/mendeleydesktop-0.9.8.2.ebuild b/app-misc/mendeleydesktop/mendeleydesktop-0.9.8.2.ebuild
new file mode 100644
index 0000000..45670aa
--- /dev/null
+++ b/app-misc/mendeleydesktop/mendeleydesktop-0.9.8.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:  $
+
+EAPI=2
+
+inherit eutils
+
+if [ "${ARCH}" = "amd64" ] ; then
+        LNXARCH="linux-x86_64"
+else
+        LNXARCH="linux-i486"
+fi
+
+DESCRIPTION="A free research management tool for desktop & web"
+HOMEPAGE="http://www.mendeley.com/"
+SRC_URI="${HOMEPAGE}/downloads/linux/${P}-${LNXARCH}.tar.bz2"
+
+LICENSE="Mendelay-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+RDEPEND="dev-libs/openssl:0.9.8
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libpng:1.2"
+
+S="${WORKDIR}/${P}-${LNXARCH}"
+
+MENDELEY_INSTALL_DIR="/opt/${PN}"
+
+src_install() {
+	# install menu
+	domenu "share/applications/${PN}.desktop"
+	# Install commonly used icon sizes
+	for res in 16x16 22x22 32x32 48x48 64x64 128x128 ; do
+		insinto "/usr/share/icons/hicolor/${res}/apps"
+		doins "share/icons/hicolor/${res}/apps/${PN}.png" || \
+		die "Installing icons failed."
+	done
+	insinto "/usr/share/pixmaps"
+	doins "share/icons/hicolor/48x48/apps/${PN}.png" || \
+	die "Installing pixmap failed."
+
+	# dodoc
+	dodoc "share/doc/${PN}/"* || die "Installing docs failed."
+
+	# create directories for installation
+	dodir ${MENDELEY_INSTALL_DIR} || die "dodir failed"
+	dodir "${MENDELEY_INSTALL_DIR}/lib" || die "dodir failed"
+	dodir "${MENDELEY_INSTALL_DIR}/share" || die "dodir failed"
+
+	# install binaries
+	mv "bin" "${D}${MENDELEY_INSTALL_DIR}" || die "Installing bin failed."
+	mv "lib" "${D}${MENDELEY_INSTALL_DIR}" || die "Installing libs failed."
+	mv "share/${PN}" "${D}${MENDELEY_INSTALL_DIR}/share" || \
+	die "Installing shared files failed."
+	dosym "${MENDELEY_INSTALL_DIR}/bin/${PN}" "/opt/bin/${PN}" || \
+	die "Installing launcher symlinks failed."
+}
diff --git a/app-misc/mendeleydesktop/mendeleydesktop-0.9.9.2.ebuild b/app-misc/mendeleydesktop/mendeleydesktop-0.9.9.2.ebuild
new file mode 100644
index 0000000..027add8
--- /dev/null
+++ b/app-misc/mendeleydesktop/mendeleydesktop-0.9.9.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit eutils
+
+if [ "${ARCH}" = "amd64" ] ; then
+	LNXARCH="linux-x86_64"
+else
+	LNXARCH="linux-i486"
+fi
+
+DESCRIPTION="A free research management tool for desktop & web"
+HOMEPAGE="http://www.mendeley.com/"
+SRC_URI="${HOMEPAGE}/downloads/linux/${P}-${LNXARCH}.tar.bz2"
+
+LICENSE="Mendelay-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip"
+RDEPEND="dev-libs/openssl:0.9.8
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libpng:1.2"
+
+S="${WORKDIR}/${P}-${LNXARCH}"
+
+MENDELEY_INSTALL_DIR="/opt/${PN}"
+
+src_install() {
+	# install menu
+	domenu "share/applications/${PN}.desktop"
+	# Install commonly used icon sizes
+	for res in 16x16 22x22 32x32 48x48 64x64 128x128 ; do
+		insinto "/usr/share/icons/hicolor/${res}/apps"
+		doins "share/icons/hicolor/${res}/apps/${PN}.png" || \
+		die "Installing icons failed."
+	done
+	insinto "/usr/share/pixmaps"
+	doins "share/icons/hicolor/48x48/apps/${PN}.png" || \
+	die "Installing pixmap failed."
+
+	# dodoc
+	dodoc "share/doc/${PN}/"* || die "Installing docs failed."
+
+	# create directories for installation
+	dodir ${MENDELEY_INSTALL_DIR} || die "dodir failed"
+	dodir "${MENDELEY_INSTALL_DIR}/lib" || die "dodir failed"
+	dodir "${MENDELEY_INSTALL_DIR}/share" || die "dodir failed"
+
+	# install binaries
+	mv "bin" "${D}${MENDELEY_INSTALL_DIR}" || die "Installing bin failed."
+	mv "lib" "${D}${MENDELEY_INSTALL_DIR}" || die "Installing libs failed."
+	mv "share/${PN}" "${D}${MENDELEY_INSTALL_DIR}/share" || \
+	die "Installing shared files failed."
+	dosym "${MENDELEY_INSTALL_DIR}/bin/${PN}" "/opt/bin/${PN}" || \
+	die "Installing launcher symlinks failed."
+}
+ 
diff --git a/app-misc/mendeleydesktop/mendeleydesktop-0.9.9.ebuild b/app-misc/mendeleydesktop/mendeleydesktop-0.9.9.ebuild
new file mode 100644
index 0000000..027add8
--- /dev/null
+++ b/app-misc/mendeleydesktop/mendeleydesktop-0.9.9.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit eutils
+
+if [ "${ARCH}" = "amd64" ] ; then
+	LNXARCH="linux-x86_64"
+else
+	LNXARCH="linux-i486"
+fi
+
+DESCRIPTION="A free research management tool for desktop & web"
+HOMEPAGE="http://www.mendeley.com/"
+SRC_URI="${HOMEPAGE}/downloads/linux/${P}-${LNXARCH}.tar.bz2"
+
+LICENSE="Mendelay-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip"
+RDEPEND="dev-libs/openssl:0.9.8
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libpng:1.2"
+
+S="${WORKDIR}/${P}-${LNXARCH}"
+
+MENDELEY_INSTALL_DIR="/opt/${PN}"
+
+src_install() {
+	# install menu
+	domenu "share/applications/${PN}.desktop"
+	# Install commonly used icon sizes
+	for res in 16x16 22x22 32x32 48x48 64x64 128x128 ; do
+		insinto "/usr/share/icons/hicolor/${res}/apps"
+		doins "share/icons/hicolor/${res}/apps/${PN}.png" || \
+		die "Installing icons failed."
+	done
+	insinto "/usr/share/pixmaps"
+	doins "share/icons/hicolor/48x48/apps/${PN}.png" || \
+	die "Installing pixmap failed."
+
+	# dodoc
+	dodoc "share/doc/${PN}/"* || die "Installing docs failed."
+
+	# create directories for installation
+	dodir ${MENDELEY_INSTALL_DIR} || die "dodir failed"
+	dodir "${MENDELEY_INSTALL_DIR}/lib" || die "dodir failed"
+	dodir "${MENDELEY_INSTALL_DIR}/share" || die "dodir failed"
+
+	# install binaries
+	mv "bin" "${D}${MENDELEY_INSTALL_DIR}" || die "Installing bin failed."
+	mv "lib" "${D}${MENDELEY_INSTALL_DIR}" || die "Installing libs failed."
+	mv "share/${PN}" "${D}${MENDELEY_INSTALL_DIR}/share" || \
+	die "Installing shared files failed."
+	dosym "${MENDELEY_INSTALL_DIR}/bin/${PN}" "/opt/bin/${PN}" || \
+	die "Installing launcher symlinks failed."
+}
+ 
diff --git a/app-misc/mendeleydesktop/mendeleydesktop-1.0.1.ebuild b/app-misc/mendeleydesktop/mendeleydesktop-1.0.1.ebuild
new file mode 100644
index 0000000..64d8ad2
--- /dev/null
+++ b/app-misc/mendeleydesktop/mendeleydesktop-1.0.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit eutils
+
+if [ "${ARCH}" = "amd64" ] ; then
+	LNXARCH="linux-x86_64"
+else
+	LNXARCH="linux-i486"
+fi
+
+DESCRIPTION="A free research management tool for desktop & web"
+HOMEPAGE="http://www.mendeley.com/"
+SRC_URI="${HOMEPAGE}/downloads/linux/${P}-${LNXARCH}.tar.bz2"
+
+LICENSE="Mendelay-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip"
+RDEPEND="dev-libs/openssl:0.9.8
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libpng:1.2"
+
+S="${WORKDIR}/${PN}-1.0-${LNXARCH}"
+
+MENDELEY_INSTALL_DIR="/opt/${PN}"
+
+src_install() {
+	# install menu
+	domenu "share/applications/${PN}.desktop"
+	# Install commonly used icon sizes
+	for res in 16x16 22x22 32x32 48x48 64x64 128x128 ; do
+		insinto "/usr/share/icons/hicolor/${res}/apps"
+		doins "share/icons/hicolor/${res}/apps/${PN}.png" || \
+		die "Installing icons failed."
+	done
+	insinto "/usr/share/pixmaps"
+	doins "share/icons/hicolor/48x48/apps/${PN}.png" || \
+	die "Installing pixmap failed."
+
+	# dodoc
+	dodoc "share/doc/${PN}/"* || die "Installing docs failed."
+
+	# create directories for installation
+	dodir ${MENDELEY_INSTALL_DIR} || die "dodir failed"
+	dodir "${MENDELEY_INSTALL_DIR}/lib" || die "dodir failed"
+	dodir "${MENDELEY_INSTALL_DIR}/share" || die "dodir failed"
+
+	# install binaries
+	mv "bin" "${D}${MENDELEY_INSTALL_DIR}" || die "Installing bin failed."
+	mv "lib" "${D}${MENDELEY_INSTALL_DIR}" || die "Installing libs failed."
+	mv "share/${PN}" "${D}${MENDELEY_INSTALL_DIR}/share" || \
+	die "Installing shared files failed."
+	dosym "${MENDELEY_INSTALL_DIR}/bin/${PN}" "/opt/bin/${PN}" || \
+	die "Installing launcher symlinks failed."
+}
+ 
diff --git a/app-misc/mendeleydesktop/mendeleydesktop-1.0.ebuild b/app-misc/mendeleydesktop/mendeleydesktop-1.0.ebuild
new file mode 100644
index 0000000..027add8
--- /dev/null
+++ b/app-misc/mendeleydesktop/mendeleydesktop-1.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit eutils
+
+if [ "${ARCH}" = "amd64" ] ; then
+	LNXARCH="linux-x86_64"
+else
+	LNXARCH="linux-i486"
+fi
+
+DESCRIPTION="A free research management tool for desktop & web"
+HOMEPAGE="http://www.mendeley.com/"
+SRC_URI="${HOMEPAGE}/downloads/linux/${P}-${LNXARCH}.tar.bz2"
+
+LICENSE="Mendelay-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip"
+RDEPEND="dev-libs/openssl:0.9.8
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libpng:1.2"
+
+S="${WORKDIR}/${P}-${LNXARCH}"
+
+MENDELEY_INSTALL_DIR="/opt/${PN}"
+
+src_install() {
+	# install menu
+	domenu "share/applications/${PN}.desktop"
+	# Install commonly used icon sizes
+	for res in 16x16 22x22 32x32 48x48 64x64 128x128 ; do
+		insinto "/usr/share/icons/hicolor/${res}/apps"
+		doins "share/icons/hicolor/${res}/apps/${PN}.png" || \
+		die "Installing icons failed."
+	done
+	insinto "/usr/share/pixmaps"
+	doins "share/icons/hicolor/48x48/apps/${PN}.png" || \
+	die "Installing pixmap failed."
+
+	# dodoc
+	dodoc "share/doc/${PN}/"* || die "Installing docs failed."
+
+	# create directories for installation
+	dodir ${MENDELEY_INSTALL_DIR} || die "dodir failed"
+	dodir "${MENDELEY_INSTALL_DIR}/lib" || die "dodir failed"
+	dodir "${MENDELEY_INSTALL_DIR}/share" || die "dodir failed"
+
+	# install binaries
+	mv "bin" "${D}${MENDELEY_INSTALL_DIR}" || die "Installing bin failed."
+	mv "lib" "${D}${MENDELEY_INSTALL_DIR}" || die "Installing libs failed."
+	mv "share/${PN}" "${D}${MENDELEY_INSTALL_DIR}/share" || \
+	die "Installing shared files failed."
+	dosym "${MENDELEY_INSTALL_DIR}/bin/${PN}" "/opt/bin/${PN}" || \
+	die "Installing launcher symlinks failed."
+}
+ 
diff --git a/app-office/homebank/ChangeLog b/app-office/homebank/ChangeLog
new file mode 100644
index 0000000..fcf5d48
--- /dev/null
+++ b/app-office/homebank/ChangeLog
@@ -0,0 +1,74 @@
+# ChangeLog for app-office/homebank
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/homebank/ChangeLog,v 1.16 2010/02/17 22:47:09 calchan Exp $
+
+*homebank-4.2.1 (17 Feb 2010)
+
+  17 Feb 2010; <calchan@gentoo.org> +homebank-4.2.1.ebuild:
+  Bugfix bump, thanks to Fabio Correa (bug #304515).
+
+*homebank-4.2 (11 Feb 2010)
+
+  11 Feb 2010; Denis Dupeyron <calchan@gentoo.org> +homebank-4.2.ebuild:
+  Version bump, bug #304515.
+
+  15 Dec 2009; Peter Volkov <pva@gentoo.org> metadata.xml:
+  metadata.xml: added required herd tag.
+
+*homebank-4.1 (04 Nov 2009)
+
+  04 Nov 2009; Denis Dupeyron <calchan@gentoo.org> -homebank-4.0.2.ebuild,
+  -homebank-4.1_beta.ebuild, +homebank-4.1.ebuild:
+  Version bump, thanks to Arseny Solokha (bug #291808).
+
+*homebank-4.1_beta (07 Oct 2009)
+
+  07 Oct 2009; Denis Dupeyron <calchan@gentoo.org>
+  +homebank-4.1_beta.ebuild:
+  Version bump.
+
+*homebank-4.0.3 (27 May 2009)
+
+  27 May 2009; Denis Dupeyron <calchan@gentoo.org> +homebank-4.0.3.ebuild:
+  Version bump.
+
+  18 Apr 2009; Denis Dupeyron <calchan@gentoo.org> ChangeLog:
+  Fixed typo in Changelog.
+
+  18 Apr 2009; Denis Dupeyron <calchan@gentoo.org> -homebank-3.7.ebuild,
+  -homebank-3.8.ebuild, -homebank-4.0.1.ebuild:
+  Removed old ebuilds in order to avoid fixing them.
+
+  18 Apr 2009; Denis Dupeyron <calchan@gentoo.org> homebank-4.0.2:
+  Fixed deps, bug #238971. Fixed econf dies by itself.
+
+*homebank-4.0.2 (18 Apr 2009)
+
+  18 Apr 2009; Denis Dupeyron <calchan@gentoo.org> +homebank-4.0.2.ebuild:
+  Version bump, bug #264973.
+
+  19 Mar 2009; Joseph Jezak <josejx@gentoo.org> homebank-4.0.1.ebuild:
+  Marked ~ppc for bug #260507.
+
+*homebank-4.0.1 (27 Dec 2008)
+
+  27 Dec 2008; Denis Dupeyron <calchan@gentoo.org> +homebank-4.0.1.ebuild:
+  Version bump, thanks to Viaken (bug #250304).
+
+*homebank-3.8 (23 Apr 2008)
+
+  23 Apr 2008; Denis Dupeyron <calchan@gentoo.org> +homebank-3.8.ebuild:
+  Version bump.
+
+  01 Apr 2008; Denis Dupeyron <calchan@gentoo.org> homebank-3.7.ebuild:
+  eautoconf was enough, thanks to Tiziano Müller.
+
+  01 Apr 2008; Denis Dupeyron <calchan@gentoo.org> homebank-3.7.ebuild:
+  Oops, forgot librsvg dependency.
+
+*homebank-3.7 (01 Apr 2008)
+
+  01 Apr 2008; Denis Dupeyron <calchan@gentoo.org> +metadata.xml,
+  +homebank-3.7.ebuild:
+  Initial commit, thanks to everybody on bug #139634.
+
diff --git a/app-office/homebank/Manifest b/app-office/homebank/Manifest
new file mode 100644
index 0000000..0120262
--- /dev/null
+++ b/app-office/homebank/Manifest
@@ -0,0 +1,3 @@
+DIST homebank-4.3.tar.gz 2849525 RMD160 ed3ce83d64ba56ea3a10eb43d8ad1cfd438e4ade SHA1 5c2b22c5ab8d22ca26afdabf1e3c1b378e33692e SHA256 c63a918d9749d81237f5cf67d0c375f207b0c83257c12398943f5a2e98df8be4
+EBUILD homebank-4.3.ebuild 883 RMD160 4d7c39dfafe4cf886b79d57b4f2224ec381d7634 SHA1 7689971e0b3241cdeb105a288e752442b1c119df SHA256 6f426c9cfb8743c69b2cc418e520b5bdcd63464064e7088581c24e03fb889746
+MISC ChangeLog 2364 RMD160 f5a7d4ff9a06486fc892b8d275504b48851f2ee3 SHA1 a2f89f4c9bd3150c0d45a381db3a43591388dcba SHA256 b73b6ef5fb89b10ef51dc9a29ab5580308136142483fd80fcc14a866a50a43e9
diff --git a/app-office/homebank/homebank-4.3.ebuild b/app-office/homebank/homebank-4.3.ebuild
new file mode 100644
index 0000000..3f77e8f
--- /dev/null
+++ b/app-office/homebank/homebank-4.3.ebuild
@@ -0,0 +1,46 @@
+EAPI="2"
+
+inherit fdo-mime
+
+DESCRIPTION="Free, easy, personal accounting for everyone"
+HOMEPAGE="http://homebank.free.fr/index.php"
+SRC_URI="http://homebank.free.fr/public/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ofx"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=x11-libs/gtk+-2.14
+	>=dev-libs/glib-2.17
+	sys-libs/zlib
+	ofx? ( >=dev-libs/libofx-0.7 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.40.5"
+RDEPEND="${RDEPEND}
+	gnome-base/librsvg"
+
+S="${WORKDIR}/${P/_/}"
+
+src_prepare() {
+	sed -i -e 's/true/TRUE/' src/import.c || die "sed failed"
+}
+
+src_configure() {
+	econf $(use_with ofx)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Installation failed"
+	dodoc AUTHORS ChangeLog README
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-office/pybliographer/Manifest b/app-office/pybliographer/Manifest
new file mode 100644
index 0000000..68a34dc
--- /dev/null
+++ b/app-office/pybliographer/Manifest
@@ -0,0 +1,2 @@
+DIST pybliographer-1.2.14.tar.gz 955153 RMD160 796c70e625319d3ab2f506599440fef4a560bb98 SHA1 24a464b2aed6bb223618b2e32e196af4e400881f SHA256 1b1bf6e15fd197100394f232640689187859513e1c1c44a2b0e3af4061ddf245
+EBUILD pybliographer-1.2.14.ebuild 1792 RMD160 b9f0128acec4c358b9c006b35c8dd76bf6a93413 SHA1 1bd5f02af28fd66bf29d4ffbc5a6aa028224ee49 SHA256 202d97360699becd1141e33b4abccc2226ce93813b91ae6d27a46d6b5aab5eb8
diff --git a/app-office/pybliographer/pybliographer-1.2.14.ebuild b/app-office/pybliographer/pybliographer-1.2.14.ebuild
new file mode 100644
index 0000000..1024d3c
--- /dev/null
+++ b/app-office/pybliographer/pybliographer-1.2.14.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/pybliographer/pybliographer-1.2.12-r1.ebuild,v 1.4 2011/01/27 15:11:22 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
+
+inherit autotools gnome2 python
+
+DESCRIPTION="Pybliographer is a tool for working with bibliographic databases"
+HOMEPAGE="http://pybliographer.org/"
+SRC_URI="mirror://sourceforge/pybliographer/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
+
+DOCS="AUTHORS ChangeLog* NEWS TODO README"
+
+DEPEND=">=app-text/recode-3.6-r1
+	app-text/scrollkeeper
+	dev-libs/glib:2
+	dev-python/gconf-python:2
+	dev-python/gnome-vfs-python:2
+	dev-python/libgnome-python:2
+	dev-python/pygobject:2
+	dev-python/pygtk:2
+	>=dev-python/python-bibtex-1.2.4"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Disable byte-compilation of Python modules.
+	sed -e "/import compileall/d" -i Makefile.am || die "sed failed"
+
+	# Install Python modules into site-packages directories.
+	find -name Makefile.am | xargs sed -e "/^pybdir[[:space:]]*=[[:space:]]*/s:\$(datadir):$(python_get_sitedir):" -i || die "sed failed"
+	sed "s:\${datadir}/@PACKAGE@:$(python_get_sitedir)/@PACKAGE@:" -i etc/installer.in || die "sed failed"
+	sed -e "s:gladedir = \$(datadir):gladedir = $(python_get_sitedir):" -i Pyblio/GnomeUI/glade/Makefile.am || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	gnome2_src_configure --disable-depchecks
+}
+
+src_install() {
+	gnome2_src_install
+
+	python_convert_shebangs -r 2 "${ED}usr/bin"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	python_mod_optimize pybliographer
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup pybliographer
+}
diff --git a/dev-perl/Gtk2-ImageView/Gtk2-ImageView-0.05.ebuild b/dev-perl/Gtk2-ImageView/Gtk2-ImageView-0.05.ebuild
new file mode 100644
index 0000000..bb1fc91
--- /dev/null
+++ b/dev-perl/Gtk2-ImageView/Gtk2-ImageView-0.05.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+MODULE_AUTHOR=RATCLIFFE
+inherit perl-module
+
+DESCRIPTION="Perl binding for the GtkImageView image viewer widget."
+
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="test"
+
+SRC_TEST="do"
+
+COMMON="dev-lang/perl
+	>=media-gfx/gtkimageview-1.6.3"
+RDEPEND="${COMMON}"
+DEPEND="dev-perl/glib-perl
+	dev-perl/gtk2-perl
+	${COMMON}"
diff --git a/dev-perl/Gtk2-ImageView/Manifest b/dev-perl/Gtk2-ImageView/Manifest
new file mode 100644
index 0000000..f3f3708
--- /dev/null
+++ b/dev-perl/Gtk2-ImageView/Manifest
@@ -0,0 +1,2 @@
+DIST Gtk2-ImageView-0.05.tar.gz 43632 RMD160 5175398acfc3d8b2bd9995a5dc8fff102bf4aa52 SHA1 cc8506e717cd4f30483ff5e78ca9ef634deac7b7 SHA256 087186c3693acf196451cf59cc8b7f5cf9a7b05abe20d32dcbcba0822953fb80
+EBUILD Gtk2-ImageView-0.05.ebuild 430 RMD160 0aad40330adaa8952238b6062af2c7eed446f7f6 SHA1 d6a81e5eca4494cd2e42d60ad7ac5d3bb3594b0a SHA256 77fe14e2146848a6ecc6e164d505af1bd0db62b2ef24801506eb309ea61333f0
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
new file mode 100644
index 0000000..cd2a6c4
--- /dev/null
+++ b/dev-python/numpy/Manifest
@@ -0,0 +1,13 @@
+AUX numpy-1.1.0-f2py.patch 1123 RMD160 ff90313cbe8282ac37b0cb98effa0ff6a03760c2 SHA1 5c37ea9be68782e533c7c2d64ca00e8e8ae648ea SHA256 cc67bc8ab7dba2febb91ba15cc51933021743a286c980e0068afd6fabdd065e7
+AUX numpy-1.3.0-alpha.patch 1210 RMD160 d92ca3fa7d671da1ff8e3e2e1a6b64469cf7142b SHA1 0a8740710d7b2e40b1a8899771b641999440558b SHA256 ea0da717e694338a1bca72f1b635309be15af2cdee206b50de4b38ce95701c64
+AUX numpy-1.3.0-arm-sh.patch 2166 RMD160 cc60f574ab7fe29968ebc56f9018c2427f01f6cc SHA1 59b4751c26abf837a69d8bd637bd9abb89344f72 SHA256 9b373c5b8886df971c350c44766ccdf165ffec6c2082f68704121965ad7a2f37
+AUX numpy-1.3.0-darwin-no-arch.patch 3016 RMD160 a35968a68fac400e14d5eeafb44e058825c17ed5 SHA1 35b3fa3b0ed149f2f9f906e7a81d7f3cd0260d58 SHA256 9058cb30c54314e4e8dc5e4c0e4be3178664067d1ae71b0bee9576293f8cd71d
+AUX numpy-1.3.0-fenv-freebsd.patch 1177 RMD160 78a84e18836472bd9c657771c43a44e417ec3e19 SHA1 4dba898255df4784eac9e52633307991c12029de SHA256 2fa3ed9fdeb9dc529d51da4ba8a3a7ea4cc4bb9998fffa66426b1606f2c637b5
+AUX numpy-1.3.0-parisc.patch 474 RMD160 682971d65894aeb2e87de5f8eac717a8f7803318 SHA1 da6067bd782604119111d69fce06b7536d59f6ca SHA256 413af76d3b5518d2f544c4497110a3401d40a7ea713a7449ea8826facddbf225
+AUX numpy-1.4.0-interix.patch 478 RMD160 9a0290253238e09b824069d0026a5d2f00c90a8f SHA1 261e45c3feb068f033eed9b6468f5115ea418ca5 SHA256 4d6adcc1c66aa1399871c37f57e94ae7138c157ee5575945e83224a36c98c142
+DIST numpy-1.3-html.zip 3303495 RMD160 bd35c66c78574e6225de59a47cf161f3623c5119 SHA1 10799530be334cd7b1120a0b46f3c6f5deae5110 SHA256 933724b83300c9fc0779a579dad212ca8dcee230f1d892a56b977f3854d87c7e
+DIST numpy-1.3-ref.pdf 3907485 RMD160 54fe28c711b49ccc160dceed05bafa4e605aec36 SHA1 1edc6a3467bb36c5f395c2ed4dc066394180c6f8 SHA256 c8420df5d25e7fd76e7662477787184d068f43fc340b6975fa1db9ec06c773e7
+DIST numpy-1.3-user.pdf 461480 RMD160 a8aa36e6a0c03784fa3147cc0f0967c7f3c726d6 SHA1 059eee01d65ea401e47f978e2d5ebf5f67973723 SHA256 ab99f999d33eb1d1100ddb5c995ba525edaa64efce51a1f06b65a8285779d636
+DIST numpy-1.5.0.tar.gz 2276377 RMD160 6c6a8ce32d32705b66966c7a58359a0f2f404549 SHA1 5e3c40e1dde20bd8fda7a2131cb1259af7689295 SHA256 06d2181c884c5937c7c475103dd55de4fe4842a9d91bab1ed0965dd973a4661a
+EBUILD numpy-1.5.0.ebuild 4744 RMD160 dc53bc0e19db57d7f6e976a130af21f3604aa813 SHA1 d01051a577b21a8880383eda5ed406e7ec61ac0d SHA256 ea42e1b32c9659d5b12c2d45875867bbd528c3340f6cca0c5f18383fcaf58781
+MISC numpy-1.5.0.ebuild~ 4623 RMD160 75f44412f06549fb014cdea30a070a42cc4dc332 SHA1 31e05cf081da6c7e857e0fcdd0e372955c2d6a3b SHA256 aa56a999fda21c671601dc0b64d29e27eadd6061e45d5694199b6f98dc8e7fa4
diff --git a/dev-python/numpy/files/numpy-1.1.0-f2py.patch b/dev-python/numpy/files/numpy-1.1.0-f2py.patch
new file mode 100644
index 0000000..1ec18a9
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.1.0-f2py.patch
@@ -0,0 +1,36 @@
+diff -Nur numpy/f2py/f2py.1 numpy/f2py.new/f2py.1
+--- numpy/f2py/f2py.1	2006-07-26 21:04:19.000000000 +0100
++++ numpy/f2py.new/f2py.1	2007-02-14 12:16:47.000000000 +0000
+@@ -184,7 +184,7 @@
+ 
+ Optional Numarray 0.9 or higher partially supported.
+ 
+-numpy_distutils from Scipy (can be downloaded from F2PY homepage)
++numpy_distutils from Numpy (can be downloaded from F2PY homepage)
+ .SH "SEE ALSO"
+ python(1)
+ .SH BUGS
+@@ -200,10 +200,8 @@
+ 
+ Mailing list: http://cens.ioc.ee/mailman/listinfo/f2py-users/
+ 
+-Scipy website: http://www.numpy.org
++Numpy website: http://numeric.numpy.org
+ .SH COPYRIGHT
+ Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Pearu Peterson
+ .SH LICENSE
+ NumPy License
+-.SH VERSION
+-2.45.241
+diff -Nur numpy/f2py/setup.py numpy/f2py.new/setup.py
+--- numpy/f2py/setup.py	2006-10-03 05:35:22.000000000 +0100
++++ numpy/f2py.new/setup.py	2007-02-14 12:16:41.000000000 +0000
+@@ -35,8 +35,7 @@
+ 
+     config.add_data_files('src/fortranobject.c',
+                           'src/fortranobject.h',
+-                          'f2py.1'
+                           )
+ 
+     config.make_svn_version_py()
+ 
diff --git a/dev-python/numpy/files/numpy-1.3.0-alpha.patch b/dev-python/numpy/files/numpy-1.3.0-alpha.patch
new file mode 100644
index 0000000..3aa5fe4
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.3.0-alpha.patch
@@ -0,0 +1,24 @@
+diff -ur numpy-1.3.0.orig/numpy/core/include/numpy/npy_cpu.h numpy-1.3.0/numpy/core/include/numpy/npy_cpu.h
+--- numpy-1.3.0.orig/numpy/core/include/numpy/npy_cpu.h	2009-07-22 16:22:51.000000000 +0200
++++ numpy-1.3.0/numpy/core/include/numpy/npy_cpu.h	2009-07-22 16:23:18.000000000 +0200
+@@ -44,6 +44,8 @@
+     #define NPY_CPU_IA64
+ #elif defined(__hppa__)
+     #define NPY_CPU_PARISC
++#elif defined(__alpha__)
++    #define NPY_CPU_ALPHA
+ #else
+     #error Unknown CPU, please report this to numpy maintainers with \
+     information about your platform (OS, CPU and compiler)
+diff -ur numpy-1.3.0.orig/numpy/core/include/numpy/npy_endian.h numpy-1.3.0/numpy/core/include/numpy/npy_endian.h
+--- numpy-1.3.0.orig/numpy/core/include/numpy/npy_endian.h	2009-07-22 16:22:51.000000000 +0200
++++ numpy-1.3.0/numpy/core/include/numpy/npy_endian.h	2009-07-22 16:23:04.000000000 +0200
+@@ -22,7 +22,7 @@
+     #include "npy_cpu.h"
+ 
+     #if defined(NPY_CPU_X86) || defined(NPY_CPU_AMD64)\
+-            || defined(NPY_CPU_IA64)
++            || defined(NPY_CPU_IA64) || defined(NPY_CPU_ALPHA)
+         #define NPY_LITTLE_ENDIAN
+         #define NPY_BYTE_ORDER 1234
+     #elif defined(NPY_CPU_PPC) || defined(NPY_CPU_SPARC)\
\ No newline at end of file
diff --git a/dev-python/numpy/files/numpy-1.3.0-arm-sh.patch b/dev-python/numpy/files/numpy-1.3.0-arm-sh.patch
new file mode 100644
index 0000000..798eebb
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.3.0-arm-sh.patch
@@ -0,0 +1,50 @@
+diff -urNp numpy-1.3.0-old/numpy/core/include/numpy/npy_cpu.h numpy-1.3.0-new/numpy/core/include/numpy/npy_cpu.h
+--- numpy-1.3.0-old/numpy/core/include/numpy/npy_cpu.h	2009-08-16 17:49:39.000000000 +0530
++++ numpy-1.3.0-new/numpy/core/include/numpy/npy_cpu.h	2009-08-16 17:49:19.000000000 +0530
+@@ -9,6 +9,10 @@
+  *              NPY_CPU_S390
+  *              NPY_CPU_IA64
+  *              NPY_CPU_PARISC
++ *              NPY_CPU_ARMEL
++ *              NPY_CPU_ARMEB
++ *              NPY_CPU_SH_LE
++ *              NPY_CPU_SH_BE
+  */
+ #ifndef _NPY_CPUARCH_H_
+ #define _NPY_CPUARCH_H_
+@@ -46,6 +50,14 @@
+     #define NPY_CPU_PARISC
+ #elif defined(__alpha__)
+     #define NPY_CPU_ALPHA
++#elif defined(__arm__) && defined(__ARMEL__)
++    #define NPY_CPU_ARMEL
++#elif defined(__arm__) && defined(__ARMEB__)
++    #define NPY_CPU_ARMEB
++#elif defined(__sh__) && defined(__LITTLE_ENDIAN__)
++    #define NPY_CPU_SH_LE
++#elif defined(__sh__) && defined(__BIG_ENDIAN__)
++    #define NPY_CPU_SH_BE
+ #else
+     #error Unknown CPU, please report this to numpy maintainers with \
+     information about your platform (OS, CPU and compiler)
+diff -urNp numpy-1.3.0-old/numpy/core/include/numpy/npy_endian.h numpy-1.3.0-new/numpy/core/include/numpy/npy_endian.h
+--- numpy-1.3.0-old/numpy/core/include/numpy/npy_endian.h	2009-08-16 17:49:46.000000000 +0530
++++ numpy-1.3.0-new/numpy/core/include/numpy/npy_endian.h	2009-08-16 17:48:39.000000000 +0530
+@@ -22,11 +22,15 @@
+     #include "npy_cpu.h"
+ 
+     #if defined(NPY_CPU_X86) || defined(NPY_CPU_AMD64)\
+-            || defined(NPY_CPU_IA64) || defined(NPY_CPU_ALPHA)
++            || defined(NPY_CPU_IA64) || defined(NPY_CPU_ALPHA)\
++            || defined(NPY_CPU_ARMEL)\
++            || defined(NPY_CPU_SH_LE)
+         #define NPY_LITTLE_ENDIAN
+         #define NPY_BYTE_ORDER 1234
+     #elif defined(NPY_CPU_PPC) || defined(NPY_CPU_SPARC)\
+-            || defined(NPY_CPU_S390) || defined(NPY_CPU_PARISC)
++            || defined(NPY_CPU_S390) || defined(NPY_CPU_PARISC)\
++            || defined(NPY_CPU_ARMEB)\
++            || defined(NPY_CPU_SH_BE)
+         #define NPY_BIG_ENDIAN
+         #define NPY_BYTE_ORDER 4321
+     #else
diff --git a/dev-python/numpy/files/numpy-1.3.0-darwin-no-arch.patch b/dev-python/numpy/files/numpy-1.3.0-darwin-no-arch.patch
new file mode 100644
index 0000000..e96611d
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.3.0-darwin-no-arch.patch
@@ -0,0 +1,83 @@
+gfortran -v happily accepts any -arch X argument, but also happily dies
+during compilation that it doesn't understand -arch argument.  Hence,
+testing if -arch is supported like this is kind of not working well.
+
+Since Apple does not officially ship fortran support (any), I wonder how
+universal support could have crept into this piece of code all.  They
+don't even have an Apple GCC compiler with fortran support (like we do
+with Gentoo Prefix).
+
+http://projects.scipy.org/numpy/ticket/1087
+
+
+--- numpy/distutils/fcompiler/gnu.py
++++ numpy/distutils/fcompiler/gnu.py
+@@ -12,13 +12,6 @@
+ 
+ TARGET_R = re.compile("Target: ([a-zA-Z0-9_\-]*)")
+ 
+-# XXX: do we really need to check for target ? If the arch is not supported,
+-# the return code should be != 0
+-_R_ARCHS = {"ppc": r"^Target: (powerpc-.*)$",
+-    "i686": r"^Target: (i686-.*)$",
+-    "x86_64": r"^Target: (i686-.*)$",
+-    "ppc64": r"^Target: (powerpc-.*)$",}
+-
+ class GnuFCompiler(FCompiler):
+     compiler_type = 'gnu'
+     compiler_aliases = ('g77',)
+@@ -215,6 +208,7 @@
+     # OS X: GNU Fortran 95 (GCC) 4.1.0
+     #       GNU Fortran 95 (GCC) 4.2.0 20060218 (experimental)
+     #       GNU Fortran (GCC) 4.3.0 20070316 (experimental)
++    #       GNU Fortran (GCC) 4.2.1 (Apple Inc. build 5574)
+ 
+     possible_executables = ['gfortran', 'f95']
+     executables = {
+@@ -241,46 +235,6 @@
+ 
+     g2c = 'gfortran'
+ 
+-    # Note that this is here instead of GnuFCompiler as gcc < 4 uses a
+-    # different output format (which isn't as useful) than gcc >= 4,
+-    # and we don't have to worry about g77 being universal (as it can't be).
+-    def _can_target(self, cmd, arch):
+-        """Return true is the compiler support the -arch flag for the given
+-        architecture."""
+-        newcmd = cmd[:]
+-        newcmd.extend(["-arch", arch, "-v"])
+-        st, out = exec_command(" ".join(newcmd))
+-        if st == 0:
+-            for line in out.splitlines():
+-                m = re.search(_R_ARCHS[arch], line)
+-                if m:
+-                    return True
+-        return False
+-            
+-    def _universal_flags(self, cmd):
+-        """Return a list of -arch flags for every supported architecture."""
+-        if not sys.platform == 'darwin':
+-            return []
+-        arch_flags = []
+-        for arch in ["ppc", "i686"]:
+-            if self._can_target(cmd, arch):
+-                arch_flags.extend(["-arch", arch])
+-        return arch_flags
+-
+-    def get_flags(self):
+-        flags = GnuFCompiler.get_flags(self)
+-        arch_flags = self._universal_flags(self.compiler_f90)
+-        if arch_flags:
+-            flags[:0] = arch_flags
+-        return flags
+-
+-    def get_flags_linker_so(self):
+-        flags = GnuFCompiler.get_flags_linker_so(self)
+-        arch_flags = self._universal_flags(self.linker_so)
+-        if arch_flags:
+-            flags[:0] = arch_flags
+-        return flags
+-
+     def get_library_dirs(self):
+         opt = GnuFCompiler.get_library_dirs(self)
+         if sys.platform == 'win32':
diff --git a/dev-python/numpy/files/numpy-1.3.0-fenv-freebsd.patch b/dev-python/numpy/files/numpy-1.3.0-fenv-freebsd.patch
new file mode 100644
index 0000000..629fc76
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.3.0-fenv-freebsd.patch
@@ -0,0 +1,28 @@
+--- numpy/core/include/numpy/ufuncobject.h.orig	2009-07-28 15:04:42 -0400
++++ numpy/core/include/numpy/ufuncobject.h	2009-07-28 15:05:58 -0400
+@@ -318,8 +318,10 @@
+ 
+ #elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
+ 
+-#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || defined(__FreeBSD__)
++#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) 
+ #include <fenv.h>
++#elif defined(__FreeBSD__)
++#include "fenv/fenv.h"
+ #elif defined(__CYGWIN__)
+ #include "fenv/fenv.c"
+ #endif
+--- numpy/numarray/_capi.c.orig	2009-07-28 15:18:13 -0400
++++ numpy/numarray/_capi.c	2009-07-28 15:19:04 -0400
+@@ -8,8 +8,10 @@
+ #include <sys/param.h>
+ #endif
+ 
+-#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
++#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__)
+ #include <fenv.h>
++#elif (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
++#include "numpy/fenv/fenv.h"
+ #elif defined(__CYGWIN__)
+ #include "numpy/fenv/fenv.h"
+ #include "numpy/fenv/fenv.c"
diff --git a/dev-python/numpy/files/numpy-1.3.0-parisc.patch b/dev-python/numpy/files/numpy-1.3.0-parisc.patch
new file mode 100644
index 0000000..fd95f28
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.3.0-parisc.patch
@@ -0,0 +1,12 @@
+--- numpy-1.3.0/numpy/core/include/numpy/npy_cpu.h.orig	2009-04-05 10:09:20.000000000 +0200
++++ numpy-1.3.0/numpy/core/include/numpy/npy_cpu.h	2009-07-15 17:13:35.000000000 +0200
+@@ -42,8 +42,7 @@
+     #define NPY_CPU_S390
+ #elif defined(__ia64)
+     #define NPY_CPU_IA64
+-#elif defined(__parisc__)
+-    /* XXX: Not sure about this one... */
++#elif defined(__hppa__)
+     #define NPY_CPU_PARISC
+ #else
+     #error Unknown CPU, please report this to numpy maintainers with \
diff --git a/dev-python/numpy/files/numpy-1.4.0-interix.patch b/dev-python/numpy/files/numpy-1.4.0-interix.patch
new file mode 100644
index 0000000..b755867
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.4.0-interix.patch
@@ -0,0 +1,15 @@
+Reported [2010.01.18]: http://projects.scipy.org/numpy/ticket/1365
+
+diff -ru numpy-1.4.0.orig/numpy/core/setup.py numpy-1.4.0/numpy/core/setup.py
+--- numpy-1.4.0.orig/numpy/core/setup.py	2010-01-15 16:49:14 +0100
++++ numpy-1.4.0/numpy/core/setup.py	2010-01-15 17:02:27 +0100
+@@ -169,6 +169,9 @@
+     priv = []
+     pub = []
+ 
++    if os.uname()[0] == "Interix":
++        return priv, pub
++
+     # Check for complex support
+     st = config.check_header('complex.h')
+     if st:
diff --git a/dev-python/numpy/numpy-1.5.0.ebuild b/dev-python/numpy/numpy-1.5.0.ebuild
new file mode 100644
index 0000000..1620c75
--- /dev/null
+++ b/dev-python/numpy/numpy-1.5.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.5.0.ebuild,v 1.1 2010/09/02 13:25:02 djc Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils eutils flag-o-matic toolchain-funcs versionator
+
+NP="${PN}-1.3"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="http://numpy.scipy.org/ http://pypi.python.org/pypi/numpy"
+SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz
+	doc? (
+		http://docs.scipy.org/doc/${NP}.x/numpy-html.zip -> ${NP}-html.zip
+		http://docs.scipy.org/doc/${NP}.x/numpy-ref.pdf -> ${NP}-ref.pdf
+		http://docs.scipy.org/doc/${NP}.x/numpy-user.pdf -> ${NP}-user.pdf
+	)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 -ppc -ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+
+RDEPEND="dev-python/setuptools
+	lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+	lapack? ( dev-util/pkgconfig )
+	test? ( >=dev-python/nose-0.10 )
+	doc? ( app-arch/unzip )"
+
+pkg_setup() {
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	use lapack || return
+	[[ -z ${FC} ]] && FC=$(tc-getFC)
+	# when fortran flags are set, pic is removed.
+	FFLAGS="${FFLAGS} -fPIC"
+	NUMPY_FCONFIG="config_fc --noopt --noarch"
+	# workaround bug 335908
+	[[ ${FC} == *gfortran* ]] && NUMPY_FCONFIG="${NUMPY_FCONFIG} --fcompiler=gnu95"
+	export NUMPY_FCONFIG
+}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${NP}-html.zip -d html || die
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.0-f2py.patch
+	epatch "${FILESDIR}"/${PN}-1.3.0-fenv-freebsd.patch # bug 279487
+
+	# Gentoo patch for ATLAS library names
+	sed -i \
+		-e "s:'f77blas':'blas':g" \
+		-e "s:'ptf77blas':'blas':g" \
+		-e "s:'ptcblas':'cblas':g" \
+		-e "s:'lapack_atlas':'lapack':g" \
+		numpy/distutils/system_info.py \
+		|| die "sed system_info.py failed"
+
+	if use lapack; then
+		append-ldflags "$(pkg-config --libs-only-other cblas lapack)"
+		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF
+			[atlas]
+			include_dirs = $(pkg-config --cflags-only-I \
+				cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
+			library_dirs = $(pkg-config --libs-only-L \
+				cblas blas lapack | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir}
+			atlas_libs = $(pkg-config --libs-only-l \
+				cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+			lapack_libs = $(pkg-config --libs-only-l \
+				lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+			[blas_opt]
+			include_dirs = $(pkg-config --cflags-only-I \
+				cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
+			library_dirs = $(pkg-config --libs-only-L \
+				cblas blas | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir}
+			libraries = $(pkg-config --libs-only-l \
+				cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+			[lapack_opt]
+			library_dirs = $(pkg-config --libs-only-L \
+				lapack | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir}
+			libraries = $(pkg-config --libs-only-l \
+				lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	epatch "${FILESDIR}"/${PN}-1.4.0-interix.patch
+}
+
+src_compile() {
+	distutils_src_compile ${NUMPY_FCONFIG}
+}
+
+src_test() {
+	testing() {
+		"$(PYTHON)" setup.py ${NUMPY_FCONFIG} build -b "build-${PYTHON_ABI}" install \
+			--home="${S}/test-${PYTHON_ABI}" --no-compile || die "install test failed"
+		pushd "${S}/test-${PYTHON_ABI}/"lib* > /dev/null
+		PYTHONPATH=python "$(PYTHON)" -c "import numpy; numpy.test()" 2>&1 | tee test.log
+		grep -q '^ERROR' test.log && die "test failed"
+		popd > /dev/null
+		rm -fr test-${PYTHON_ABI}
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	[[ -z ${ED} ]] && local ED=${D}
+	distutils_src_install ${NUMPY_FCONFIG}
+	dodoc THANKS.txt DEV_README.txt COMPATIBILITY
+	rm -f "${ED}"/usr/lib/python*/site-packages/numpy/*.txt || die
+	docinto f2py
+	dodoc numpy/f2py/docs/*.txt || die "dodoc f2py failed"
+	doman numpy/f2py/f2py.1 || die "doman failed"
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r "${WORKDIR}"/html || die
+		doins  "${DISTDIR}"/${NP}*pdf || die
+	fi
+}
diff --git a/dev-python/python-poppler/Manifest b/dev-python/python-poppler/Manifest
new file mode 100644
index 0000000..91892a5
--- /dev/null
+++ b/dev-python/python-poppler/Manifest
@@ -0,0 +1,3 @@
+DIST pypoppler-0.10.0.tar.gz 292043 RMD160 f7a2616d84dc5438559775a1c5b3338149aafd9f SHA1 a442c3f06ce5d23e78658c6ba0962cfb8b0539e3 SHA256 1c09814a457375da607aa400cd8774b98c016c760ea513e3a22357cf4fca63b1
+EBUILD python-poppler-0.10.0.ebuild 841 RMD160 646dad0f12bb19165cac47181141d5d51f06a53b SHA1 7c16489214cfc6be6e329b98e84d7b47374bef19 SHA256 474ae3fa6e48104cb25bedb1dd259346f189710dde7b2d8c3c48b3f6f8edf4d7
+MISC python-poppler-0.10.0.ebuild~ 806 RMD160 35dd7fcd43e65916d96ae63254c98c06daa8b779 SHA1 22943cfc43285895715feef8cb54964bfae52a92 SHA256 64e384b81531b65b88c25c87e904b1c8236a1612c8c248345b2458024705abc0
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
new file mode 100644
index 0000000..590df63
--- /dev/null
+++ b/games-strategy/freeciv/Manifest
@@ -0,0 +1,2 @@
+DIST freeciv-2.2.3.tar.bz2 34607543 RMD160 c0c2010e52522ae77d457b389de74cd102c17e34 SHA1 8552c071c39f32c948a80ae74d95be4c9bdfcc16 SHA256 2db0753ca52cc023b35ae2df7dda5b3cc4987f186ec39ecd60e09bc29aa8065c
+EBUILD freeciv-2.2.3.ebuild 3258 RMD160 85125045a4b26ee819b0d6b2af1d70a2de12222d SHA1 4512e6111b73dd64c008780f7286eb37a3e765b5 SHA256 0719cbb0265d5c9f8f75196600bc01be813cc4a837d1b0000afa83cb2333929c
diff --git a/games-strategy/freeciv/freeciv-2.2.3.ebuild b/games-strategy/freeciv/freeciv-2.2.3.ebuild
new file mode 100644
index 0000000..4c2f68c
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.2.3.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.2.2.ebuild,v 1.3 2010/09/12 15:38:10 hwoarang Exp $
+
+EAPI=2
+inherit eutils gnome2-utils games-ggz games
+
+DESCRIPTION="multiplayer strategy game (Civilization Clone)"
+HOMEPAGE="http://www.freeciv.org/"
+SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE="auth dedicated ggz gtk ipv6 nls readline sdl +sound"
+
+RDEPEND="readline? ( sys-libs/readline )
+	sys-libs/zlib
+	app-arch/bzip2
+	auth? ( virtual/mysql )
+	!dedicated? (
+		nls? ( virtual/libintl )
+		gtk? ( x11-libs/gtk+:2 )
+		sdl? (
+			media-libs/libsdl[video]
+			media-libs/sdl-image[png]
+			media-libs/freetype
+		)
+		!gtk? ( !sdl? ( x11-libs/gtk+:2 ) )
+		sound? (
+			media-libs/libsdl[audio]
+			media-libs/sdl-mixer
+		)
+		ggz? ( games-board/ggz-gtk-client )
+		media-libs/libpng
+	)"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	!dedicated? (
+		nls? ( sys-devel/gettext )
+		x11-proto/xextproto
+	)"
+
+src_prepare() {
+	# install the .desktop in /usr/share/applications
+	# install the icons in /usr/share/pixmaps
+	sed -i \
+		-e 's:^\(desktopfiledir = \).*:\1/usr/share/applications:' \
+		-e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
+		-e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
+		client/Makefile.in \
+		server/Makefile.in \
+		data/Makefile.in \
+		data/icons/Makefile.in \
+		|| die "sed failed"
+
+	# remove civclient manpage if dedicated server
+	if use dedicated ; then
+		epatch "${FILESDIR}"/${P}-clean-man.patch
+	fi
+}
+
+src_configure() {
+	local myclient myopts
+
+	if use dedicated ; then
+		myclient="no"
+	else
+		use sdl && myclient="${myclient} sdl"
+		use gtk && myclient="${myclient} gtk"
+		[[ -z ${myclient} ]] && myclient="gtk" # default to gtk if none specified
+		myopts=$(use_with ggz ggz-client)
+	fi
+
+	egamesconf \
+		--disable-dependency-tracking \
+		--localedir=/usr/share/locale \
+		--with-ggzconfig=/usr/bin \
+		--enable-noregistry="${GGZ_MODDIR}" \
+		$(use_enable auth) \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_with readline) \
+		$(use_enable sound sdl-mixer) \
+		${myopts} \
+		--enable-client="${myclient}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if ! use dedicated ; then
+		# Create and install the html manual. It can't be done for dedicated
+		# servers, because the 'civmanual' tool is then not built. Also
+		# delete civmanual from the GAMES_BINDIR, because it's then useless.
+		# Note: to have it localized, it should be ran from _postinst, or
+		# something like that, but then it's a PITA to avoid orphan files...
+		./manual/civmanual || die "civmanual failed"
+		dohtml manual*.html || die "dohtml failed"
+		rm -f "${D}/${GAMES_BINDIR}"/civmanual
+		use sdl && make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
+	fi
+
+	dodoc ChangeLog NEWS doc/{BUGS,CodingStyle,HACKING,HOWTOPLAY,README*,TODO}
+	rm -rf "${D}$(games_get_libdir)"
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	games-ggz_update_modules
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	games-ggz_update_modules
+	gnome2_icon_cache_update
+}
diff --git a/gnome-extra/gedit-latex/Manifest b/gnome-extra/gedit-latex/Manifest
new file mode 100644
index 0000000..3e25549
--- /dev/null
+++ b/gnome-extra/gedit-latex/Manifest
@@ -0,0 +1,2 @@
+DIST LaTeXPlugin-0.2.tar.gz 244202 RMD160 1ecd014c20a8fc2b990ea8c3f9b3322df87f3b82 SHA1 c1eabe1300a8dd1af0ed952ff7f2ec64e5dd24f9 SHA256 9062257a82d515a76cf4cb5f2c035d35640dcea17ad4db7be7f7d453916a418a
+EBUILD gedit-latex-0.2.ebuild 1094 RMD160 86fe21963f32f23778229edfcb3fa48c077f66ba SHA1 6e68f445ca87d53c83bf46e09d2a2b8d92789b71 SHA256 4adbb5ee380fa735e1f4579b925e03590ac522056aa6f4d3e3ac83676a3cb902
diff --git a/gnome-extra/gedit-latex/gedit-latex-0.2.ebuild b/gnome-extra/gedit-latex/gedit-latex-0.2.ebuild
new file mode 100644
index 0000000..984ce80
--- /dev/null
+++ b/gnome-extra/gedit-latex/gedit-latex-0.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit eutils python
+
+DESCRIPTION="LaTeX plugin for gedit"
+HOMEPAGE="http://live.gnome.org/Gedit/LaTeXPlugin"
+SRC_URI="mirror://sourceforge/${PN}/LaTeXPlugin-${PV/_rc/rc}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+
+RDEPEND=">=app-editors/gedit-2.15.2[python]
+	dev-python/gnome-python
+	dev-python/dbus-python
+	dev-tex/rubber"
+
+DEPEND=""
+
+S="${WORKDIR}"
+
+src_compile() {
+	einfo "Nothing to compile"
+}
+
+src_install() {
+	mv GeditLaTeXPlugin ${PN}
+	mv GeditLaTeXPlugin.gedit-plugin ${PN}.gedit-plugin
+	sed -i -e "s/GeditLaTeXPlugin/${PN}/g" ${PN}.gedit-plugin ${PN}/src/base/resources.py
+	rm ${PN}/ChangeLog
+	rm ${PN}/INSTALL
+	rm ${PN}/COPYING
+	insinto /usr/$(get_libdir)/gedit-2/plugins
+	doins -r *
+	fperms 755 /usr/$(get_libdir)/gedit-2/plugins/${PN}/util/eps2png.pl
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/$(get_libdir)/gedit-2/plugins/${PN}
+}
+        
+pkg_postrm() {
+	python_mod_cleanup  /usr/$(get_libdir)/gedit-2/plugins/${PN}
+}
diff --git a/gnome-extra/gnome-globalmenu/Manifest b/gnome-extra/gnome-globalmenu/Manifest
new file mode 100644
index 0000000..820a8fa
--- /dev/null
+++ b/gnome-extra/gnome-globalmenu/Manifest
@@ -0,0 +1,2 @@
+DIST gnome-globalmenu-0.7.10.tar.bz2 565247 RMD160 c4cea0ead15ac76255e5ec1a8db82c8bf2d0bdf0 SHA1 0b1a845ea038b4f44e28112463fec7aac300a0b6 SHA256 5ce762e99ad033a64bb99ebc7d30159ee3225a88663e1d8585a8499174a12b89
+EBUILD gnome-globalmenu-0.7.10.ebuild 1997 RMD160 450915d029c9b00f6a7ba6500d3d1b116382e05d SHA1 5d8205ce60d520691bfe4b3e47df4c46600f2218 SHA256 dfa8aad6be90147f1256d4cde54a25a0beef4440147b5d7f6ae85ecd5aa42363
diff --git a/media-gfx/ale/Manifest b/media-gfx/ale/Manifest
new file mode 100644
index 0000000..a59b748
--- /dev/null
+++ b/media-gfx/ale/Manifest
@@ -0,0 +1,2 @@
+DIST ale-0.8.11.2.tar.gz 1373375 RMD160 f0aaec53befb5e9650fbd9fd2b77828d57b68833 SHA1 93d1e8a29a24d615b6d36868c26436cfe8ccf04e SHA256 bedea6f0d14b149b0b2419626182b7840a66f8bfa715ffddfd72dd57b125eefa
+EBUILD ale-0.8.11.2.ebuild 1186 RMD160 12d04378d1a210753ced3f8041597c749db519a1 SHA1 3263689b360b9d98a02f0c60a4eaad14e5ad643c SHA256 08260ea03d4373fe67ae9beaf82c2ba85430518c6a2091b8473cb96e57cac620
diff --git a/media-gfx/ale/ale-0.8.11.2.ebuild b/media-gfx/ale/ale-0.8.11.2.ebuild
new file mode 100644
index 0000000..6803fb0
--- /dev/null
+++ b/media-gfx/ale/ale-0.8.11.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+DESCRIPTION="ALE (Anti-Lamenessing Engine) is an image-processing program used for tasks such as image mosaicking, super-resolution, deblurring, noise reduction, anti-aliasing, and scene reconstruction."
+HOMEPAGE="http://auricle.dyndns.org/ALE/"
+SRC_URI="http://auricle.dyndns.org/ALE/download/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="fftw imagemagick doc"
+RDEPEND="fftw? ( =sci-libs/fftw-3* )
+	       imagemagick? ( media-gfx/imagemagick )"
+DEPEND="${RDEPEND}
+	doc? ( app-text/docbook-sgml-utils )"
+
+src_compile() {
+	      econf $(use_with imagemagick) $(use_with fftw fftw3) --enable-wmx \
+	      	    || die "econf failed"
+		    emake || die "emake failed"
+		    use doc && (emake -C doc chunk || die "emake chunk failed")
+}
+
+
+src_install() {
+	      emake install DESTDIR="${D}" || die "emake install failed"
+	      if use doc; then
+	      	 # I don't know why it creates a .html for index, but it's bad
+		   cp -f doc/index/.html doc/index/index.html
+		      dohtml doc/index/* || die "dohtml failed"
+		      fi
+}
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
new file mode 100644
index 0000000..13dc6dd
--- /dev/null
+++ b/media-gfx/gscan2pdf/Manifest
@@ -0,0 +1,2 @@
+DIST gscan2pdf-0.9.27.tar.gz 358356 RMD160 f62a4f3cf5f630f425a824c265a6f27f1b6223a0 SHA1 802618c9b0273ac0951ddf5f95c0355e3e2d5fdf SHA256 a28a7ff8a7453d722b0572a2f43a464dbe14971f97190d14a61386221fae439d
+EBUILD gscan2pdf-0.9.27.ebuild 1173 RMD160 481928eee4d416e39c3793ce633f080f7b07c1c2 SHA1 ed1e5bdadd0318cc9ec4e5691a7b4237fe8d6038 SHA256 204c54cbdb486d574eefdc2d5ce7df317b52bc84f8a42169e17eedaeb49b437d
diff --git a/media-gfx/gscan2pdf/gscan2pdf-0.9.27.ebuild b/media-gfx/gscan2pdf/gscan2pdf-0.9.27.ebuild
new file mode 100644
index 0000000..ae3bb80
--- /dev/null
+++ b/media-gfx/gscan2pdf/gscan2pdf-0.9.27.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+inherit perl-app
+
+DESCRIPTION="Create PDF of selected pages with File/Save PDF"
+HOMEPAGE="http://gscan2pdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="adf doc djvu gocr tesseract unpaper +xdg"
+
+DEPEND="dev-lang/perl
+	>=dev-perl/config-general-2.40"
+
+RDEPEND=">=dev-perl/gtk2-perl-1.140-r1
+	dev-perl/PDF-API2
+	dev-perl/Gtk2-Ex-Simple-List
+	dev-perl/Gtk2-ImageView
+	dev-perl/Sane
+	dev-perl/prefork
+	>=dev-perl/Locale-gettext-1.05
+	media-gfx/imagemagick[perl]
+	media-gfx/sane-backends
+	media-libs/tiff
+	xdg? ( x11-misc/xdg-utils )
+	adf? ( media-gfx/sane-frontends )
+	doc? ( dev-perl/Gtk2-Ex-PodViewer )
+	djvu? ( app-text/djvu )
+	gocr? ( app-text/gocr )
+	tesseract? ( app-text/tesseract )
+	unpaper? ( media-gfx/unpaper )"
+
+src_install() {
+	perl-module_src_install
+	dodoc History
+}
+
+pkg_postinst() {
+	ewarn "Thunderbird users can't use the Email to PDF feature"
+	ewarn "because xdg-email doesn't support creating new emails"
+	ewarn "with attachments in Thunderbird."
+}
+
diff --git a/media-gfx/mumbles/Manifest b/media-gfx/mumbles/Manifest
new file mode 100644
index 0000000..fa275a7
--- /dev/null
+++ b/media-gfx/mumbles/Manifest
@@ -0,0 +1,3 @@
+DIST mumbles_0.4-1.tar.gz 78620 RMD160 ed563462242ed55812ac682eb5bb2e899a404488 SHA1 785f8b67c8aecc699750019e97b05a2d5b184bc5 SHA256 c2b741a9a0b54580833fa5a64fd129e964d261f852b34c63d6b42f3744920a94
+EBUILD mumbles-0.4.1.ebuild 858 RMD160 91288dc4feed411e87e90763af3f680dfa0c9c73 SHA1 4a4a6b3bbd9b491a77935b869e075a941ac4ca47 SHA256 c41bb2476843f0b06498fd716dbe597b800d1549d5b86d4afa915bbc45210e04
+MISC mumbles-0.4.1.ebuild~ 858 RMD160 8f15c937f43b5cd51bed302265f2587c5f5d7301 SHA1 3fd8090d2901235c1daeb2dd483a6ec954a348a9 SHA256 4001e4ccd76f6cbf01bb81ebf4e4516ed5d2fb38749558eb5944683b63939b15
diff --git a/media-gfx/mumbles/mumbles-0.4.1.ebuild b/media-gfx/mumbles/mumbles-0.4.1.ebuild
new file mode 100644
index 0000000..c78335a
--- /dev/null
+++ b/media-gfx/mumbles/mumbles-0.4.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit distutils versionator
+SOURCE_PV=$(replace_version_separator 2 '-')
+UNPACK_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="A modern notification system, similar to libnotify or Growl on OSX"
+HOMEPAGE="http://www.mumbles-project.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${SOURCE_PV}.tar.gz"
+S="${WORKDIR}/${PN}-${UNPACK_PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+#Depends: python-glade2
+
+RDEPEND="	>=dev-python/pygtk-2.8
+		dev-python/pycairo
+		dev-python/dbus-python"
+DEPEND="	dev-python/setuptools"
+
+src_unpack() {
+    unpack ${A}
+    cd "${S}"
+    sed -i -e 's@"/usr/share/python-support/mumbles/src/"@"/usr/lib/python2.5/site-packages/src/"@' \
+	bin/mumbles bin/mumbles-send || die "sed failed"
+}
diff --git a/media-gfx/xmorph/Manifest b/media-gfx/xmorph/Manifest
new file mode 100644
index 0000000..9d2c1c7
--- /dev/null
+++ b/media-gfx/xmorph/Manifest
@@ -0,0 +1,2 @@
+DIST xmorph_20090926.tar.gz 1576680 RMD160 9c15f3a0dc72dd76375aa12e05f6068a8d5105ad SHA1 658fd5301c5eb592c4007dddf4b874febf1adf78 SHA256 24b4b8476ca70815a117cf2c440ab118d1ec345f8198aa8869281659908138d9
+EBUILD xmorph-20090929.ebuild 943 RMD160 8aaa5d4c2a5ce63d5c8a90221a436eae4fc5b574 SHA1 9e2e752d08d441caab52473ffb08a3151be59708 SHA256 5293f3ed0e473a09f99a22e4ecba1274609cf2314d7ed7712d1c0cc22a4b6d13
diff --git a/media-gfx/xmorph/xmorph-20090929.ebuild b/media-gfx/xmorph/xmorph-20090929.ebuild
new file mode 100644
index 0000000..340d53c
--- /dev/null
+++ b/media-gfx/xmorph/xmorph-20090929.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+DESCRIPTION="Library that implements digital image warping, known as morphing, along with GUIs."
+HOMEPAGE="http://xmorph.sourceforge.net/"
+SRC_URI="http://ftp.de.debian.org/debian/pool/main/x/xmorph/xmorph_20090926.tar.gz"
+RESTRICT="nomirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+IUSE="gtk nls fftw"
+# Options I'm ignoring:
+# --with-waili --with-xmorph --with-tkmorph
+
+#		--disable-gtktest \
+#		--without-gtkmorph	\ 
+
+RDEPEND="nls? ( virtual/libintl )
+		 gtk? ( x11-libs/gtk+ )"
+
+DEPEND="nls? ( sys-devel/gettext )
+		gtk? ( x11-libs/gtk+ )
+		fftw? ( >=sci-libs/fftw-3 )"
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		$(use_with gtk gtkmorph) \
+		$(use_with fftw) \
+		  || die "configure failed"
+	
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+}
diff --git a/media-sound/songbird/Manifest b/media-sound/songbird/Manifest
new file mode 100644
index 0000000..891b520
--- /dev/null
+++ b/media-sound/songbird/Manifest
@@ -0,0 +1,4 @@
+AUX songbird-1.1.1-symlink.patch 665 RMD160 f9a274af3d0e32d2cf74b72ff0d513c54f781551 SHA1 359869085cff640027dc233a85b92da72204f55e SHA256 d1519a433bef6cbddc72b413f847ea41860bec7adaf569745fc791bfd567c01b
+DIST Songbird_1.1.2-1042_linux-i686.tar.gz 17349139 RMD160 810849bd944f27f742f00e4bc32e2022acaf2ddb SHA1 2d9e04afb1f0d7f11dafba4bd755aa482035aa75 SHA256 9967721edb029cdbd825511eceb13a5ae69fd077845948505907970aecad2793
+DIST Songbird_1.1.2-1042_linux-x86_64.tar.gz 18743760 RMD160 bfa87c9b4949afe709648f2af90cec43ac99fa6f SHA1 999fc2237d852cddce77e67a7298e80552b7d89d SHA256 b459f6b0652ee8078099b8f57a66a40b5be6466ea30ae30979f6d2e330874225
+EBUILD songbird-1.1.2.ebuild 2920 RMD160 99517e5fc78ab09d158d2d18814fef364a3f2fae SHA1 6bf952e058e8655e212b2be46233e3d69da83c28 SHA256 d64b269e7c7077739ddbc708e30f12c6b2cc235f74bd8f36f310af93d5ce4073
diff --git a/media-sound/songbird/files/songbird-1.1.1-symlink.patch b/media-sound/songbird/files/songbird-1.1.1-symlink.patch
new file mode 100644
index 0000000..570f6ad
--- /dev/null
+++ b/media-sound/songbird/files/songbird-1.1.1-symlink.patch
@@ -0,0 +1,25 @@
+diff -Naru o/Songbird/songbird n/Songbird/songbird
+--- Songbird/songbird	2009-03-09 23:03:30.000000000 +0100
++++ Songbird/songbird	2009-03-17 11:05:34.000000000 +0100
+@@ -310,6 +310,7 @@
+ 	elif [ -x "$MOZ_DIST_BIN/$MOZ_APPRUNNER_NAME" ]
+ 	then
+ 		MOZ_PROGRAM=$MOZ_DIST_BIN/$MOZ_APPRUNNER_NAME
++	else
+ 	##
+ 	## Try resolving symlinks
+ 	##
+@@ -324,11 +325,11 @@
+ 			break
+ 		fi
+ 		curdir=`dirname "$progname"`
+-		run_moz="$curdir/$MOZ_DEFAULT_NAME"
++		run_moz="$curdir/songbird-bin"
+ 		if [ -x "$run_moz" ]; then
+ 			cd "$curdir"
+ 			MOZ_DIST_BIN=`pwd`
+-			MOZ_PROGRAM=$MOZ_DIST_BIN/$MOZ_DEFAULT_NAME
++			MOZ_PROGRAM=$MOZ_DIST_BIN/songbird-bin
+ 			break
+ 		fi
+ 	done
diff --git a/media-sound/songbird/songbird-1.1.2.ebuild b/media-sound/songbird/songbird-1.1.2.ebuild
new file mode 100644
index 0000000..fc2c42d
--- /dev/null
+++ b/media-sound/songbird/songbird-1.1.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils versionator
+
+MY_VER="1.1.2-1042"
+MY_PN="Songbird"
+S="${WORKDIR}/${MY_PN}"
+
+DESCRIPTION="A multimedia player, inspired by iTunes"
+HOMEPAGE="http://www.songbirdnest.com/"
+SRC_URI="amd64? ( http://download.songbirdnest.com/installer/linux/x86_64/${MY_PN}_${MY_VER}_linux-x86_64.tar.gz  )
+	x86? ( http://download.songbirdnest.com/installer/linux/i686/${MY_PN}_${MY_VER}_linux-i686.tar.gz ) "
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="alsa oss esd ogg flac faac faad musepack ugly theora speex ffmpeg gnome jpeg"
+RESTRICT="strip"
+RDEPEND="${DEPEND}
+	alsa? ( media-plugins/gst-plugins-alsa )
+	oss?  ( media-plugins/gst-plugins-oss )
+	esd?  ( media-plugins/gst-plugins-esd )
+	ogg? ( media-plugins/gst-plugins-ogg
+			media-plugins/gst-plugins-vorbis )
+	gnome? ( media-plugins/gst-plugins-gconf
+			media-plugins/gst-plugins-gnomevfs )
+	flac? ( media-plugins/gst-plugins-flac )
+	faac? ( media-plugins/gst-plugins-faac )
+	faad? ( media-plugins/gst-plugins-faad )
+	ugly?  ( media-libs/gst-plugins-ugly )
+	musepack? ( media-plugins/gst-plugins-musepack )
+	theora? ( media-plugins/gst-plugins-theora )
+	speex? ( media-plugins/gst-plugins-speex )
+	ffmpeg? ( media-plugins/gst-plugins-ffmpeg )
+	jpeg? ( media-plugins/gst-plugins-jpeg )"
+DEPEND="${RDEPEND}
+	x11-libs/libXdmcp
+	x11-libs/libXau
+	x11-libs/libXfixes
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXft
+	dev-libs/liboil
+	media-libs/gstreamer
+	media-libs/gst-plugins-base
+	media-plugins/gst-plugins-x
+	media-plugins/gst-plugins-xvideo
+	media-plugins/gst-plugins-lame
+	media-plugins/gst-plugins-mpeg2dec
+	media-plugins/gst-plugins-mad
+	>=net-misc/neon-0.26.4
+	media-plugins/gst-plugins-neon
+	>=sys-libs/glibc-2.3.2
+	>=x11-libs/gtk+-2.0.0
+	x11-libs/pango"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${PN}-1.1.1-symlink.patch"
+}
+
+src_install() {
+	insinto /opt/songbird
+	doins -r *
+	fperms 755 /opt/songbird/songbird
+	fperms 755 /opt/songbird/songbird-bin
+	dosym /opt/songbird/songbird /opt/bin/songbird-bin
+
+	newicon "${S}"/chrome/icons/default/default.xpm ${PN}.xpm
+	make_desktop_entry ${PN} ${PN} ${PN}.xpm "AudioVideo;Player"
+}
+
+pkg_postinst() {
+	echo
+	ewarn "Songbird is still under development!"
+	ewarn "This ebuild is not supported by Gentoo, so"
+	ewarn "please do not send any bugs at Gentoo's bugzilla."
+	einfo "If you need help, find it there:"
+	einfo "http://tnij.org/songbird-community"
+	einfo "or"
+	einfo "http://tnij.org/songbird-at-fgo"
+	einfo ""
+	einfo "If You need other music/video plugins, look at"
+	einfo "Your portage tree into media-plugins/gst-plugins-*,"
+	einfo "but remember, that not all plugins are supported yet."
+	einfo ""
+	einfo "If You don't want too much deps on it package,"
+	einfo "disable gnome support"
+	echo
+}
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
new file mode 100644
index 0000000..fe99525
--- /dev/null
+++ b/net-misc/remmina/Manifest
@@ -0,0 +1,5 @@
+DIST remmina-0.7.3.tar.gz 622850 RMD160 f340b1eb3959bb38bc7221bdf1a3c2c43a2b0a19 SHA1 014c121fe1930166330afe5dc30aa6317f5fa6a3 SHA256 2d36a747944f37fa01f4697595d39f120137c1a15e6ed7b3fa6de43fb5957d25
+DIST remmina-0.7.4.tar.gz 626240 RMD160 2d8a0d63400436d1f2a262c16b164394244e7e09 SHA1 77c15424abba9ee1934d48b887220fc49aafeecc SHA256 852bfe376282c5e51b5fe6255e7ab279e2d2314bad6e792fbf71c40266ddb153
+EBUILD remmina-0.7.3.ebuild 906 RMD160 6cafe4d401abba68c1f1267aef258c1f80e71155 SHA1 5f4eb3bbcaabf866770c49887acba11f43c04a0b SHA256 9bc646e3a5da5f82cc8244ba6f742a90d0b76b2d9df6569fd34f9864a82a6e05
+EBUILD remmina-0.7.4.ebuild 906 RMD160 6cafe4d401abba68c1f1267aef258c1f80e71155 SHA1 5f4eb3bbcaabf866770c49887acba11f43c04a0b SHA256 9bc646e3a5da5f82cc8244ba6f742a90d0b76b2d9df6569fd34f9864a82a6e05
+MISC remmina-0.7.3.ebuild~ 868 RMD160 2d41882b91b190450fb50152b6e0b958074ae597 SHA1 f1aab1ddf26de5c808a289bfa3c89ab3225eafa1 SHA256 95765be7b5dfa3809d662d1b48a0e082c0883568d8e070dfa5c55d60fb5f8d59
diff --git a/net-misc/remmina/remmina-0.7.3.ebuild b/net-misc/remmina/remmina-0.7.3.ebuild
new file mode 100644
index 0000000..ea1bc83
--- /dev/null
+++ b/net-misc/remmina/remmina-0.7.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit autotools gnome2 eutils
+
+DESCRIPTION="Gtk+/GNOME Remote Desktop Client"
+HOMEPAGE="http://remmina.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="avahi ssh vnc"
+
+RDEPEND=">=x11-libs/gtk+-2.16
+	>=dev-libs/glib-2.20
+	net-misc/rdesktop
+	>=dev-libs/libgcrypt-1.4.0
+	>=dev-libs/libunique-1.0.8
+	>=x11-libs/vte-0.12
+	avahi? ( >=net-dns/avahi-0.6.2[gtk,dbus] )
+	ssh? ( net-misc/openssh 
+               >=net-libs/libssh-0.4 )
+	vnc? ( net-misc/tigervnc
+		sys-libs/zlib
+		media-libs/jpeg
+		>=net-libs/gnutls-2.4 )"
+
+DEPEND="${RDEPEND}"
+
+docs="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable avahi)
+		$(use_enable ssh)
+		$(use_enable vnc)
+		--enable-gcrypt --enable-vte"
+}
diff --git a/net-misc/remmina/remmina-0.7.4.ebuild b/net-misc/remmina/remmina-0.7.4.ebuild
new file mode 100644
index 0000000..ea1bc83
--- /dev/null
+++ b/net-misc/remmina/remmina-0.7.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit autotools gnome2 eutils
+
+DESCRIPTION="Gtk+/GNOME Remote Desktop Client"
+HOMEPAGE="http://remmina.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="avahi ssh vnc"
+
+RDEPEND=">=x11-libs/gtk+-2.16
+	>=dev-libs/glib-2.20
+	net-misc/rdesktop
+	>=dev-libs/libgcrypt-1.4.0
+	>=dev-libs/libunique-1.0.8
+	>=x11-libs/vte-0.12
+	avahi? ( >=net-dns/avahi-0.6.2[gtk,dbus] )
+	ssh? ( net-misc/openssh 
+               >=net-libs/libssh-0.4 )
+	vnc? ( net-misc/tigervnc
+		sys-libs/zlib
+		media-libs/jpeg
+		>=net-libs/gnutls-2.4 )"
+
+DEPEND="${RDEPEND}"
+
+docs="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable avahi)
+		$(use_enable ssh)
+		$(use_enable vnc)
+		--enable-gcrypt --enable-vte"
+}
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
new file mode 100644
index 0000000..a9b1232
--- /dev/null
+++ b/net-misc/unison/Manifest
@@ -0,0 +1,13 @@
+AUX unison-2.27.57-as-needed.patch 432 RMD160 a6b5baf799f686764c7dc9285541cae9178c4fbd SHA1 f7566f358355b0ecb5e000101721d189363bbdc4 SHA256 0284d72f0d9de0a824c2bc2a2f78baced3b84eb15ea10e0e6576ff52cf57686d
+AUX unison-2.40.61-makefile.patch 523 RMD160 3ba6449ecddac57a91af646872b8de1fc88be16d SHA1 7329df33f09aa736991707f12c2bcc749bbaf5f1 SHA256 677f1380e5916c5c37ee17b022819d2013f02b3a6272ea8244484ac9b5941f08
+AUX unison-mymap.patch 466 RMD160 b317f3a79f11c2f9a91afa9801d196e8981f833b SHA1 5cc693b6bb2252a220b7db47227dd55cb0a7350e SHA256 1b73b9b4cf308b2f538fddfe95ee2ae42f5090015fbce132d2ae5789ea25a480
+DIST unison-2.40.16-manual.html 267159 RMD160 6b278d60711b3e7ac17b99a3f91bb3407d1cac8b SHA1 93958405ee07474ef9f1872ad8672fd884e84c34 SHA256 ffe6c85057ae8f8dcd76a02e2dfd1b37aa4681bc968f3be8945503547f038398
+DIST unison-2.40.16-manual.pdf 507350 RMD160 7b693ed1ad5507f0b88c5a21270c9a51193a9cfb SHA1 63733442a0f4538a7179d77001a04404574e58b3 SHA256 e49dcb0715152299fce11539c2d532bd4da9a4bb8af98670f8c61b6a13e241fe
+DIST unison-2.40.16.tar.gz 2712897 RMD160 b6a7c3fb8cd30b96352ea3a3cdcdb566ad9c52aa SHA1 148b2b617f18743128ba978b1cadad05624ce22c SHA256 7307824ec50507cc796608ae1da1bfa01216f0e7140e1a7344b325c7354b59b0
+DIST unison-2.40.61-manual.html 267159 RMD160 ba193743e36bdd868f9576610b94e59e7baf8cb8 SHA1 b941d7a40d1e9968d72ead4d61375091a28c9028 SHA256 b88c6c3a24c359e306e702672cc8da904e72c367861ef2a3dc3df07566948223
+DIST unison-2.40.61-manual.pdf 507350 RMD160 5fa0283fcf68849313214270698c27edd5b2aa41 SHA1 1410adf5edaf4be22598550dbfae5f861b440586 SHA256 75ff6909abcf6f9ea0a981a8e3827218491fcdfb03c088c8dd1e43fcc9c687ef
+DIST unison-2.40.61.tar.gz 2702722 RMD160 4a0bcc636d0e182be13723a5d9c676406824f638 SHA1 8645ce93a525b9561d51cceb9c4f9f08cea650e9 SHA256 e6114bf6a99d8bbe151250b7e28a74aa546d213f4f7f7914ca086a48b375277b
+EBUILD unison-2.40.16.ebuild 2505 RMD160 e27e364ce131a0a01f5cf132cb3b3cfdc76a7d89 SHA1 9f0b74b304aaabdbb816e871926388b16f9585d0 SHA256 0021cdb06755170a751195a17ccff1170efb7e55a66ca49eef767cf02565616d
+EBUILD unison-2.40.61.ebuild 2557 RMD160 6d2631b81ff5af20d3b1b55d48f17e9a2784dc93 SHA1 b45661c555a024c83e67ae3e40cc4cc263fb85c6 SHA256 8f7edf3ebb2636adacde6c963ecb83b490c50b858ffae63e4904ed8984b13ef8
+MISC unison-2.40.16.ebuild~ 2504 RMD160 bfeacb7069e2a15495a4308f191ed3a1ddd4b1c6 SHA1 0e6b6b32cf8f4352755fc4c1b04f85c7b98e9764 SHA256 c4ec7bbbedc42318a00e0c8521d6882c51d7a9fa1b47c59b39b883d2d7843436
+MISC unison-2.40.61.ebuild~ 2508 RMD160 257e0396f1caf90079d4f3a2b6de455eda021902 SHA1 d65b780dc71caf41de9bef92f707293c9601a9bd SHA256 46f6db43fe7bfca7d08cd5b7425f9143a8d24a3b5538943c423895911ce5d673
diff --git a/net-misc/unison/files/unison-2.27.57-as-needed.patch b/net-misc/unison/files/unison-2.27.57-as-needed.patch
new file mode 100644
index 0000000..ff5be04
--- /dev/null
+++ b/net-misc/unison/files/unison-2.27.57-as-needed.patch
@@ -0,0 +1,11 @@
+--- unison-2.17.1/Makefile.OCaml
++++ unison-2.17.1/Makefile.OCaml
+@@ -330,7 +330,7 @@
+ 
+ $(NAME)$(EXEC_EXT): $(CAMLOBJS) $(COBJS)
+ 	@echo Linking $@
+-	$(CAMLC) -verbose $(CAMLFLAGS) -o $@ $(CFLAGS) $(CAMLLIBS) $(CLIBS) $^
++	$(CAMLC) -verbose $(CAMLFLAGS) -o $@ $(CFLAGS) $(CAMLLIBS) $^ $(CLIBS)
+ 
+ # Unfortunately -output-obj does not put .o files into the output, only .cmx
+ # files, so we have to use $(LD) to take care of COBJS.
diff --git a/net-misc/unison/files/unison-2.40.61-makefile.patch b/net-misc/unison/files/unison-2.40.61-makefile.patch
new file mode 100644
index 0000000..67ad9ec
--- /dev/null
+++ b/net-misc/unison/files/unison-2.40.61-makefile.patch
@@ -0,0 +1,12 @@
+diff -Naur unison-2.40.61/Makefile unison-2.40.61_fix/Makefile
+--- unison-2.40.61/Makefile	2010-10-08 17:44:59.000000000 +0200
++++ unison-2.40.61_fix/Makefile	2011-02-07 22:54:33.000000000 +0100
+@@ -60,7 +60,7 @@
+ # NAME, VERSION, and MAJORVERSION, automatically generated
+ -include Makefile.ProjectInfo
+ 
+-Makefile.ProjectInfo: mkProjectInfo.ml $(wildcard ../.bzr/branch/last-revision)
++Makefile.ProjectInfo: mkProjectInfo $(wildcard ../.bzr/branch/last-revision)
+ 	./mkProjectInfo > $@
+ 
+ mkProjectInfo: mkProjectInfo.ml
diff --git a/net-misc/unison/files/unison-mymap.patch b/net-misc/unison/files/unison-mymap.patch
new file mode 100644
index 0000000..030eb0f
--- /dev/null
+++ b/net-misc/unison/files/unison-mymap.patch
@@ -0,0 +1,13 @@
+Index: unison-2.32.52/update.mli
+===================================================================
+--- unison-2.32.52.orig/update.mli
++++ unison-2.32.52/update.mli
+@@ -1,7 +1,7 @@
+ (* Unison file synchronizer: src/update.mli *)
+ (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
+ 
+-module NameMap : Map.S with type key = Name.t
++module NameMap : MyMap.S with type key = Name.t
+ 
+ type archive =
+     ArchiveDir of Props.t * archive NameMap.t
diff --git a/net-misc/unison/unison-2.40.16.ebuild b/net-misc/unison/unison-2.40.16.ebuild
new file mode 100644
index 0000000..4baf8f7
--- /dev/null
+++ b/net-misc/unison/unison-2.40.16.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.32.52.ebuild,v 1.4 2010/08/05 06:16:50 aballier Exp $
+
+EAPI="2"
+
+inherit eutils versionator
+
+IUSE="gtk doc static debug threads +ocamlopt test"
+
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/"
+LICENSE="GPL-2"
+SLOT="$(get_version_component_range 1-2 ${PV})"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+
+# ocaml version so we are sure it has ocamlopt use flag
+DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
+	gtk? ( >=dev-ml/lablgtk-2.2 )
+	test? ( || ( dev-util/ctags virtual/emacs ) )"
+
+RDEPEND="gtk? ( >=dev-ml/lablgtk-2.2
+	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+	!net-misc/unison:0
+	app-admin/eselect-unison"
+
+#PDEPEND="gtk? ( media-fonts/font-schumacher-misc )"
+
+SRC_URI="http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
+	doc? ( http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
+		http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )"
+
+src_prepare() {
+	#epatch "${FILESDIR}/${PN}-2.27.57-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-mymap.patch"
+}
+
+src_compile() {
+	local myconf
+
+	if use threads; then
+		myconf="$myconf THREADS=true"
+	fi
+
+	if use static; then
+		myconf="$myconf STATIC=true"
+	fi
+
+	if use debug; then
+		myconf="$myconf DEBUGGING=true"
+	fi
+
+	if use gtk; then
+		myconf="$myconf UISTYLE=gtk2"
+	else
+		myconf="$myconf UISTYLE=text"
+	fi
+
+	use ocamlopt || myconf="$myconf NATIVE=false"
+
+	# Discard cflags as it will try to pass them to ocamlc...
+	emake $myconf CFLAGS="" buildexecutable || die "error making unsion"
+}
+
+src_test() {
+	emake selftest ||  die "selftest failed"
+}
+
+src_install () {
+	# install manually, since it's just too much
+	# work to force the Makefile to do the right thing.
+	newbin unison unison-${SLOT} || die
+	dodoc BUGS.txt CONTRIB INSTALL NEWS \
+		  README ROADMAP.txt TODO.txt || die
+
+	if use doc; then
+		dohtml "${DISTDIR}/${P}-manual.html" || die
+		dodoc "${DISTDIR}/${P}-manual.pdf" || die
+	fi
+	use ocamlopt || export STRIP_MASK="*/bin/*"
+}
+
+pkg_postinst() {
+	elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}"
+	elog "in your profile files to access exactly this version over ssh."
+	elog "Or you can use 'eselect unison' to set the version."
+}
diff --git a/net-misc/unison/unison-2.40.61.ebuild b/net-misc/unison/unison-2.40.61.ebuild
new file mode 100644
index 0000000..6173ddb
--- /dev/null
+++ b/net-misc/unison/unison-2.40.61.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.32.52.ebuild,v 1.4 2010/08/05 06:16:50 aballier Exp $
+
+EAPI="2"
+
+inherit eutils versionator
+
+IUSE="gtk doc static debug threads +ocamlopt test"
+
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/"
+LICENSE="GPL-2"
+SLOT="$(get_version_component_range 1-2 ${PV})"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+
+# ocaml version so we are sure it has ocamlopt use flag
+DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
+	gtk? ( >=dev-ml/lablgtk-2.2 )
+	test? ( || ( dev-util/ctags virtual/emacs ) )"
+
+RDEPEND="gtk? ( >=dev-ml/lablgtk-2.2
+	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+	!net-misc/unison:0
+	app-admin/eselect-unison"
+
+#PDEPEND="gtk? ( media-fonts/font-schumacher-misc )"
+
+SRC_URI="http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
+	doc? ( http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
+		http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.40.61-makefile.patch"
+	#epatch "${FILESDIR}/${PN}-2.27.57-as-needed.patch"
+	#epatch "${FILESDIR}/${PN}-mymap.patch"
+}
+
+src_compile() {
+	local myconf
+
+	if use threads; then
+		myconf="$myconf THREADS=true"
+	fi
+
+	if use static; then
+		myconf="$myconf STATIC=true"
+	fi
+
+	if use debug; then
+		myconf="$myconf DEBUGGING=true"
+	fi
+
+	if use gtk; then
+		myconf="$myconf UISTYLE=gtk2"
+	else
+		myconf="$myconf UISTYLE=text"
+	fi
+
+	use ocamlopt || myconf="$myconf NATIVE=false"
+
+	# Discard cflags as it will try to pass them to ocamlc...
+	emake $myconf CFLAGS="" buildexecutable || die "error making unsion"
+}
+
+src_test() {
+	emake selftest ||  die "selftest failed"
+}
+
+src_install () {
+	# install manually, since it's just too much
+	# work to force the Makefile to do the right thing.
+	newbin unison unison-${SLOT} || die
+	dodoc BUGS.txt CONTRIB INSTALL NEWS \
+		  README ROADMAP.txt TODO.txt || die
+
+	if use doc; then
+		dohtml "${DISTDIR}/${P}-manual.html" || die
+		dodoc "${DISTDIR}/${P}-manual.pdf" || die
+	fi
+	use ocamlopt || export STRIP_MASK="*/bin/*"
+}
+
+pkg_postinst() {
+	elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}"
+	elog "in your profile files to access exactly this version over ssh."
+	elog "Or you can use 'eselect unison' to set the version."
+}
diff --git a/sci-mathematics/sage/Manifest b/sci-mathematics/sage/Manifest
new file mode 100644
index 0000000..9e550e3
--- /dev/null
+++ b/sci-mathematics/sage/Manifest
@@ -0,0 +1,18 @@
+AUX sage-4.3.3-arpack-from-scipy.patch 713 RMD160 bee944458fc619422151b063db36aa6867f020f7 SHA1 39e898ba895347554de202dcdab5e9ccb0fd8890 SHA256 2ae65bd4ce9abba1d77952681aa60bf0ca14b7da72141f0b20b50620fa5faf22
+AUX sage-4.3.3-delaunay-from-matplotlib.patch 374 RMD160 ef5fee82767a4d3065caa46901b16936fd22e6d8 SHA1 a1c21862872774134212900c7d412d272b25488a SHA256 39408b85e3b2ba4bddf03e44d082dd7e942b5af060f41e77e2a482f85ddff52b
+AUX sage-4.3.4-site-packages.patch 1325 RMD160 e1cc9612c6b25198f3499ff04056895ff591c66b SHA1 e8a52d46fac72d214faa401d56dffe95a82538eb SHA256 5f26e3abfd01a90007cb9b54190fde4c92e3dce31c12c5f852483a778bc5b698
+AUX sage-4.4.2-flint.patch 349 RMD160 b54e4cc61ffcdb45e181885e36137e9112a0e723 SHA1 33b5f818bf1086c872b06e34f8d1bb71f6df3cef SHA256 1d3663658a7ab36d5102a2acb14bad6e170cfb97caea568f43b27067bc994241
+AUX sage-4.4.2-jinja2.patch 11049 RMD160 9a307cac819d27713420392c63f51ee7ea404df8 SHA1 a368e0d0b78311d613a5ddbc5065ad6a3f7f336b SHA256 d54d029e511c78afc8f2466bf2ab9948c1ea5680aeb7271c68b7b440e4da1676
+AUX sage-4.4.4-extra-stdc99.patch 523 RMD160 3a1ffca54eae6e442a866089c5f1c1ce627b17b9 SHA1 9b3c357266915d2dec423f1991d50d041d57a44c SHA256 29232bc1c6b7da442c321dfdba674caf2d93e91f6b75a721f980fad6a4fe52e8
+AUX sage-4.5.1-fix-SAGE_LOCAL.patch 6575 RMD160 b9d94d958bffb60ff6f0995a12b99fae4b0f2170 SHA1 9a5a3eee24553ba542d82dec5aab76f5ed03b2d4 SHA256 9d085362749036ed9e26d39fe61f2f59f7ff2703a34ade7604733d988e14d87e
+AUX sage-4.5.1-fix-qepcad-path.patch 1376 RMD160 aba9f6d49d940bd05f8cb2f5d4bfe12779d77780 SHA1 2d05ae05b85b62d114cfe2dcbd67f1c9dc029ab7 SHA256 1d888d451d36c7f2ff407750a10b9ddb3a9f444d4ba90df129a8cb283aaa8f11
+AUX sage-4.5.2-ecls_ppc.patch 466 RMD160 4cb6c60ab2a274709a34c6a2d045f286ab9ccc5d SHA1 273c6464704fbabefef5e9e5ef05e5ba1f5f069f SHA256 b14d6f53400f39850eee9d48852550a939a961a9253bb8c5c0bd63f5dca701cc
+AUX sage-4.5.2-upgrade-singular.patch 15664 RMD160 5c46e59312d1dee2edb04185ac35aa0ac074fa64 SHA1 2c9f7f14dfa819c73f455c685402483794240292 SHA256 3cc4492fed6d0083ce5f2ee8536b7fa4fd1fcdbbcbad5d90c3a2ef658a87a366
+AUX sage.svg.bz2 2603 RMD160 1052e305bc0bb4047affc90bcda0b76ef75d018c SHA1 50997fac82ec2e03873aa4ac478d3eb09c2798c8 SHA256 e30c9981dff53532d34d4ae6e5f91bf70169a866195b831300b102a9471e59bd
+AUX trac-9221-matplotlib-update.patch 2235 RMD160 5cda3ce62bc7d5f405db120d07ac676e8bf45b30 SHA1 1238e6968bbd964ebbdaef69c1bb7745646aee71 SHA256 f0042068760bad8b9c2a6df98b63b8c8a847b20d701fb5f7b69c9691c6ddc085
+AUX trac_9567-cycle_basis.patch 2899 RMD160 cf599f8789c4124f8bf0e17910c86fe940540e54 SHA1 a9ff5f8615db06731265804e8fcece2114094b37 SHA256 3f8a1d668fa17dec3357c745c883f2cebae5624eb867a86930ee3fb251cc932d
+AUX trac_9567-networkx-1.2.patch 16364 RMD160 2bf3db747b62ad83d620ee15803cd6b451a46faf SHA1 d32a525c1b7fd974b1f4efa05ac249d244dce3d4 SHA256 93a362a66424f575c8774714c89efabd8ffdd9a566ae988648741ea1123772c9
+AUX trac_9808_numpy_doctest_change.patch 1671 RMD160 62b1d7e71d2e87e122ab70522083d67600e739b8 SHA1 e42bfe3fae7668dc1037892541cbab81c9d743ec SHA256 104c936134559ca06525b9b90ff23c647be2d0fd0ed2ba260c364612e3359415
+DIST sage-4.5.3.tar.bz2 48888341 RMD160 669daee24ca8530769637530209dc8f7fbfc51d5 SHA1 c1f542c5cbc4db8a894c55c720f66eceb436a83c SHA256 669b1f15d9ce667fa39e0d6598f400efadceb7aa43f6c756c134b31f030c352a
+EBUILD sage-4.5.3.ebuild 11449 RMD160 0076bed5dc78da7392c97a0618091dd24a6e5606 SHA1 c8294aa263e77b4e172c09097cc46d0b999aa6cf SHA256 a13f13e2bb08e73ea348c198be342bb151fac75949ea54277e824f45d1e217e6
+MISC sage-4.5.3.ebuild~ 11448 RMD160 1200092c7a06b454bc02ceffebfb4d42b647101a SHA1 eb5e1eebb3bbb2e5d63b6a989fe19bb98d37b760 SHA256 fd10f59b95409709e1fad8ef03a5fb614388c7fa30446412c4e47a97ccd5b077
diff --git a/sci-mathematics/sage/files/sage-4.3.3-arpack-from-scipy.patch b/sci-mathematics/sage/files/sage-4.3.3-arpack-from-scipy.patch
new file mode 100644
index 0000000..de1c802
--- /dev/null
+++ b/sci-mathematics/sage/files/sage-4.3.3-arpack-from-scipy.patch
@@ -0,0 +1,20 @@
+--- sage/numerical/test.py.orig	2010-02-04 18:36:20.845887211 +0000
++++ sage/numerical/test.py	2010-02-04 18:36:54.362885056 +0000
+@@ -9,7 +9,7 @@
+ sage: from scipy.sparse.linalg import dsolve   
+ sage: from scipy import interpolate
+ sage: from scipy import sparse    
+-sage: import arpack
++sage: from scipy.sparse.linalg.eigen.arpack import speigs
+ 
+ #Test arpack
+ #This matrix is the finite difference approximation to
+@@ -24,7 +24,7 @@
+ sage: n[2,:]=-1
+ sage: A=sparse.spdiags(n,[-1,0,1],int(500),int(500))
+ sage: A=aslinearoperator(A)
+-sage: e,v=arpack.speigs.ARPACK_eigs(A.matvec,500,6,which='SM')
++sage: e,v=speigs.ARPACK_eigs(A.matvec,500,6,which='SM')
+ sage: e[0]*float(501/pi)**2
+ 0.999............
+ """
diff --git a/sci-mathematics/sage/files/sage-4.3.3-delaunay-from-matplotlib.patch b/sci-mathematics/sage/files/sage-4.3.3-delaunay-from-matplotlib.patch
new file mode 100644
index 0000000..c8d2636
--- /dev/null
+++ b/sci-mathematics/sage/files/sage-4.3.3-delaunay-from-matplotlib.patch
@@ -0,0 +1,11 @@
+--- sage/plot/plot3d/list_plot3d.py.orig	2010-02-04 16:59:26.431145424 +0000
++++ sage/plot/plot3d/list_plot3d.py	2010-02-04 17:00:14.883022519 +0000
+@@ -207,7 +207,7 @@
+     return G
+ 
+ def list_plot3d_tuples(v,interpolation_type, texture, **kwds):
+-    import delaunay
++    from matplotlib import delaunay
+     import numpy
+     import scipy
+     from random import random
diff --git a/sci-mathematics/sage/files/sage-4.3.4-site-packages.patch b/sci-mathematics/sage/files/sage-4.3.4-site-packages.patch
new file mode 100644
index 0000000..01bff72
--- /dev/null
+++ b/sci-mathematics/sage/files/sage-4.3.4-site-packages.patch
@@ -0,0 +1,29 @@
+--- setup.py.orig	2010-04-02 08:54:57.681058076 +0000
++++ setup.py	2010-04-03 09:17:30.479619709 +0000
+@@ -38,25 +38,11 @@
+ else:
+     SAGE_VERSION = os.environ['SAGE_VERSION']
+ 
+-SITE_PACKAGES = '%s/lib/python/site-packages/'%SAGE_LOCAL
+-if not os.path.exists(SITE_PACKAGES):
+-    SITE_PACKAGES = '%s/lib/python2.5/site-packages/'%SAGE_LOCAL
+-    if not os.path.exists(SITE_PACKAGES):
+-        SITE_PACKAGES = '%s/lib/python2.4/site-packages/'%SAGE_LOCAL
+-        if not os.path.exists(SITE_PACKAGES) and os.environ.has_key('SAGE_DEBIAN'):
+-            SITE_PACKAGES = '%s/lib/python2.5/site-packages/'%SAGE_LOCAL
+-            os.system('mkdir -p "%s"'%SITE_PACKAGES)
+-        if not os.path.exists(SITE_PACKAGES):        
+-            raise RuntimeError, "Unable to find site-packages directory (see setup.py file in sage python code)."
++SITE_PACKAGES = 'build'
+ 
+ if not os.path.exists('build/sage'):
+     os.makedirs('build/sage')
+ 
+-sage_link = SITE_PACKAGES + '/sage'
+-if not os.path.islink(sage_link) or not os.path.exists(sage_link):
+-    os.system('rm -rf "%s"'%sage_link)
+-    os.system('cd %s; ln -sf ../../../../devel/sage/build/sage .'%SITE_PACKAGES)
+-
+ include_dirs = ['%s/include'%SAGE_LOCAL, \
+                 '%s/include/csage'%SAGE_LOCAL, \
+                 ## this is included, but doesn't actually exist
diff --git a/sci-mathematics/sage/files/sage-4.4.2-flint.patch b/sci-mathematics/sage/files/sage-4.4.2-flint.patch
new file mode 100644
index 0000000..298da9a
--- /dev/null
+++ b/sci-mathematics/sage/files/sage-4.4.2-flint.patch
@@ -0,0 +1,11 @@
+--- sage/libs/flint/flint.pxd.orig	2010-05-24 10:53:07.676486281 +1200
++++ sage/libs/flint/flint.pxd	2010-05-24 14:35:38.169806635 +1200
+@@ -4,4 +4,7 @@
+     cdef long FLINT_D_BITS
+ 
+     cdef unsigned long FLINT_BIT_COUNT(unsigned long)
+-    void flint_stack_cleanup()
++
++cdef extern from "memory-manager.h":
++
++    cdef void flint_stack_cleanup()
diff --git a/sci-mathematics/sage/files/sage-4.4.2-jinja2.patch b/sci-mathematics/sage/files/sage-4.4.2-jinja2.patch
new file mode 100644
index 0000000..4baac66
--- /dev/null
+++ b/sci-mathematics/sage/files/sage-4.4.2-jinja2.patch
@@ -0,0 +1,319 @@
+--- sage/ext/gen_interpreters.py.orig	2010-05-22 16:10:12.349829112 +1200
++++ sage/ext/gen_interpreters.py	2010-05-22 16:09:19.408829582 +1200
+@@ -98,8 +98,8 @@
+ 
+ import os
+ import re
+-from jinja import Environment
+-from jinja.datastructure import ComplainingUndefined
++from jinja2 import Environment
++from jinja2.runtime import StrictUndefined
+ from collections import defaultdict
+ from distutils.extension import Extension
+ 
+@@ -114,12 +114,12 @@
+ ##############################
+ 
+ 
+-# We share a single jinja environment among all templating in this file.
+-# We use trim_blocks=True (which means that we ignore white space after
+-# "%}" jinja command endings), and set undefined_singleton to complain
+-# if we use an undefined variable.
+-jinja_env = Environment(trim_blocks=True,
+-                        undefined_singleton=ComplainingUndefined)
++# We share a single jinja2 environment among all templating in this
++# file.  We use trim_blocks=True (which means that we ignore white
++# space after "%}" jinja2 command endings), and set undefined to
++# complain if we use an undefined variable.
++jinja_env = Environment(trim_blocks=True, undefined=StrictUndefined)
++
+ # Allow 'i' as a shorter alias for the built-in 'indent' filter.
+ jinja_env.filters['i'] = jinja_env.filters['indent']
+ 
+@@ -169,7 +169,7 @@
+     if len(template) > 0 and template[0] == '\n':
+         template = template[1:]
+ 
+-    # It looks like Jinja automatically removes one trailing newline?
++    # It looks like Jinja2 automatically removes one trailing newline?
+     if len(template) > 0 and template[-1] == '\n':
+         template = template + '\n'
+ 
+@@ -424,8 +424,8 @@
+         return je("""
+ {# XXX Variables here (and everywhere, really) should actually be Py_ssize_t #}
+     cdef int _n_{{ name }}
+-    cdef {{ self.cython_array_type() }} _{{ name }}
+-""", self=self, name=name)
++    cdef {{ myself.cython_array_type() }} _{{ name }}
++""", myself=self, name=name)
+ 
+     def alloc_chunk_data(self, name, len):
+         r"""
+@@ -444,13 +444,13 @@
+         """
+         return je("""
+         self._n_{{ name }} = {{ len }}
+-        self._{{ name }} = <{{ self.c_ptr_type() }}>sage_malloc(sizeof({{ self.c_decl_type() }}) * {{ len }})
++        self._{{ name }} = <{{ myself.c_ptr_type() }}>sage_malloc(sizeof({{ myself.c_decl_type() }}) * {{ len }})
+         if self._{{ name }} == NULL: raise MemoryError
+-{% if self.needs_cython_init_clear() %}
++{% if myself.needs_cython_init_clear() %}
+         for i in range({{ len }}):
+-            {{ self.cython_init('self._%s[i]' % name) }}
++            {{ myself.cython_init('self._%s[i]' % name) }}
+ {% endif %}
+-""", self=self, name=name, len=len)
++""", myself=self, name=name, len=len)
+ 
+     def dealloc_chunk_data(self, name):
+         r"""
+@@ -473,12 +473,12 @@
+         """
+         return je("""
+         if self._{{ name }}:
+-{%     if self.needs_cython_init_clear() %}
++{%     if myself.needs_cython_init_clear() %}
+             for i in range(self._n_{{ name }}):
+-                {{ self.cython_clear('self._%s[i]' % name) }}
++                {{ myself.cython_clear('self._%s[i]' % name) }}
+ {%     endif %}
+             sage_free(self._{{ name }})
+-""", self=self, name=name)
++""", myself=self, name=name)
+ 
+ class StorageTypeAssignable(StorageType):
+     r"""
+@@ -671,8 +671,8 @@
+         return je("""
+     cdef object _list_{{ name }}
+     cdef int _n_{{ name }}
+-    cdef {{ self.cython_array_type() }} _{{ name }}
+-""", self=self, name=name)
++    cdef {{ myself.cython_array_type() }} _{{ name }}
++""", myself=self, name=name)
+ 
+     def alloc_chunk_data(self, name, len):
+         r"""
+@@ -691,7 +691,7 @@
+         self._n_{{ name }} = {{ len }}
+         self._list_{{ name }} = PyList_New(self._n_{{ name }})
+         self._{{ name }} = (<PyListObject *>self._list_{{ name }}).ob_item
+-""", self=self, name=name, len=len)
++""", myself=self, name=name, len=len)
+ 
+     def dealloc_chunk_data(self, name):
+         r"""
+@@ -901,8 +901,8 @@
+             sage: ty_mpfr.cython_init('foo[i]')
+             u'mpfr_init2(foo[i], self.domain.prec())'
+         """
+-        return je("mpfr_init2({{ loc }}, self.domain{{ self.id }}.prec())",
+-                  self=self, loc=loc)
++        return je("mpfr_init2({{ loc }}, self.domain{{ myself.id }}.prec())",
++                  myself=self, loc=loc)
+ 
+     def cython_clear(self, loc):
+         r"""
+@@ -928,8 +928,8 @@
+             u'rn = self.domain(bar[j])\nmpfr_set(foo[i], rn.value, GMP_RNDN)'
+         """
+         return je("""
+-rn{{ self.id }} = self.domain({{ py }})
+-mpfr_set({{ c }}, rn.value, GMP_RNDN)""", self=self, c=c, py=py)
++rn{{ myself.id }} = self.domain({{ py }})
++mpfr_set({{ c }}, rn.value, GMP_RNDN)""", myself=self, c=c, py=py)
+ 
+ ty_mpfr = StorageTypeMPFR()
+ 
+@@ -1184,9 +1184,9 @@
+             <BLANKLINE>
+         """
+         return je("""
+-        count = args['{{ self.name }}']
+-{% print self.storage_type.alloc_chunk_data(self.name, 'count') %}
+-""", self=self)
++        count = args['{{ myself.name }}']
++{% print myself.storage_type.alloc_chunk_data(myself.name, 'count') %}
++""", myself=self)
+ 
+     def dealloc_class_members(self):
+         r"""
+@@ -1249,11 +1249,11 @@
+             <BLANKLINE>
+         """
+         return je("""
+-        val = args['{{ self.name }}']
+-{% print self.storage_type.alloc_chunk_data(self.name, 'len(val)') %}
++        val = args['{{ myself.name }}']
++{% print myself.storage_type.alloc_chunk_data(myself.name, 'len(val)') %}
+         for i in range(len(val)):
+-            {{ self.storage_type.assign_c_from_py('self._%s[i]' % self.name, 'val[i]') | i(12) }}
+-""", self=self)
++            {{ myself.storage_type.assign_c_from_py('self._%s[i]' % myself.name, 'val[i]') | i(12) }}
++""", myself=self)
+ 
+ class MemoryChunkArguments(MemoryChunkLonglivedArray):
+     r"""
+@@ -1282,11 +1282,11 @@
+             <BLANKLINE>
+         """
+         return je("""
+-cdef {{ self.storage_type.c_ptr_type() }} c_args = self._args
++cdef {{ myself.storage_type.c_ptr_type() }} c_args = self._args
+ cdef int i
+ for i from 0 <= i < len(args):
+-    {{ self.storage_type.assign_c_from_py('self._args[i]', 'args[i]') | i(4) }}
+-""", self=self)
++    {{ myself.storage_type.assign_c_from_py('self._args[i]', 'args[i]') | i(4) }}
++""", myself=self)
+ 
+     def pass_argument(self):
+         r"""
+@@ -1383,9 +1383,9 @@
+         # XXX This is a lot slower than it needs to be, because
+         # we don't have a "cdef int i" in scope here.
+         return je("""
+-for i in range(self._n_{{ self.name }}):
+-    Py_CLEAR(self._{{ self.name }}[i])
+-""", self=self)
++for i in range(self._n_{{ myself.name }}):
++    Py_CLEAR(self._{{ myself.name }}[i])
++""", myself=self)
+ 
+ class MemoryChunkRRRetval(MemoryChunk):
+     r"""
+@@ -1418,8 +1418,8 @@
+             u'        cdef RealNumber retval = (self.domain)()\n'
+         """
+         return je("""
+-        cdef RealNumber {{ self.name }} = (self.domain)()
+-""", self=self)
++        cdef RealNumber {{ myself.name }} = (self.domain)()
++""", myself=self)
+         
+     def pass_argument(self):
+         r"""
+@@ -1432,7 +1432,7 @@
+             sage: mc.pass_argument()
+             u'&retval.value'
+         """
+-        return je("""&{{ self.name }}.value""", self=self)
++        return je("""&{{ myself.name }}.value""", myself=self)
+ 
+     def pass_call_c_argument(self):
+         r"""
+@@ -1479,9 +1479,9 @@
+             u"        count = args['args']\n        self._n_args = count\n"
+         """
+         return je("""
+-        count = args['{{ self.name }}']
++        count = args['{{ myself.name }}']
+         self._n_args = count
+-""", self=self)
++""", myself=self)
+ 
+     def setup_args(self):
+         r"""
+@@ -1579,8 +1579,8 @@
+             u'    cdef object _domain\n'
+         """
+         return je("""
+-    cdef object _{{ self.name }}
+-""", self=self)
++    cdef object _{{ myself.name }}
++""", myself=self)
+ 
+     def init_class_members(self):
+         r"""
+@@ -1595,8 +1595,8 @@
+             u"        self._domain = args['domain']\n"
+         """
+         return je("""
+-        self._{{ self.name }} = args['{{ self.name }}']
+-""", self=self)
++        self._{{ myself.name }} = args['{{ myself.name }}']
++""", myself=self)
+ 
+     def declare_parameter(self):
+         r"""
+@@ -2967,22 +2967,22 @@
+ /* Automatically generated by ext/gen_interpreters.py.  Do not edit! */
+ #include <Python.h>
+ {% print s.header %}
+-{{ self.func_header() }} {
++{{ myself.func_header() }} {
+   while (1) {
+     switch (*code++) {
+-""", s=s, self=self, i=indent_lines))
++""", s=s, myself=self, i=indent_lines))
+         for instr_desc in s.instr_descs:
+             self.gen_code(instr_desc, w)
+         w(je("""
+     }
+   }
+-{% if self.uses_error_handler %}
++{% if myself.uses_error_handler %}
+ error:
+   return {{ s.err_return }};
+ {% endif %}
+ }
+ 
+-""", s=s, i=indent_lines, self=self))
++""", s=s, i=indent_lines, myself=self))
+ 
+     def write_wrapper(self, write):
+         r"""
+@@ -3059,7 +3059,7 @@
+ from sage.ext.fast_callable cimport Wrapper
+ {% print s.pyx_header %}
+ 
+-cdef extern {{ self.func_header(cython=true) -}}
++cdef extern {{ myself.func_header(cython=true) -}}
+ {% if s.err_return != 'NULL' %}
+  except? {{ s.err_return -}}
+ {% endif %}
+@@ -3146,7 +3146,7 @@
+ {% endfor %}
+  ],
+  ipow_range={{ s.ipow_range }})
+-""", s=s, self=self, types=types, arg_ch=arg_ch, indent_lines=indent_lines, the_call=the_call, the_call_c=the_call_c, do_cleanup=do_cleanup))
++""", s=s, myself=self, types=types, arg_ch=arg_ch, indent_lines=indent_lines, the_call=the_call, the_call_c=the_call_c, do_cleanup=do_cleanup))
+ 
+     def write_pxd(self, write):
+         r"""
+@@ -3199,7 +3199,7 @@
+                      {{ arg_ch.storage_type.c_ptr_type() }} args,
+                      {{ arg_ch.storage_type.c_ptr_type() }} result) except 0
+ {% endif %}
+-""", s=s, self=self, types=types, indent_lines=indent_lines, arg_ch=arg_ch))
++""", s=s, myself=self, types=types, indent_lines=indent_lines, arg_ch=arg_ch))
+ 
+     def get_interpreter(self):
+         r"""
+--- sage/server/notebook/template.py.orig	2010-05-22 16:11:11.629830799 +1200
++++ sage/server/notebook/template.py	2010-05-22 16:09:19.431829934 +1200
+@@ -28,12 +28,12 @@
+ #  The full text of the GPL is available at:
+ #                  http://www.gnu.org/licenses/
+ #############################################################################
+-import jinja
++import jinja2
+ import sage.misc.misc
+ from sage.version import version
+ 
+ TEMPLATE_PATH = sage.misc.misc.SAGE_ROOT + '/devel/sage/sage/server/notebook/templates'
+-env = jinja.Environment(loader=jinja.FileSystemLoader(TEMPLATE_PATH))
++env = jinja2.Environment(loader=jinja2.FileSystemLoader(TEMPLATE_PATH))
+ 
+ def contained_in(container):
+     """
+@@ -100,7 +100,7 @@
+     """
+     try:
+         tmpl = env.get_template(filename)
+-    except jinja.exceptions.TemplateNotFound:
++    except jinja2.exceptions.TemplateNotFound:
+         return template('template_error.html', template=filename)
+     context = dict(default_context)
+     context.update(user_context)
diff --git a/sci-mathematics/sage/files/sage-4.4.4-extra-stdc99.patch b/sci-mathematics/sage/files/sage-4.4.4-extra-stdc99.patch
new file mode 100644
index 0000000..a52c587
--- /dev/null
+++ b/sci-mathematics/sage/files/sage-4.4.4-extra-stdc99.patch
@@ -0,0 +1,10 @@
+--- module_list.py.orig	2010-06-26 16:23:29.532595646 +1200
++++ module_list.py	2010-06-26 16:49:44.259596047 +1200
+@@ -113,7 +113,6 @@
+ 
+     Extension('sage.algebras.quatalg.quaternion_algebra_element',
+                sources = ['sage/algebras/quatalg/quaternion_algebra_element.pyx'],
+-               extra_compile_args=["-std=c99"],
+                language='c++',
+                libraries = ["csage", "flint", "gmp", "gmpxx", "m", "stdc++", "ntl"],
+                include_dirs = [SAGE_ROOT+'/local/include/FLINT/'],
diff --git a/sci-mathematics/sage/files/sage-4.5.1-fix-SAGE_LOCAL.patch b/sci-mathematics/sage/files/sage-4.5.1-fix-SAGE_LOCAL.patch
new file mode 100644
index 0000000..8e55061
--- /dev/null
+++ b/sci-mathematics/sage/files/sage-4.5.1-fix-SAGE_LOCAL.patch
@@ -0,0 +1,166 @@
+--- sage/misc/cython.py.orig	2010-06-28 16:37:01.000000000 +0000
++++ sage/misc/cython.py	2010-07-31 15:47:39.704490103 +0000
+@@ -16,7 +16,7 @@
+ 
+ import os, sys
+ 
+-from misc import SPYX_TMP, SAGE_ROOT
++from misc import SPYX_TMP, SAGE_LOCAL, SAGE_ROOT
+ from sage.misc.misc import UNAME
+ 
+ def cblas():
+@@ -43,10 +43,10 @@
+     else:
+         return 'atlas'
+ 
+-include_dirs = ['%s/local/include/csage/'%SAGE_ROOT,
+-                '%s/local/include/'%SAGE_ROOT,  \
+-                '%s/local/include/python%s/'%(SAGE_ROOT, sys.version[:3]), \
+-                '%s/local/lib/python%s/site-packages/numpy/core/include'%(SAGE_ROOT, sys.version[:3]), \
++include_dirs = ['%s/include/csage/'%SAGE_LOCAL,
++                '%s/include/'%SAGE_LOCAL,  \
++                '%s/include/python%s/'%(SAGE_LOCAL, sys.version[:3]), \
++                '%s/lib/python%s/site-packages/numpy/core/include'%(SAGE_LOCAL, sys.version[:3]), \
+                 '%s/devel/sage/sage/ext/'%SAGE_ROOT, \
+                 '%s/devel/sage/'%SAGE_ROOT, \
+                 '%s/devel/sage/sage/gsl/'%SAGE_ROOT]
+@@ -160,9 +160,9 @@
+         ...,
+         'ntl',
+         'csage'],
+-        ['.../local/include/csage/',
+-        '.../local/include/',
+-        '.../local/include/python2.6/',
++        ['.../include/csage/',
++        '.../include/',
++        '.../include/python2.6/',
+         '.../devel/sage/sage/ext/',
+         '.../devel/sage/',
+         '.../devel/sage/sage/gsl/'],
+@@ -187,9 +187,9 @@
+         
+         sage: inc
+         ['bar',
+-        '.../local/include/csage/',
+-        '.../local/include/',
+-        '.../local/include/python2.6/',
++        '.../include/csage/',
++        '.../include/',
++        '.../include/python2.6/',
+         '.../devel/sage/sage/ext/',
+         '.../devel/sage/',
+         '.../devel/sage/sage/gsl/']
+@@ -323,7 +323,7 @@
+     sys.exit(1)
+ else:
+     SAGE_ROOT  = os.environ['SAGE_ROOT']
+-    SAGE_LOCAL = SAGE_ROOT + '/local/'
++    SAGE_LOCAL = os.environ['SAGE_LOCAL']
+ 
+ extra_link_args =  ['-L' + SAGE_LOCAL + '/lib']
+ extra_compile_args = ['-w','-O2']
+--- sage/misc/misc.py.orig	2010-07-12 08:12:30.000000000 +0000
++++ sage/misc/misc.py	2010-07-31 15:12:14.163485912 +0000
+@@ -40,7 +40,7 @@
+ from banner import version, banner
+ 
+ SAGE_ROOT = os.environ["SAGE_ROOT"]
+-SAGE_LOCAL = SAGE_ROOT + '/local/'
++SAGE_LOCAL = os.environ["SAGE_LOCAL"]
+ SAGE_DOC = os.environ["SAGE_DOC"]
+ HOSTNAME = socket.gethostname().replace('-','_').replace('/','_').replace('\\','_')
+ 
+@@ -123,7 +123,7 @@
+ 
+ 
+ def delete_tmpfiles():
+-    # !!!If you change this, see also SAGE_ROOT/local/bin/sage-doctest!!!
++    # !!!If you change this, see also SAGE_LOCAL/bin/sage-doctest!!!
+     import shutil
+     try:
+         if os.path.exists(SAGE_TMP):
+@@ -1883,7 +1883,7 @@
+     r"""
+     Return a string describing the current branch and that the library
+     is being loaded. This is called by the
+-    ``SAGE_ROOT/local/bin/sage-sage`` script.
++    ``SAGE_LOCAL/bin/sage-sage`` script.
+     
+     INPUT:
+     
+--- sage/interfaces/maxima.py.orig	2010-07-31 14:57:21.214485610 +0000
++++ sage/interfaces/maxima.py	2010-07-31 14:58:04.565485703 +0000
+@@ -461,7 +461,7 @@
+ ##import sage.rings.all
+ import sage.rings.complex_number
+ 
+-from sage.misc.misc import verbose, DOT_SAGE, SAGE_ROOT
++from sage.misc.misc import verbose, DOT_SAGE, SAGE_LOCAL
+ 
+ from sage.misc.multireplace import multiple_replace
+ 
+@@ -497,7 +497,7 @@
+         # setting inchar and outchar..
+         eval_using_file_cutoff = 256
+         self.__eval_using_file_cutoff = eval_using_file_cutoff
+-        STARTUP = '%s/local/bin/sage-maxima.lisp'%SAGE_ROOT
++        STARTUP = '%s/bin/sage-maxima.lisp'%SAGE_LOCAL
+         
+         # We set maxima's configuration directory to $DOT_SAGE/maxima
+         # This avoids that sage's maxima inadvertently loads
+--- sage/server/trac/trac.py.orig	2010-06-28 16:37:01.000000000 +0000
++++ sage/server/trac/trac.py	2010-07-31 15:02:28.897486472 +0000
+@@ -120,7 +120,7 @@
+         print "    cd %s" % os.path.abspath(os.path.join(directory, 'conf'))
+         print "    htdigest passwd %s <username>" % address
+         print "\nTo grant full admin permissions to a user:"
+-        print "    %s %s permission add <username> TRAC_ADMIN" % (os.path.join(SAGE_ROOT, 'local/bin/trac-admin'), os.path.abspath(directory))
++        print "    %s %s permission add <username> TRAC_ADMIN" % (os.path.join(SAGE_LOCAL, 'bin/trac-admin'), os.path.abspath(directory))
+         print "\nThen restart the trac server."
+         print "*" * 80
+         open(passwd,'w').close()
+--- sage/quadratic_forms/quadratic_form__automorphisms.py.orig	2010-07-31 15:07:42.812485694 +0000
++++ sage/quadratic_forms/quadratic_form__automorphisms.py	2010-07-31 15:07:51.953487938 +0000
+@@ -8,7 +8,7 @@
+ from sage.modules.free_module_element import vector
+ from sage.rings.arith import GCD
+ from sage.misc.sage_eval import sage_eval
+-from sage.misc.misc import SAGE_ROOT
++from sage.misc.misc import SAGE_LOCAL
+ 
+ import tempfile, os
+ from random import random
+@@ -431,7 +431,7 @@
+     #os.system("less " + F.name)
+ 
+     ## Call the Souvigner automorphism code
+-    souvigner_auto_path = SAGE_ROOT + "/local/bin/Souvigner_AUTO"                 ## FIX THIS LATER!!!
++    souvigner_auto_path = SAGE_LOCAL + "/bin/Souvigner_AUTO"                 ## FIX THIS LATER!!!
+     G1 = tempfile.NamedTemporaryFile(prefix='tmp_auto_ouput', suffix=".txt")
+     #print "Output filename = ", G1.name
+     os.system(souvigner_auto_path + " '" +  F.name + "' > '" + G1.name +"'")
+--- sage/quadratic_forms/quadratic_form__equivalence_testing.py.orig	2010-07-31 15:06:50.524485472 +0000
++++ sage/quadratic_forms/quadratic_form__equivalence_testing.py	2010-07-31 15:07:18.341485703 +0000
+@@ -1,3 +1,4 @@
++
+ from sage.matrix.constructor import Matrix
+ from sage.misc.mrange import mrange
+ from sage.rings.arith import hilbert_symbol, prime_divisors, is_prime, valuation, GCD, legendre_symbol
+@@ -7,7 +8,7 @@
+ from quadratic_form__genus import CS_genus_symbol_list
+ 
+ 
+-from sage.misc.misc import SAGE_ROOT
++from sage.misc.misc import SAGE_LOCAL
+ 
+ import tempfile, os
+ 
+@@ -65,7 +66,7 @@
+     #os.system("less " + F.name)
+ 
+     ## Call the Souvigner automorphism code
+-    souvigner_isom_path = SAGE_ROOT + "/local/bin/Souvigner_ISOM" 
++    souvigner_isom_path = SAGE_LOCAL + "/bin/Souvigner_ISOM"
+     G1 = tempfile.NamedTemporaryFile(prefix='tmp_isom_ouput', suffix=".txt")
+     #print "Output filename = ", G1.name
+     #print  "Executing the shell command:   " + souvigner_isom_path + " '" +  F.name + "' > '" + G1.name + "'"
diff --git a/sci-mathematics/sage/files/sage-4.5.1-fix-qepcad-path.patch b/sci-mathematics/sage/files/sage-4.5.1-fix-qepcad-path.patch
new file mode 100644
index 0000000..ff0c1ff
--- /dev/null
+++ b/sci-mathematics/sage/files/sage-4.5.1-fix-qepcad-path.patch
@@ -0,0 +1,39 @@
+--- sage/interfaces/qepcad.py.orig	2010-06-28 16:37:01.000000000 +0000
++++ sage/interfaces/qepcad.py	2010-08-01 06:42:34.142563760 +0000
+@@ -558,7 +558,7 @@
+         memcells_arg = '+N%s' % memcells
+     else:
+         memcells_arg = ''
+-    return "env qe=%s qepcad %s"%(sage.misc.misc.SAGE_LOCAL, memcells_arg)
++    return "env qe=%s qepcad %s"%(sage.misc.misc.DOT_SAGE, memcells_arg)
+ 
+ _command_info_cache = None
+ 
+@@ -579,7 +579,7 @@
+ 
+     cache = {}
+ 
+-    with open('%s/bin/qepcad.help'%sage.misc.misc.SAGE_LOCAL) as help:
++    with open('%s/share/qepcad/qepcad.help'%sage.misc.misc.SAGE_LOCAL) as help:
+         assert(help.readline().strip() == '@')
+ 
+         while True:
+@@ -636,15 +636,15 @@
+     EXAMPLES:
+         sage: from sage.interfaces.qepcad import _rewrite_qepcadrc
+         sage: _rewrite_qepcadrc()
+-        sage: from sage.misc.misc import SAGE_LOCAL
+-        sage: open('%s/default.qepcadrc'%SAGE_LOCAL).readlines()[-1]
++        sage: from sage.misc.misc import DOT_SAGE
++        sage: open('%s/default.qepcadrc'%DOT_SAGE).readlines()[-1]
+         'SINGULAR .../local//bin'
+     """
+     global _rewrote_qepcadrc
+     if _rewrote_qepcadrc: return
+ 
+     SL = sage.misc.misc.SAGE_LOCAL
+-    fn = '%s/default.qepcadrc'%SL
++    fn = '%s/default.qepcadrc'%sage.misc.misc.DOT_SAGE
+     text = \
+ """# THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT
+ 
diff --git a/sci-mathematics/sage/files/sage-4.5.2-ecls_ppc.patch b/sci-mathematics/sage/files/sage-4.5.2-ecls_ppc.patch
new file mode 100644
index 0000000..5f173bb
--- /dev/null
+++ b/sci-mathematics/sage/files/sage-4.5.2-ecls_ppc.patch
@@ -0,0 +1,10 @@
+--- module_list.py.orig	2010-08-30 22:48:44.781370340 +1200
++++ module_list.py	2010-08-30 22:54:58.297371782 +1200
+@@ -459,6 +459,7 @@
+               sources = ["sage/libs/ecl.pyx"],
+               libraries = ["ecl"],
+               include_dirs = [SAGE_ROOT+'/local/include/ecl/'],
++              extra_compile_args=["-mno-altivec", "-mabi=no-altivec"],
+               depends = [SAGE_ROOT + '/local/include/ecl/ecl.h']),
+ 
+     Extension('sage.libs.flint.flint',
diff --git a/sci-mathematics/sage/files/sage-4.5.2-upgrade-singular.patch b/sci-mathematics/sage/files/sage-4.5.2-upgrade-singular.patch
new file mode 100644
index 0000000..39b5b78
--- /dev/null
+++ b/sci-mathematics/sage/files/sage-4.5.2-upgrade-singular.patch
@@ -0,0 +1,476 @@
+# HG changeset patch
+# User Martin Albrecht <malb@informatik.uni-bremen.de>
+# Date 1267795375 0
+# Node ID e72bba40789546e1a6fb717567a680241a2e29b8
+# Parent  96e2020790df6a5f4d413e65b111f0ec6e73fc2a
+adapted to new Singular 3-1-0-9 API
+
+diff -r 96e2020790df -r e72bba407895 sage/interfaces/singular.py
+--- a/sage/interfaces/singular.py	Mon Jun 28 23:27:14 2010 +0100
++++ b/sage/interfaces/singular.py	Fri Mar 05 13:22:55 2010 +0000
+@@ -9,7 +9,7 @@
+   singular(...), x.[tab] includes all singular commands.
+ 
+ - Martin Albrecht (2006-03-06): This patch adds the equality symbol to
+-  singular. Also fix problem in which" " as prompt means comparison
++
+   will break all further communication with Singular.
+ 
+ - Martin Albrecht (2006-03-13): added current_ring() and
+@@ -1769,8 +1769,8 @@
+         
+             sage: R = singular.ring(0, '(x,y,z)', 'dp')
+             sage: A = singular.matrix(2,2)
+-            sage: A.nrows._sage_doc_()
+-            "\nnrows\n-----\n\n`*Syntax:*'\n ...
++            sage: 'matrix_expression' in A.nrows._sage_doc_()
++            True
+         """
+         if not nodes:
+             generate_docstring_dictionary()
+@@ -1829,7 +1829,7 @@
+     singular_docdir = os.environ["SAGE_LOCAL"]+"/share/singular/"
+ 
+     new_node = re.compile("File: singular\.hlp,  Node: ([^,]*),.*")
+-    new_lookup = re.compile("\* ([^:]*):*([^.]*)\.")
++    new_lookup = re.compile("\* ([^:]*):*([^.]*)\..*")
+ 
+     L, in_node, curr_node = [], False, None
+ 
+@@ -1849,7 +1849,7 @@
+                a,b = m.groups()
+                node_names[a] = b.strip()
+ 
+-        if line == "Index\n":
++        if line == "6 Index\n":
+             in_node = False
+ 
+     nodes[curr_node] = "".join(L) # last node
+diff -r 96e2020790df -r e72bba407895 sage/libs/singular/function.pyx
+--- a/sage/libs/singular/function.pyx	Mon Jun 28 23:27:14 2010 +0100
++++ b/sage/libs/singular/function.pyx	Fri Mar 05 13:22:55 2010 +0000
+@@ -1205,7 +1205,7 @@
+         self.call_handler = self.get_call_handler()
+ 
+     cdef BaseCallHandler get_call_handler(self):
+-        cdef idhdl* singular_idhdl = ggetid(self._name, 0)
++        cdef idhdl* singular_idhdl = ggetid(self._name)
+         if singular_idhdl==NULL:
+             raise NameError("Function '%s' is not defined."%self._name)
+         if singular_idhdl.typ!=PROC_CMD:
+@@ -1216,7 +1216,7 @@
+         return res
+ 
+     cdef bint function_exists(self):
+-        cdef idhdl* singular_idhdl = ggetid(self._name, 0)
++        cdef idhdl* singular_idhdl = ggetid(self._name)
+         return singular_idhdl!=NULL
+ 
+ cdef class SingularKernelFunction(SingularFunction):
+diff -r 96e2020790df -r e72bba407895 sage/libs/singular/option.pyx
+--- a/sage/libs/singular/option.pyx	Mon Jun 28 23:27:14 2010 +0100
++++ b/sage/libs/singular/option.pyx	Fri Mar 05 13:22:55 2010 +0000
+@@ -93,7 +93,7 @@
+ from sage.libs.singular.decl cimport OPT_WEIGHTM, Sy_bit
+ 
+ from sage.libs.singular.decl cimport V_SHOW_MEM, V_YACC, V_REDEFINE, V_READING, V_LOAD_LIB, V_DEBUG_LIB
+-from sage.libs.singular.decl cimport V_LOAD_PROC, V_DEF_RES, V_DEBUG_MEM, V_SHOW_USE, V_IMAP, V_PROMPT
++from sage.libs.singular.decl cimport V_LOAD_PROC, V_DEF_RES, V_SHOW_USE, V_IMAP, V_PROMPT
+ from sage.libs.singular.decl cimport V_NSB, V_CONTENTSB, V_CANCELUNIT, V_DEG_STOP
+ 
+ 
+@@ -314,7 +314,6 @@
+      - ``debugLib`` -
+      - ``loadProc`` -
+      - ``defRes`` -
+-     - ``debugMem`` -
+      - ``usage`` -
+      - ``Imap`` -
+      - ``prompt`` -
+@@ -350,7 +349,6 @@
+                          "debugLib": Sy_bit(V_DEBUG_LIB), 
+                          "loadProc": Sy_bit(V_LOAD_PROC), 
+                          "defRes":   Sy_bit(V_DEF_RES),   
+-                         "debugMem": Sy_bit(V_DEBUG_MEM), 
+                          "usage":    Sy_bit(V_SHOW_USE),  
+                          "Imap":     Sy_bit(V_IMAP),      
+                          "prompt":   Sy_bit(V_PROMPT),    
+diff -r 96e2020790df -r e72bba407895 sage/libs/singular/singular-cdefs.pxi
+--- a/sage/libs/singular/singular-cdefs.pxi	Mon Jun 28 23:27:14 2010 +0100
++++ b/sage/libs/singular/singular-cdefs.pxi	Fri Mar 05 13:22:55 2010 +0000
+@@ -75,7 +75,6 @@
+     cdef int V_DEBUG_LIB
+     cdef int V_LOAD_PROC
+     cdef int V_DEF_RES  
+-    cdef int V_DEBUG_MEM
+     cdef int V_SHOW_USE
+     cdef int V_IMAP    
+     cdef int V_PROMPT  
+@@ -115,6 +114,8 @@
+         napoly *n
+         int s
+ 
++    ctypedef struct ring "ip_sring"
++
+     ctypedef struct n_Procs_s:
+ 
+         number* nDiv(number *, number *)
+@@ -127,7 +128,7 @@
+         number*  (*nPar)(int i)
+         int     (*nParDeg)(number* n)
+         int     (*nSize)(number* n)
+-        int     (*nInt)(number* n)
++        int     (*n_Int)(number* n, ring *)
+         int     (*nDivComp)(number* a,number* b)
+         number*  (*nGetUnit)(number* a)
+         number*  (*nExtGcd)(number* a, number* b, number* *s, number* *t)
+@@ -212,7 +213,7 @@
+ 
+     # ideals
+ 
+-    ctypedef struct ideal "ip_sideal":
++    ctypedef struct ideal "sip_sideal":
+         poly **m # gens array
+         long rank # rank of module, 1 for ideals
+         int nrows # always 1
+@@ -679,7 +680,7 @@
+ 
+     # return int representation of number n
+     
+-    int nInt(number *n)
++    int n_Int(number *n, ring *r)
+ 
+     # general number division
+     
+@@ -727,7 +728,7 @@
+ 
+     # get numerator
+     
+-    number *nlGetNom(number *n, ring *r)
++    number *nlGetNumerator(number *n, ring *r)
+ 
+     # get denominator
+     
+@@ -759,7 +760,7 @@
+ 
+     # algebraic number from int
+     
+-    number *naInit(int)
++    number *naInit(int, ring *r)
+ 
+     # algebraic number destructor
+     
+@@ -779,11 +780,7 @@
+ 
+     # get exponent of i-th variable
+     
+-    int napGetExp(napoly *, int i)
+-
+-    # loop through algebraic number
+-    
+-    napoly *napIter(napoly *)
++    int napGetExpFrom(napoly *, int i, ring* r)
+ 
+     # normalize a number
+ 
+@@ -802,7 +799,7 @@
+ 
+ 
+     # init integer
+-    number *nrzInit(int i)
++    number *nrzInit(int i, ring *r)
+ 
+     # init ZmodN from GMP
+     number *nrnMapGMP(number *v)
+@@ -945,7 +942,6 @@
+     cdef int V_DEBUG_LIB
+     cdef int V_LOAD_PROC
+     cdef int V_DEF_RES
+-    cdef int V_DEBUG_MEM
+     cdef int V_SHOW_USE
+     cdef int V_IMAP
+     cdef int V_PROMPT
+@@ -962,7 +958,7 @@
+ 
+     int     IsCmd(char *n, int  tok)
+ 
+-    idhdl* ggetid(char *n, bint local)
++    idhdl* ggetid(char *n)
+ 
+     leftv * iiMake_proc(idhdl *pn, package *pack, leftv *sl)
+     
+diff -r 96e2020790df -r e72bba407895 sage/libs/singular/singular.pyx
+--- a/sage/libs/singular/singular.pyx	Mon Jun 28 23:27:14 2010 +0100
++++ b/sage/libs/singular/singular.pyx	Fri Mar 05 13:22:55 2010 +0000
+@@ -29,12 +29,12 @@
+ from sage.libs.singular.decl cimport SR_HDL, SR_INT, SR_TO_INT, singular_options
+ from sage.libs.singular.decl cimport On, Off, SW_USE_NTL, SW_USE_NTL_GCD_0, SW_USE_EZGCD, SW_USE_NTL_SORT, SW_USE_NTL_GCD_P
+ from sage.libs.singular.decl cimport napoly, lnumber, Sy_bit, OPT_REDSB, OPT_INTSTRATEGY, OPT_REDTAIL, OPT_REDTHROUGH
+-from sage.libs.singular.decl cimport nlGetNom, nlGetDenom, nlDelete, nlInit2gmp
++from sage.libs.singular.decl cimport nlGetNumerator, nlGetDenom, nlDelete, nlInit2gmp
+ from sage.libs.singular.decl cimport naIsOne, naIsOne, naIsZero, naPar, naInit, naAdd, naMult, naDelete, naMap00
+-from sage.libs.singular.decl cimport napGetCoeff, napGetExp, napIter
++from sage.libs.singular.decl cimport napGetCoeff, napGetExpFrom, pNext
+ from sage.libs.singular.decl cimport nrzInit, nr2mMapZp, nrnMapGMP
+ from sage.libs.singular.decl cimport siInit
+-from sage.libs.singular.decl cimport nInt, n_Init
++from sage.libs.singular.decl cimport n_Int, n_Init
+ from sage.libs.singular.decl cimport rChangeCurrRing
+ 
+ from sage.rings.rational_field import RationalField
+@@ -79,11 +79,11 @@
+     ##  structures aligned on 4 byte boundaries and therefor have last bit  zero.
+     ##  (The second bit is reserved as tag to allow extensions of  this  scheme.)
+     ##  Using immediates as pointers and dereferencing them gives address errors.
+-    nom = nlGetNom(n, _ring)
++    nom = nlGetNumerator(n, _ring)
+     mpz_init(nom_z)
+ 
+     if (SR_HDL(nom) & SR_INT): mpz_set_si(nom_z, SR_TO_INT(nom))
+-    else: mpz_set(nom_z,&nom.z)
++    else: mpz_set(nom_z,nom.z)
+ 
+     mpq_set_num(_z,nom_z)
+     nlDelete(&nom,_ring)
+@@ -93,7 +93,7 @@
+     mpz_init(denom_z)
+ 
+     if (SR_HDL(denom) & SR_INT): mpz_set_si(denom_z, SR_TO_INT(denom))
+-    else: mpz_set(denom_z,&denom.z)
++    else: mpz_set(denom_z,denom.z)
+ 
+     mpq_set_den(_z, denom_z)
+     nlDelete(&denom,_ring)
+@@ -154,13 +154,13 @@
+ 
+     while z:
+         c = cache.objectptr.initi(c,<long>napGetCoeff(z))
+-        e = napGetExp(z,1)
++        e = napGetExpFrom(z,1, _ring)
+         if e == 0:
+             ret = cache.objectptr.add(ret, c, ret)
+         else:
+             a = ( e * cache.objectptr.sage_generator() ) % order
+             ret = cache.objectptr.axpy(ret, c, a, ret)
+-        z = napIter(z)
++        z = <napoly*>pNext(<poly*>z)
+     return (<FFgivE>cache._zero_element)._new_c(ret)
+ 
+ cdef FFgf2eE si2sa_GFqNTLGF2E(number *n, ring *_ring, FiniteField_ntl_gf2e base):
+@@ -191,9 +191,9 @@
+ 
+     while z:
+         c = <long>napGetCoeff(z)
+-        e = napGetExp(z,1)
++        e = napGetExpFrom(z,1, _ring)
+         ret += c * a**e
+-        z = napIter(z)
++        z = <napoly*>pNext(<poly*>z)
+     return ret
+ 
+ cdef object si2sa_GFqPari(number *n, ring *_ring, object base):
+@@ -224,12 +224,12 @@
+ 
+     while z:
+         c = <long>napGetCoeff(z)
+-        e = napGetExp(z,1)
++        e = napGetExpFrom(z,1, _ring)
+         if e == 0:
+             ret = ret + c
+         elif c != 0:
+             ret = ret  + c * a**e 
+-        z = napIter(z)
++        z = <napoly*>pNext(<poly*>z)
+     return base(ret)
+ 
+ cdef object si2sa_NF(number *n, ring *_ring, object base):
+@@ -262,12 +262,12 @@
+     while z:
+         c = napGetCoeff(z)
+         coeff = si2sa_QQ(c, _ring)
+-        e = napGetExp(z,1)
++        e = napGetExpFrom(z,1, _ring)
+         if e == 0:
+             ret = ret + coeff
+         elif coeff != 0:
+             ret = ret  + coeff * a**e 
+-        z = napIter(z)
++        z = <napoly*>pNext(<poly*>z)
+     return base(ret)
+ 
+ cdef inline object si2sa_ZZmod(number *n, ring *_ring, object base):
+@@ -314,7 +314,7 @@
+         ret.set_from_mpz(<__mpz_struct*>n)
+         return base(ret)
+ 
+-    return base(_ring.cf.nInt(n))
++    return base(_ring.cf.n_Int(n,_ring))
+ 
+ cdef number *sa2si_QQ(Rational r, ring *_ring):
+     """
+@@ -343,11 +343,11 @@
+ 
+     a = naPar(1)
+ 
+-    apow1 = naInit(1)
+-    n1 = naInit(0)
++    apow1 = naInit(1, _ring)
++    n1 = naInit(0, _ring)
+ 
+     while quo!=0:
+-        coeff = naInit(quo%b)
++        coeff = naInit(quo%b, _ring)
+ 
+         if not naIsZero(coeff):
+             n2 = naAdd( naMult(coeff, apow1),  n1)
+@@ -376,12 +376,12 @@
+     cdef GF2X_c rep = GF2E_rep(elem.x)
+ 
+     if GF2X_deg(rep) >= 1:
+-        n1 = naInit(0)
++        n1 = naInit(0, _ring)
+         a = naPar(1)
+-        apow1 = naInit(1)
++        apow1 = naInit(1, _ring)
+ 
+         for i from 0 <= i <= GF2X_deg(rep):
+-            coeff = naInit(GF2_conv_to_long(GF2X_coeff(rep,i)))
++            coeff = naInit(GF2_conv_to_long(GF2X_coeff(rep,i)), _ring)
+ 
+             if not naIsZero(coeff):
+                 n2 = naAdd( naMult(coeff, apow1),  n1)
+@@ -397,7 +397,7 @@
+         naDelete(&apow1, _ring)
+         naDelete(&a, _ring)
+     else:
+-       n1 = naInit(GF2_conv_to_long(GF2X_coeff(rep,0)))
++       n1 = naInit(GF2_conv_to_long(GF2X_coeff(rep,0)), _ring)
+ 
+     return n1
+ 
+@@ -413,12 +413,12 @@
+ 
+ 
+     if len(elem) > 1:
+-        n1 = naInit(0)
++        n1 = naInit(0, _ring)
+         a = naPar(1)
+-        apow1 = naInit(1)
++        apow1 = naInit(1, _ring)
+ 
+         for i from 0 <= i < len(elem):
+-            coeff = naInit(int(elem[i]))
++            coeff = naInit(int(elem[i]), _ring)
+ 
+             if not naIsZero(coeff):
+                 n2 = naAdd( naMult(coeff, apow1),  n1)
+@@ -434,7 +434,7 @@
+         naDelete(&apow1, _ring)
+         naDelete(&a, _ring)
+     else:
+-        n1 = naInit(int(elem))
++        n1 = naInit(int(elem), _ring)
+ 
+     return n1
+ 
+@@ -448,9 +448,9 @@
+ 
+     elem = list(elem)
+ 
+-    n1 = naInit(0)
++    n1 = naInit(0, _ring)
+     a = naPar(1)
+-    apow1 = naInit(1)
++    apow1 = naInit(1, _ring)
+ 
+     for i from 0 <= i < len(elem):
+         nlCoeff = nlInit2gmp( mpq_numref((<Rational>elem[i]).value), mpq_denref((<Rational>elem[i]).value) )
+@@ -486,7 +486,7 @@
+         sage: P(12345678901234567890) + 2 - 2
+         12345678901234567890
+     """
+-    cdef number *n = nrzInit(0)
++    cdef number *n = nrzInit(0, _ring)
+     mpz_set(<__mpz_struct*>n, d.value)
+     return <number*>n
+ 
+@@ -536,7 +536,7 @@
+ 
+ cdef object si2sa(number *n, ring *_ring, object base):
+     if PY_TYPE_CHECK(base, FiniteField_prime_modn):
+-        return base(nInt(n))
++        return base(n_Int(n, _ring))
+ 
+     elif PY_TYPE_CHECK(base, RationalField):
+         return si2sa_QQ(n,_ring)
+@@ -558,7 +558,7 @@
+ 
+     elif PY_TYPE_CHECK(base, IntegerModRing_generic):
+         if _ring.ringtype == 0:
+-            return base(nInt(n))
++            return base(n_Int(n, _ring))
+         return si2sa_ZZmod(n, _ring, base)
+ 
+     else:
+diff -r 96e2020790df -r e72bba407895 sage/rings/polynomial/multi_polynomial_libsingular.pyx
+--- a/sage/rings/polynomial/multi_polynomial_libsingular.pyx	Mon Jun 28 23:27:14 2010 +0100
++++ b/sage/rings/polynomial/multi_polynomial_libsingular.pyx	Fri Mar 05 13:22:55 2010 +0000
+@@ -3609,7 +3609,6 @@
+ 
+         delete(iv)
+         id_Delete(&I,_ring)
+-        p_Delete(&ptemp,_ring)
+         
+         return F
+ 
+@@ -3923,8 +3922,8 @@
+         gcd = singclap_gcd(p_Copy(self._poly, _ring), p_Copy(_g._poly, _ring))
+         prod = pp_Mult_qq(self._poly, _g._poly, _ring)
+         ret = singclap_pdivide(prod , gcd )
+-        p_Delete(&prod, _ring)
+-        p_Delete(&gcd, _ring)
++        p_Delete(&prod, _ring) 
++        p_Delete(&gcd, _ring) 
+         if count >= 20:
+             _sig_off
+         return new_MP(self._parent, ret)
+@@ -4333,7 +4332,7 @@
+         cdef int count = singular_polynomial_length_bounded(self._poly,20)+singular_polynomial_length_bounded(other._poly,20)
+         if count >= 20:
+             _sig_on
+-        rt =  singclap_resultant(self._poly, other._poly, (<MPolynomial_libsingular>variable)._poly )
++        rt =  singclap_resultant(self._poly, other._poly,(<MPolynomial_libsingular>variable)._poly )
+         if count >= 20:
+             _sig_off
+         return new_MP(self._parent, rt)
+diff -r 96e2020790df -r e72bba407895 sage/rings/polynomial/toy_buchberger.py
+--- a/sage/rings/polynomial/toy_buchberger.py	Mon Jun 28 23:27:14 2010 +0100
++++ b/sage/rings/polynomial/toy_buchberger.py	Fri Mar 05 13:22:55 2010 +0000
+@@ -426,8 +426,8 @@
+     Q = set(Q)
+     while True:
+         Qbar = set(Q)
+-        for p in Qbar:
+-            p = Q.pop()
++        for p in sorted(Qbar):
++            Q.remove(p)
+             h = p.reduce(Q)
+             if h!=0:
+                 Q.add(h)
+diff -r 96e2020790df -r e72bba407895 sage/rings/polynomial/toy_d_basis.py
+--- a/sage/rings/polynomial/toy_d_basis.py	Mon Jun 28 23:27:14 2010 +0100
++++ b/sage/rings/polynomial/toy_d_basis.py	Fri Mar 05 13:22:55 2010 +0000
+@@ -280,11 +280,11 @@
+         sage: G = [f, fx, fy]
+         sage: B = set(filter(lambda (x,y): x!=y, [(f1,f2) for f1 in G for f2 in G]))
+         sage: select(B)
+-        (3*x^2 + 7, x^3 - y^2 + 7*x - y + 1)
++        (-2*y - 1, 3*x^2 + 7)
+     """
+     min_d = 2**20
+     min_pair = 0,0
+-    for fi,fj in P:
++    for fi,fj in sorted(P):
+         d = fi.parent().monomial_lcm(fi.lm(),fj.lm()).total_degree()
+         if d < min_d:
+             min_d = d
diff --git a/sci-mathematics/sage/files/sage.svg.bz2 b/sci-mathematics/sage/files/sage.svg.bz2
new file mode 100644
index 0000000..ab7c684
--- /dev/null
+++ b/sci-mathematics/sage/files/sage.svg.bz2
diff --git a/sci-mathematics/sage/files/trac-9221-matplotlib-update.patch b/sci-mathematics/sage/files/trac-9221-matplotlib-update.patch
new file mode 100644
index 0000000..093eca9
--- /dev/null
+++ b/sci-mathematics/sage/files/trac-9221-matplotlib-update.patch
@@ -0,0 +1,61 @@
+# HG changeset patch
+# User Jason Grout <jason.grout@drake.edu>
+# Date 1281801383 25200
+# Node ID 64ca3b397c20b16c157fefd65c4c87a352e76a31
+# Parent  5b338f2e484f2065d3d30d47bc204d6e9ed13d12
+#9221: Update the way axes labels are calculated and number of colormaps for matplotlib 1.0
+
+diff -r 5b338f2e484f -r 64ca3b397c20 sage/plot/colors.py
+--- a/sage/plot/colors.py	Thu Aug 05 03:35:44 2010 -0700
++++ b/sage/plot/colors.py	Sat Aug 14 08:56:23 2010 -0700
+@@ -1230,7 +1230,7 @@
+             0
+             sage: maps.load_maps()
+             sage: len(maps.maps)
+-            116
++            134
+         """
+         global cm
+         if not cm:
+@@ -1274,7 +1274,7 @@
+             sage: from sage.plot.colors import Colormaps
+             sage: maps = Colormaps()
+             sage: len(maps)
+-            116
++            134
+         """
+         self.load_maps()
+         return len(self.maps)
+diff -r 5b338f2e484f -r 64ca3b397c20 sage/plot/plot.py
+--- a/sage/plot/plot.py	Thu Aug 05 03:35:44 2010 -0700
++++ b/sage/plot/plot.py	Sat Aug 14 08:56:23 2010 -0700
+@@ -1861,25 +1861,25 @@
+                 # We set the label positions according to where we are
+                 # drawing the axes.
+                 if xaxis=='bottom':
+-                    yaxis_labely=1
++                    yaxis_labely=subplot.get_ylim()[1]
+                     yaxis_labeloffset=8
+                     yaxis_vert='bottom'
+                     xaxis_labely=0
+                     xaxis_vert='baseline'
+                 else:
+-                    yaxis_labely=0
++                    yaxis_labely=subplot.get_ylim()[0]
+                     yaxis_labeloffset=-8
+                     yaxis_vert='top'
+                     xaxis_labely=1
+                     xaxis_vert='top'
+ 
+                 if yaxis=='left':
+-                    xaxis_labelx=1
++                    xaxis_labelx=subplot.get_xlim()[1]
+                     xaxis_labeloffset=8
+                     xaxis_horiz='left'
+                     yaxis_labelx=0
+                 else:
+-                    xaxis_labelx=0
++                    xaxis_labelx=subplot.get_xlim()[0]
+                     xaxis_labeloffset=-8
+                     xaxis_horiz='right'
+                     yaxis_labelx=1
diff --git a/sci-mathematics/sage/files/trac_9567-cycle_basis.patch b/sci-mathematics/sage/files/trac_9567-cycle_basis.patch
new file mode 100644
index 0000000..1f24b5c
--- /dev/null
+++ b/sci-mathematics/sage/files/trac_9567-cycle_basis.patch
@@ -0,0 +1,84 @@
+# HG changeset patch
+# User Nathann Cohen <nathann.cohen@gmail.com>
+# Date 1281583915 -28800
+# Node ID 3bab2e5f2a633d4a8dafc234f1f9ac1efcc97f44
+# Parent  cbafe93273bb7d6009768655eab131653b6a8449
+trac 9567 -- Adds the method Graph.cycle_basis
+
+diff -r cbafe93273bb -r 3bab2e5f2a63 sage/graphs/generic_graph.py
+--- a/sage/graphs/generic_graph.py	Mon Aug 09 10:43:07 2010 -0600
++++ b/sage/graphs/generic_graph.py	Thu Aug 12 11:31:55 2010 +0800
+@@ -2122,6 +2122,64 @@
+             M[index,index]+=1
+             return abs(M.determinant())   
+ 
++    def cycle_basis(self):
++        r"""
++        Returns a list of cycles which form a basis of the cycle space
++        of ``self``.
++
++        A basis of cycles of a graph is a minimal collection of cycles
++        (considered as sets of edges) such that the edge set of any
++        cycle in the graph can be written as a `Z/2Z` sum of the
++        cycles in the basis.
++
++        OUTPUT:
++
++        A list of lists, each of them representing the vertices of a
++        cycle in a basis.
++
++        ALGORITHM:
++
++        Uses the NetworkX library.
++
++        EXAMPLE:
++
++        A cycle basis in Petersen's Graph ::
++
++            sage: g = graphs.PetersenGraph()
++            sage: g.cycle_basis()
++            [[1, 2, 7, 5, 0], [8, 3, 2, 7, 5], [4, 3, 2, 7, 5, 0], [4, 9, 7, 5, 0], [8, 6, 9, 7, 5], [1, 6, 9, 7, 5, 0]]
++
++        Checking the given cycles are algebraically free::
++
++            sage: g = graphs.RandomGNP(30,.4)
++            sage: basis = g.cycle_basis()
++
++        Building the space of (directed) edges over `Z/2Z`. On the way,
++        building a dictionary associating an unique vector to each
++        undirected edge::
++            
++            sage: m = g.size()
++            sage: edge_space = VectorSpace(FiniteField(2),m)
++            sage: edge_vector = dict( zip( g.edges(labels = False), edge_space.basis() ) )
++            sage: for (u,v),vec in edge_vector.items():
++            ...      edge_vector[(v,u)] = vec
++
++        Defining a lambda function associating a vector to the
++        vertices of a cycle::
++
++            sage: vertices_to_edges = lambda x : zip( x, x[1:] + [x[0]] )
++            sage: cycle_to_vector = lambda x : sum( edge_vector[e] for e in vertices_to_edges(x) )
++
++        Finally checking the cycles are a free set::
++
++            sage: basis_as_vectors = map( cycle_to_vector, basis )
++            sage: edge_space.span(basis_as_vectors).rank() == len(basis)
++            True
++        """
++
++        import networkx
++        return networkx.cycle_basis(self.networkx_graph(copy=False))
++
+     def minimum_outdegree_orientation(self, use_edge_labels=False, solver=None, verbose=0):
+         r"""
+         Returns a DiGraph which is an orientation with the smallest
+@@ -2230,7 +2288,7 @@
+ 
+         O.delete_edges(edges)
+ 
+-        return O        
++        return O
+ 
+     ### Planarity
+ 
diff --git a/sci-mathematics/sage/files/trac_9567-networkx-1.2.patch b/sci-mathematics/sage/files/trac_9567-networkx-1.2.patch
new file mode 100644
index 0000000..51ba3fb
--- /dev/null
+++ b/sci-mathematics/sage/files/trac_9567-networkx-1.2.patch
@@ -0,0 +1,329 @@
+# HG changeset patch
+# User Ben Edwards <bedwards@cs.unm.edu>
+# Date 1281372187 21600
+# Node ID 2f4945743e05e93fdbae5ec75777060bea4a6670
+# Parent  5b338f2e484f2065d3d30d47bc204d6e9ed13d12
+trac 9567: Updates to sage to interface with new version of networkx(1.2)
+
+This also includes several changes to the sage graph API to return
+keyed dictionaries instead of lists, as this is preferred in many
+situations.
+
+diff -r 5b338f2e484f -r 2f4945743e05 sage/graphs/generic_graph.py
+--- a/sage/graphs/generic_graph.py	Thu Aug 05 03:35:44 2010 -0700
++++ b/sage/graphs/generic_graph.py	Mon Aug 09 10:43:07 2010 -0600
+@@ -8478,8 +8478,8 @@
+     
+     def cluster_triangles(self, nbunch=None, with_labels=False):
+         r"""
+-        Returns the number of triangles for nbunch of vertices as an
+-        ordered list.
++        Returns the number of triangles for nbunch of vertices as a
++        dictionary keyed by vertex.
+         
+         The clustering coefficient of a graph is the fraction of possible
+         triangles that are triangles, `c_i = triangles_i /
+@@ -8494,9 +8494,6 @@
+         -  ``nbunch`` - The vertices to inspect. If
+            nbunch=None, returns data for all vertices in the graph
+         
+-        -  ``with_labels`` - (boolean) default False
+-           returns list as above True returns dict keyed by vertex labels.
+-        
+         
+         REFERENCE:
+ 
+@@ -8506,15 +8503,15 @@
+         
+         EXAMPLES::
+         
++            sage: (graphs.FruchtGraph()).cluster_triangles().values()
++            [1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0]
+             sage: (graphs.FruchtGraph()).cluster_triangles()
+-            [1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0]
+-            sage: (graphs.FruchtGraph()).cluster_triangles(with_labels=True)
+             {0: 1, 1: 1, 2: 0, 3: 1, 4: 1, 5: 1, 6: 1, 7: 1, 8: 0, 9: 1, 10: 1, 11: 0}
+             sage: (graphs.FruchtGraph()).cluster_triangles(nbunch=[0,1,2])
+-            [1, 1, 0]
++            {0: 1, 1: 1, 2: 0}
+         """
+         import networkx
+-        return networkx.triangles(self.networkx_graph(copy=False), nbunch, with_labels)
++        return networkx.triangles(self.networkx_graph(copy=False), nbunch)
+         
+     def clustering_average(self):
+         r"""
+@@ -8541,10 +8538,10 @@
+         import networkx
+         return networkx.average_clustering(self.networkx_graph(copy=False))
+         
+-    def clustering_coeff(self, nbunch=None, with_labels=False, weights=False):
+-        r"""
+-        Returns the clustering coefficient for each vertex in nbunch as an
+-        ordered list.
++    def clustering_coeff(self, nbunch=None, weights=False):
++        r"""
++        Returns the clustering coefficient for each vertex in nbunch as a
++        dictionary keyed by vertex.
+         
+         The clustering coefficient of a graph is the fraction of possible
+         triangles that are triangles, `c_i = triangles_i /
+@@ -8558,9 +8555,6 @@
+         -  ``nbunch`` - the vertices to inspect (default
+            None returns data on all vertices in graph)
+         
+-        -  ``with_labels`` - (boolean) default False
+-           returns list as above True returns dict keyed by vertex labels.
+-        
+         -  ``weights`` - default is False. If both
+            with_labels and weights are True, then returns a clustering
+            coefficient dict and a dict of weights based on degree. Weights are
+@@ -8576,19 +8570,19 @@
+         
+         EXAMPLES::
+         
++            sage: (graphs.FruchtGraph()).clustering_coeff().values()
++            [0.33333333333333331, 0.33333333333333331, 0.0, 0.33333333333333331, 0.33333333333333331, 0.33333333333333331, 0.33333333333333331, 0.33333333333333331, 0.0, 0.33333333333333331, 0.33333333333333331, 0.0]
+             sage: (graphs.FruchtGraph()).clustering_coeff()
+-            [0.33333333333333331, 0.33333333333333331, 0.0, 0.33333333333333331, 0.33333333333333331, 0.33333333333333331, 0.33333333333333331, 0.33333333333333331, 0.0, 0.33333333333333331, 0.33333333333333331, 0.0]
+-            sage: (graphs.FruchtGraph()).clustering_coeff(with_labels=True)
+             {0: 0.33333333333333331, 1: 0.33333333333333331, 2: 0.0, 3: 0.33333333333333331, 4: 0.33333333333333331, 5: 0.33333333333333331, 6: 0.33333333333333331, 7: 0.33333333333333331, 8: 0.0, 9: 0.33333333333333331, 10: 0.33333333333333331, 11: 0.0}
+-            sage: (graphs.FruchtGraph()).clustering_coeff(with_labels=True,weights=True)
++            sage: (graphs.FruchtGraph()).clustering_coeff(weights=True)
+             ({0: 0.33333333333333331, 1: 0.33333333333333331, 2: 0.0, 3: 0.33333333333333331, 4: 0.33333333333333331, 5: 0.33333333333333331, 6: 0.33333333333333331, 7: 0.33333333333333331, 8: 0.0, 9: 0.33333333333333331, 10: 0.33333333333333331, 11: 0.0}, {0: 0.083333333333333329, 1: 0.083333333333333329, 2: 0.083333333333333329, 3: 0.083333333333333329, 4: 0.083333333333333329, 5: 0.083333333333333329, 6: 0.083333333333333329, 7: 0.083333333333333329, 8: 0.083333333333333329, 9: 0.083333333333333329, 10: 0.083333333333333329, 11: 0.083333333333333329})
+             sage: (graphs.FruchtGraph()).clustering_coeff(nbunch=[0,1,2])
+-            [0.33333333333333331, 0.33333333333333331, 0.0]
+-            sage: (graphs.FruchtGraph()).clustering_coeff(nbunch=[0,1,2],with_labels=True,weights=True)
++            {0: 0.33333333333333331, 1: 0.33333333333333331, 2: 0.0}
++            sage: (graphs.FruchtGraph()).clustering_coeff(nbunch=[0,1,2],weights=True)
+             ({0: 0.33333333333333331, 1: 0.33333333333333331, 2: 0.0}, {0: 0.33333333333333331, 1: 0.33333333333333331, 2: 0.33333333333333331})
+         """
+         import networkx
+-        return networkx.clustering(self.networkx_graph(copy=False), nbunch, with_labels, weights)
++        return networkx.clustering(self.networkx_graph(copy=False), nbunch, weights)
+         
+     def cluster_transitivity(self):
+         r"""
+diff -r 5b338f2e484f -r 2f4945743e05 sage/graphs/graph.py
+--- a/sage/graphs/graph.py	Thu Aug 05 03:35:44 2010 -0700
++++ b/sage/graphs/graph.py	Mon Aug 09 10:43:07 2010 -0600
+@@ -2531,7 +2531,7 @@
+             sage: (graphs.ChvatalGraph()).centrality_betweenness()
+             {0: 0.069696969696969688, 1: 0.069696969696969688, 2: 0.060606060606060601, 3: 0.060606060606060601, 4: 0.069696969696969688, 5: 0.069696969696969688, 6: 0.060606060606060601, 7: 0.060606060606060601, 8: 0.060606060606060601, 9: 0.060606060606060601, 10: 0.060606060606060601, 11: 0.060606060606060601}
+             sage: (graphs.ChvatalGraph()).centrality_betweenness(normalized=False)
+-            {0: 7.6666666666666661, 1: 7.6666666666666661, 2: 6.6666666666666661, 3: 6.6666666666666661, 4: 7.6666666666666661, 5: 7.6666666666666661, 6: 6.6666666666666661, 7: 6.6666666666666661, 8: 6.6666666666666661, 9: 6.6666666666666661, 10: 6.6666666666666661, 11: 6.6666666666666661}
++            {0: 3.833333333333333, 1: 3.833333333333333, 2: 3.333333333333333, 3: 3.333333333333333, 4: 3.833333333333333, 5: 3.833333333333333, 6: 3.333333333333333, 7: 3.333333333333333, 8: 3.333333333333333, 9: 3.333333333333333, 10: 3.333333333333333, 11: 3.333333333333333}
+             sage: D = DiGraph({0:[1,2,3], 1:[2], 3:[0,1]})
+             sage: D.show(figsize=[2,2])
+             sage: D = D.to_undirected()
+@@ -2573,7 +2573,10 @@
+             1.0
+         """
+         import networkx
+-        return networkx.degree_centrality(self.networkx_graph(copy=False), v)
++        if v==None:
++            return networkx.degree_centrality(self.networkx_graph(copy=False))
++        else:
++            return networkx.degree_centrality(self.networkx_graph(copy=False))[v]
+             
+     def centrality_closeness(self, v=None):
+         r"""
+@@ -2870,10 +2873,11 @@
+         else:
+             raise NotImplementedError("Only 'networkx' and 'cliquer' are supported.")
+ 
+-    def cliques_number_of(self, vertices=None, cliques=None, with_labels=False):
++    def cliques_number_of(self, vertices=None, cliques=None):
+         """
+-        Returns a list of the number of maximal cliques containing each
+-        vertex. (Returns a single value if only one input vertex).
++        Returns a dictionary of the number of maximal cliques containing each
++        vertex, keyed by vertex. (Returns a single value if
++        only one input vertex).
+         
+         .. NOTE::
+         
+@@ -2885,9 +2889,6 @@
+         -  ``vertices`` - the vertices to inspect (default is
+            entire graph)
+         
+-        -  ``with_labels`` - (boolean) default False returns
+-           list as above True returns a dictionary keyed by vertex labels
+-        
+         -  ``cliques`` - list of cliques (if already
+            computed)
+         
+@@ -2896,14 +2897,14 @@
+         
+             sage: C = Graph('DJ{')
+             sage: C.cliques_number_of()
+-            [1, 1, 1, 1, 2]
++            {0: 1, 1: 1, 2: 1, 3: 1, 4: 2}
+             sage: E = C.cliques_maximal()
+             sage: E
+             [[4, 0], [4, 1, 2, 3]]
+             sage: C.cliques_number_of(cliques=E)
+-            [1, 1, 1, 1, 2]
++            {0: 1, 1: 1, 2: 1, 3: 1, 4: 2}
+             sage: F = graphs.Grid2dGraph(2,3)
+-            sage: X = F.cliques_number_of(with_labels=True)
++            sage: X = F.cliques_number_of()
+             sage: for v in sorted(X.iterkeys()):
+             ...    print v, X[v]
+             (0, 0) 2
+@@ -2913,14 +2914,14 @@
+             (1, 1) 3
+             (1, 2) 2
+             sage: F.cliques_number_of(vertices=[(0, 1), (1, 2)])
+-            [3, 2]
++            {(0, 1): 3, (1, 2): 2}
+             sage: G = Graph({0:[1,2,3], 1:[2], 3:[0,1]})
+             sage: G.show(figsize=[2,2])
+             sage: G.cliques_number_of()
+-            [2, 2, 1, 1]
++            {0: 2, 1: 2, 2: 1, 3: 1}
+         """
+         import networkx
+-        return networkx.number_of_cliques(self.networkx_graph(copy=False), vertices, cliques, with_labels)
++        return networkx.number_of_cliques(self.networkx_graph(copy=False), vertices, cliques)
+ 
+     def cliques_get_max_clique_graph(self, name=''):
+         """
+@@ -2996,12 +2997,13 @@
+         """
+         from sage.graphs.cliquer import max_clique
+         return max_clique(self.complement())
+-
++    
+     def cliques_vertex_clique_number(self, algorithm="cliquer", vertices=None,
+-                                     with_labels=False, cliques=None):
+-        r"""
+-        Returns a list of sizes of the largest maximal cliques containing
+-        each vertex. (Returns a single value if only one input vertex).
++                                     cliques=None):
++        """
++        Returns a dictionary of sizes of the largest maximal cliques containing
++        each vertex, keyed by vertex. (Returns a single value if only one
++        input vertex).
+         
+         .. NOTE::
+         
+@@ -3020,10 +3022,6 @@
+         -  ``vertices`` - the vertices to inspect (default is entire graph).
+            Ignored unless ``algorithm=='networkx'``.
+         
+-        -  ``with_labels`` - (boolean) default False returns list as above
+-           True returns a dictionary keyed by vertex labels. Ignored unless
+-           ``algorithm=='networkx'``.
+-        
+         -  ``cliques`` - list of cliques (if already computed).  Ignored unless
+            ``algorithm=='networkx'``.
+         
+@@ -3031,14 +3029,14 @@
+         
+             sage: C = Graph('DJ{')
+             sage: C.cliques_vertex_clique_number()
+-            [2, 4, 4, 4, 4]
++            {0: 2, 1: 4, 2: 4, 3: 4, 4: 4}
+             sage: E = C.cliques_maximal()
+             sage: E
+             [[4, 0], [4, 1, 2, 3]]
+             sage: C.cliques_vertex_clique_number(cliques=E,algorithm="networkx")
+-            [2, 4, 4, 4, 4]
++            {0: 2, 1: 4, 2: 4, 3: 4, 4: 4}
+             sage: F = graphs.Grid2dGraph(2,3)
+-            sage: X = F.cliques_vertex_clique_number(with_labels=True,algorithm="networkx")
++            sage: X = F.cliques_vertex_clique_number(algorithm="networkx")
+             sage: for v in sorted(X.iterkeys()):
+             ...    print v, X[v]
+             (0, 0) 2
+@@ -3048,11 +3046,11 @@
+             (1, 1) 2
+             (1, 2) 2
+             sage: F.cliques_vertex_clique_number(vertices=[(0, 1), (1, 2)])
+-            [2, 2]
++            {(0, 1): 2, (1, 2): 2}
+             sage: G = Graph({0:[1,2,3], 1:[2], 3:[0,1]})
+             sage: G.show(figsize=[2,2])
+             sage: G.cliques_vertex_clique_number()
+-            [3, 3, 3, 3]
++            {0: 3, 1: 3, 2: 3, 3: 3}
+ 
+         """
+ 
+@@ -3060,21 +3058,22 @@
+             from sage.graphs.cliquer import clique_number
+             if vertices==None:
+                 vertices=self
+-            value=[]
++            value={}
+             for v in vertices:
+-                value.append(1+clique_number(self.subgraph(self.neighbors(v))))
++                value[v] = 1+clique_number(self.subgraph(self.neighbors(v)))
+                 self.subgraph(self.neighbors(v)).plot()
+             return value
+         elif algorithm=="networkx":
+             import networkx
+-            return networkx.node_clique_number(self.networkx_graph(copy=False), vertices, with_labels, cliques)
++            return networkx.node_clique_number(self.networkx_graph(copy=False),vertices, cliques)
+         else:
+             raise NotImplementedError("Only 'networkx' and 'cliquer' are supported.")
+ 
+-    def cliques_containing_vertex(self, vertices=None, cliques=None, with_labels=False):
++    def cliques_containing_vertex(self, vertices=None, cliques=None):
+         """
+-        Returns the cliques containing each vertex, represented as a list
+-        of lists. (Returns a single list if only one input vertex).
++        Returns the cliques containing each vertex, represented as a dictionary
++        of lists of lists, keyed by vertex. (Returns a single list if only one
++        input vertex).
+         
+         .. NOTE::
+         
+@@ -3086,9 +3085,6 @@
+         -  ``vertices`` - the vertices to inspect (default is
+            entire graph)
+         
+-        -  ``with_labels`` - (boolean) default False returns
+-           list as above True returns a dictionary keyed by vertex labels
+-        
+         -  ``cliques`` - list of cliques (if already
+            computed)
+         
+@@ -3096,14 +3092,14 @@
+         
+             sage: C = Graph('DJ{')
+             sage: C.cliques_containing_vertex()
+-            [[[4, 0]], [[4, 1, 2, 3]], [[4, 1, 2, 3]], [[4, 1, 2, 3]], [[4, 0], [4, 1, 2, 3]]]
++            {0: [[4, 0]], 1: [[4, 1, 2, 3]], 2: [[4, 1, 2, 3]], 3: [[4, 1, 2, 3]], 4: [[4, 0], [4, 1, 2, 3]]}
+             sage: E = C.cliques_maximal()
+             sage: E
+             [[4, 0], [4, 1, 2, 3]]
+             sage: C.cliques_containing_vertex(cliques=E)
+-            [[[4, 0]], [[4, 1, 2, 3]], [[4, 1, 2, 3]], [[4, 1, 2, 3]], [[4, 0], [4, 1, 2, 3]]]
++            {0: [[4, 0]], 1: [[4, 1, 2, 3]], 2: [[4, 1, 2, 3]], 3: [[4, 1, 2, 3]], 4: [[4, 0], [4, 1, 2, 3]]}
+             sage: F = graphs.Grid2dGraph(2,3)
+-            sage: X = F.cliques_containing_vertex(with_labels=True)
++            sage: X = F.cliques_containing_vertex()
+             sage: for v in sorted(X.iterkeys()):
+             ...    print v, X[v]
+             (0, 0) [[(0, 1), (0, 0)], [(1, 0), (0, 0)]]
+@@ -3113,15 +3109,15 @@
+             (1, 1) [[(0, 1), (1, 1)], [(1, 2), (1, 1)], [(1, 0), (1, 1)]]
+             (1, 2) [[(1, 2), (0, 2)], [(1, 2), (1, 1)]]
+             sage: F.cliques_containing_vertex(vertices=[(0, 1), (1, 2)])
+-            [[[(0, 1), (0, 0)], [(0, 1), (0, 2)], [(0, 1), (1, 1)]], [[(1, 2), (0, 2)], [(1, 2), (1, 1)]]]
++            {(0, 1): [[(0, 1), (0, 0)], [(0, 1), (0, 2)], [(0, 1), (1, 1)]], (1, 2): [[(1, 2), (0, 2)], [(1, 2), (1, 1)]]}
+             sage: G = Graph({0:[1,2,3], 1:[2], 3:[0,1]})
+             sage: G.show(figsize=[2,2])
+             sage: G.cliques_containing_vertex()
+-            [[[0, 1, 2], [0, 1, 3]], [[0, 1, 2], [0, 1, 3]], [[0, 1, 2]], [[0, 1, 3]]]
++            {0: [[0, 1, 2], [0, 1, 3]], 1: [[0, 1, 2], [0, 1, 3]], 2: [[0, 1, 2]], 3: [[0, 1, 3]]}
+ 
+         """
+         import networkx
+-        return networkx.cliques_containing_node(self.networkx_graph(copy=False), vertices, cliques, with_labels)
++        return networkx.cliques_containing_node(self.networkx_graph(copy=False),vertices, cliques)
+ 
+     def clique_complex(self):
+         """
diff --git a/sci-mathematics/sage/files/trac_9808_numpy_doctest_change.patch b/sci-mathematics/sage/files/trac_9808_numpy_doctest_change.patch
new file mode 100644
index 0000000..ced1ac7
--- /dev/null
+++ b/sci-mathematics/sage/files/trac_9808_numpy_doctest_change.patch
@@ -0,0 +1,31 @@
+# HG changeset patch
+# User maldun <domors@gmx.net>
+# Date 1283560011 -7200
+# Node ID 257df6b32dae1ed68f2a0d68f2e93332eef2393f
+# Parent  5b338f2e484f2065d3d30d47bc204d6e9ed13d12
+Trac 9808: Updatet 2 outdated doctests in doc/en/faq/faq-usage.rst
+and sage/matrix/matrix1.pyx
+
+diff -r 5b338f2e484f -r 257df6b32dae doc/en/faq/faq-usage.rst
+--- a/doc/en/faq/faq-usage.rst	Thu Aug 05 03:35:44 2010 -0700
++++ b/doc/en/faq/faq-usage.rst	Sat Sep 04 02:26:51 2010 +0200
+@@ -339,7 +339,6 @@
+     sage: RealNumber = float; Integer = int
+     sage: from scipy import stats
+     sage: stats.ttest_ind(list([1,2,3,4,5]),list([2,3,4,5,.6]))
+-    doctest...DeprecationWarning...
+     (0.076752955645333687, 0.94070490247380478)
+     sage: stats.uniform(0,15).ppf([0.5,0.7])
+     array([  7.5,  10.5])
+diff -r 5b338f2e484f -r 257df6b32dae sage/matrix/matrix1.pyx
+--- a/sage/matrix/matrix1.pyx	Thu Aug 05 03:35:44 2010 -0700
++++ b/sage/matrix/matrix1.pyx	Sat Sep 04 02:26:51 2010 +0200
+@@ -446,7 +446,7 @@
+ 
+             sage: import numpy
+             sage: sorted(numpy.typecodes.items())
+-            [('All', '?bhilqpBHILQPfdgFDGSUVO'), ('AllFloat', 'fdgFDG'), ('AllInteger', 'bBhHiIlLqQpP'), ('Character', 'c'), ('Complex', 'FDG'), ('Float', 'fdg'), ('Integer', 'bhilqp'), ('UnsignedInteger', 'BHILQP')]
++            [('All', '?bhilqpBHILQPfdgFDGSUVOMm'), ('AllFloat', 'fdgFDG'), ('AllInteger', 'bBhHiIlLqQpP'), ('Character', 'c'), ('Complex', 'FDG'), ('Datetime', 'Mm'), ('Float', 'fdg'), ('Integer', 'bhilqp'), ('UnsignedInteger', 'BHILQP')]
+ 
+         Alternatively, numpy automatically calls this function (via
+         the magic :meth:`__array__` method) to convert Sage matrices
diff --git a/sci-mathematics/sage/sage-4.5.3.ebuild b/sci-mathematics/sage/sage-4.5.3.ebuild
new file mode 100644
index 0000000..195b3c6
--- /dev/null
+++ b/sci-mathematics/sage/sage-4.5.3.ebuild
@@ -0,0 +1,338 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+PYTHON_DEPEND="2:2.6"
+PYTHON_USE_WITH="sqlite"
+
+inherit distutils eutils flag-o-matic python
+
+MY_P="sage-${PV}"
+
+DESCRIPTION="Math software for algebra, geometry, number theory, cryptography and numerical computation"
+HOMEPAGE="http://www.sagemath.org"
+SRC_URI="mirror://sage/spkg/standard/${MY_P}.spkg -> ${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples latex testsuite X"
+
+CDEPEND="|| ( =dev-lang/python-2.6.4-r99
+	=dev-lang/python-2.6.5-r99 )
+	dev-libs/gmp
+	>=dev-libs/mpfr-2.4.2
+	>=dev-libs/ntl-5.5.2
+	>=dev-lisp/ecls-10.2.1[-unicode]
+	>=dev-python/numpy-1.4.1[lapack]
+	>=sci-mathematics/eclib-20100711
+	>=sci-mathematics/ecm-6.2.1
+	>=sci-libs/flint-1.5.0[ntl]
+	>=sci-libs/fplll-3.0.12
+	=sci-libs/givaro-3.2*
+	>=sci-libs/gsl-1.14
+	>=sci-libs/iml-1.0.1
+	>=sci-libs/libcliquer-1.2_p6
+	>=sci-libs/linbox-1.1.6[ntl,sage]
+	>=sci-libs/m4ri-20100701
+	>=sci-libs/mpfi-1.4
+	>=sci-libs/pynac-0.2.0_p5
+	>=sci-libs/symmetrica-2.0
+	>=sci-libs/zn_poly-0.9
+	>=sci-mathematics/glpk-4.43[gmp]
+	>=sci-mathematics/lcalc-1.23[pari]
+	>=sci-mathematics/pari-2.3.5[data,gmp]
+	>=sci-mathematics/polybori-0.6.5-r2[sage]
+	>=sci-mathematics/ratpoints-2.1.3
+	~sci-mathematics/sage-baselayout-${PV}[testsuite=]
+	~sci-mathematics/sage-clib-${PV}
+	~sci-mathematics/singular-3.1.1.4[libsingular]
+	media-libs/gd
+	media-libs/libpng
+	>=sys-libs/readline-6.0
+	sys-libs/zlib
+	virtual/cblas"
+
+DEPEND="${CDEPEND}
+	=dev-python/cython-0.12*"
+
+RDEPEND="${CDEPEND}
+	>=dev-lang/R-2.10.1[lapack,readline]
+	>=dev-python/cvxopt-0.9
+	>=dev-python/gdmodule-0.56
+	>=dev-python/ipython-0.9.1
+	>=dev-python/jinja-2.1.1
+	>=dev-python/matplotlib-1.0.0
+	~dev-python/mpmath-0.15
+	>=dev-python/networkx-1.2
+	~dev-python/pexpect-2.0
+	>=dev-python/pycrypto-2.1.0
+	>=dev-python/python-gnutls-1.1.4
+	>=dev-python/rpy-2.0.6
+	>=dev-python/sphinx-0.6.3
+	dev-python/sqlalchemy
+	~dev-python/sympy-0.6.6
+	>=media-gfx/tachyon-0.98
+	>=net-zope/zodb-3.7.0
+	>=sci-libs/cddlib-094f
+	=sci-libs/scipy-0.8*
+	>=sci-mathematics/flintqs-20070817_p4
+	>=sci-mathematics/gap-4.4.12
+	>=sci-mathematics/gap-guava-3.4
+	>=sci-mathematics/genus2reduction-0.3
+	>=sci-mathematics/gfan-0.4
+	>=sci-mathematics/cu2-20060223
+	>=sci-mathematics/cubex-20060128
+	>=sci-mathematics/dikcube-20070912_p12
+	~sci-mathematics/maxima-5.20.1[ecl]
+	>=sci-mathematics/mcube-20051209
+	>=sci-mathematics/optimal-20040603
+	>=sci-mathematics/palp-1.1
+	~sci-mathematics/sage-data-conway_polynomials-0.2
+	~sci-mathematics/sage-data-elliptic_curves-0.1
+	~sci-mathematics/sage-data-graphs-20070722_p1
+	~sci-mathematics/sage-data-polytopes_db-20100210
+	>=sci-mathematics/sage-doc-${PV}
+	~sci-mathematics/sage-extcode-${PV}
+	~sci-mathematics/sage-notebook-0.8.2
+	>=sci-mathematics/sympow-1.018.1_p8
+	examples? ( ~sci-mathematics/sage-examples-${PV} )
+	testsuite? (
+		~sci-mathematics/sage-doc-${PV}[html]
+		~sci-mathematics/sage-examples-${PV}
+	)
+	latex? ( ~dev-tex/sage-latex-2.2.5 )"
+
+# TODO: check if use flags are necessary
+
+src_prepare() {
+	# ATLAS independence
+	local cblaslibs=\'$(pkg-config --libs-only-l cblas | sed \
+		-e 's/^-l//' \
+		-e "s/ -l/\',\'/g" \
+		-e 's/,.pthread//g' \
+		-e "s:  ::")\'
+
+	############################################################################
+	# Fixes to Sage's build system
+	############################################################################
+
+	# Fix startup issue and python-2.6.5 problem
+	append-flags -fno-strict-aliasing -DNDEBUG
+
+	# fix build file to make it compile without other Sage components
+	epatch "${FILESDIR}"/${PN}-4.3.4-site-packages.patch
+
+	# add pari and gmp to everything.
+	sed -i "s:\['stdc++', 'ntl'\]:\['stdc++', 'ntl','pari','gmp'\]:g" setup.py \
+		|| die "failed to add pari and gmp everywhere"
+
+	# remove annoying std=c99 from a c++ file.
+	epatch "${FILESDIR}"/${PN}-4.4.4-extra-stdc99.patch
+
+	# Fix ecls bug for ppc see #308909. This has to be done before sed is applied to module_list.py
+	if use ppc ; then
+		epatch "${FILESDIR}"/${P}-ecls_ppc.patch
+	fi
+
+	# upgrade to numpy-1.4.1/scipy-0.8
+	epatch "${FILESDIR}"/trac_9808_numpy_doctest_change.patch
+
+	# use already installed csage
+	rm -rf c_lib || die "failed to remove c library directory"
+
+	# patch SAGE_LOCAL
+	sed -i "s:SAGE_LOCAL = SAGE_ROOT + '/local/':SAGE_LOCAL = os.environ['SAGE_LOCAL']:g" \
+		module_list.py setup.py || die "failed to patch SAGE_LOCAL"
+
+	# fix include paths
+	sed -i \
+		-e "s:SAGE_ROOT[[:space:]]*+[[:space:]]*\([\'\"]\)/local/include/\([^\1]*\)\1:SAGE_LOCAL + \1/include/\2\1:g" \
+		-e "s:sage/c_lib/include/:${EPREFIX}/usr/include/csage/:g" \
+		module_list.py || die "failed to patch paths for libraries"
+
+	sed -i "s:'%s/sage/sage/ext'%SAGE_DEVEL:'sage/ext':g" \
+		setup.py || die "failed to patch extensions path"
+
+	# fix png library name
+	sed -i "s:png12:$(libpng-config --libs | cut -dl -f2):g" \
+		module_list.py || die "failed to patch png library name"
+
+	# fix numpy path
+	sed -i "s:SAGE_ROOT+'/local/lib/python/site-packages/numpy/core/include':'$(python_get_sitedir)/numpy/core/include':g" \
+		module_list.py || die "failed to patch path for numpy include directory"
+
+	# fix cython path
+	sed -i "s:SAGE_LOCAL + '/lib/python/site-packages/Cython/Includes/':'$(python_get_sitedir)/Cython/Includes/':g" \
+		setup.py || die "failed to patch path for cython include directory"
+
+	# fix lcalc path
+	sed -i "s:include/lcalc/:include/Lfunction/:g" module_list.py \
+		|| die "failed to patch path for lcalc include directory"
+
+	# rebuild in place
+	sed -i "s:SAGE_DEVEL + 'sage/sage/ext/interpreters':'sage/ext/interpreters':g" \
+		setup.py || die "failed to patch interpreters path"
+
+	# fix include paths and CBLAS/ATLAS
+	sed -i \
+		-e "s:'%s/include/csage'%SAGE_LOCAL:'${EPREFIX}/usr/include/csage':g" \
+		-e "s:'%s/sage/sage/ext'%SAGE_DEVEL:'sage/ext':g" \
+		setup.py || die "failed to patch include paths"
+
+	sed -i \
+		-e "s:BLAS, BLAS2:${cblaslibs}:g" \
+		-e "s:,BLAS:,${cblaslibs}:g" \
+		module_list.py || die "failed to patch module_list.py for ATLAS"
+
+	# enable glpk
+	sed -i "s:is_package_installed('glpk'):True:g" module_list.py \
+		|| die "failed to enable glpk"
+
+	# TODO: why does Sage fail with linbox commentator ?
+
+	############################################################################
+	# Fixes to Sage itself
+	############################################################################
+
+	# gmp-5 compatibility - works with gmp-4.3 as well
+	sed -i "s:__GMP_BITS_PER_MP_LIMB:GMP_LIMB_BITS:g" sage/rings/integer.pyx \
+		|| die "failed to patch for gmp-5"
+
+	# run maxima with ecl
+	sed -i \
+		-e "s:maxima-noreadline:maxima -l ecl:g" \
+		-e "s:maxima --very-quiet:maxima -l ecl --very-quiet:g" \
+		sage/interfaces/maxima.py || die "failed to patch maxima commands"
+
+	# Uses singular internal copy of the factory header
+	sed -i "s:factory.h:singular/factory.h:" sage/libs/singular/singular-cdefs.pxi \
+		|| die "failed to patch factory header"""
+
+	# upgrade to matplotlib-1.0.0 as it is now marked stable
+	epatch "${FILESDIR}"/trac-9221-matplotlib-update.patch
+
+	# use delaunay from matplotlib (see ticket #6946)
+	epatch "${FILESDIR}"/${PN}-4.3.3-delaunay-from-matplotlib.patch
+
+	# use arpack from scipy (see also scipy ticket #231)
+	epatch "${FILESDIR}"/${PN}-4.3.3-arpack-from-scipy.patch
+
+	# Fix portage QA warning. Potentially prevent some leaking.
+	epatch "${FILESDIR}"/${PN}-4.4.2-flint.patch
+
+	sed -i "s:cblas(), atlas():${cblaslibs}:" sage/misc/cython.py \
+		|| die "failed to patch cython.py for ATLAS"
+
+	# patch for optional glpk
+	sed -i "s:\.\./\.\./local/include/glpk\.h:${EPREFIX}/usr/include/glpk.h:g" \
+		sage/numerical/mip_glpk.pxd || die "failed to patch mip_glpk.pxd"
+
+	sed -i "s:\.\./\.\./\.\./\.\./devel/sage/sage:..:g" \
+		sage/numerical/mip_glpk.pyx || die "failed to patch mip_glpk.pyx"
+
+	# Ticket #5155:
+
+	# save gap_stamp to directory where sage is able to write
+	sed -i "s:GAP_STAMP = '%s/local/bin/gap_stamp'%SAGE_ROOT:GAP_STAMP = '%s/gap_stamp'%DOT_SAGE:g" \
+		sage/interfaces/gap.py || die "patch to patch gap interface"
+
+	# fix qepcad paths
+	epatch "${FILESDIR}"/${PN}-4.5.1-fix-qepcad-path.patch
+
+	# fix save path (for testing only)
+	sed -i "s:save(w,'test'):save(w,tmp_filename('test')):g" \
+		sage/combinat/words/morphism.py || die "failed to patch path for save"
+
+	# Ticket #8898:
+
+	# make sure line endings are unix ones so as not to confuse python-2.6.5
+	edos2unix sage/libs/mpmath/ext_impl.pxd
+	edos2unix sage/libs/mpmath/ext_main.pyx
+	edos2unix sage/libs/mpmath/ext_main.pxd
+	edos2unix sage/libs/mpmath/ext_libmp.pyx
+
+	# replace SAGE_ROOT/local with SAGE_LOCAL
+	epatch "${FILESDIR}"/${PN}-4.5.1-fix-SAGE_LOCAL.patch
+
+	# patch path for saving sessions
+	sed -i "s:save_session('tmp_f', :save_session(tmp_f, :g" \
+		sage/misc/session.pyx || die "failed to patch session path"
+
+	# patch lie library path
+	sed -i "s:open(SAGE_LOCAL + 'lib/lie/INFO\.0'):open(SAGE_LOCAL + '/share/lie/INFO.0'):g" \
+		sage/interfaces/lie.py || die "failed to patch lie library path"
+
+	# Patch to singular info file shipped with sage-doc
+	sed -i "s:os.environ\[\"SAGE_LOCAL\"\]+\"/share/singular/\":os.environ\[\"SAGE_DOC\"\]+\"/\":g" \
+		sage/interfaces/singular.py || die "failed to patch singular.hlp path"
+
+	# fix test paths
+	sed -i \
+		-e "s:'my_animation.gif':tmp_filename('my_animation')+'.gif':g" \
+		-e "s:'wave.gif':tmp_filename('wave')+'.gif':g" \
+		-e "s:'wave0.sobj':tmp_filename('wave0')+'.sobj':g" \
+		-e "s:'wave1.sobj':tmp_filename('wave1')+'.sobj':g" \
+		sage/plot/animate.py
+
+	# do not forget to run distutils
+	distutils_src_prepare
+}
+
+src_configure() {
+	export SAGE_LOCAL="${EPREFIX}"/usr
+	export SAGE_ROOT="${EPREFIX}"/usr/share/sage
+	export SAGE_VERSION=${PV}
+
+	export MAKE=${MAKEOPTS}
+
+	# files are not built unless they are touched
+	find sage -name "*pyx" -exec touch '{}' \; \
+		|| die "failed to touch *pyx files"
+}
+
+src_install() {
+	distutils_src_install
+
+	if use testsuite ; then
+		# install testable sources and sources needed for testing
+		find sage ! \( -name "*.py" -o -name "*.pyx" -o -name "*.pxd" -o \
+			-name "*.pxi" \) -type f -delete \
+			|| die "failed to remove non-testable sources"
+
+		insinto "${SAGE_ROOT}"/devel/sage-main
+		doins -r sage || die
+	fi
+}
+
+pkg_postinst() {
+	einfo "If you use Sage's browser interface ('Sage Notebook') and experience"
+	einfo "an 'Internal Server Error' you should append the following line to"
+	einfo "your ~/.bashrc (replace firefox with your favorite browser and note"
+	einfo "that it your case it WILL NOT WORK with xdg-open):"
+	einfo ""
+	einfo "    export SAGE_BROWSER=/usr/bin/firefox"
+	einfo ""
+	einfo "Sage comes with the 'Standard' set of Sage Packages, i.e. those"
+	einfo "listed at: http://sagemath.org/packages/standard/ which are now"
+	einfo "already installed."
+	einfo "There are also some packages of the 'Optional' set (which consists"
+	einfo "of the these: http://sagemath.org/packages/optional/) available"
+	einfo "which may be installed with portage as usual."
+
+	if use testsuite ; then
+
+	einfo "You have installed Sage's testsuite. In order to test Sage run the"
+	einfo "following command in a directory where Sage may write to:"
+	einfo ""
+	einfo "    sage -testall"
+	einfo ""
+	einfo "Note that testing Sage may take more than 4 hours. If you want to"
+	einfo "compare your results look at the list of known failures:"
+	einfo ""
+	einfo "    http://github.com/cschwan/sage-on-gentoo/wiki/Known-test-failures"
+
+	fi
+}
diff --git a/sys-fs/afpfs-ng/Manifest b/sys-fs/afpfs-ng/Manifest
new file mode 100644
index 0000000..7be15d6
--- /dev/null
+++ b/sys-fs/afpfs-ng/Manifest
@@ -0,0 +1,2 @@
+DIST afpfs-ng-0.8.1.tar.bz2 344014 RMD160 39d3e50ce38df188a7c90448b20f7e428027dc43 SHA1 3686d4d752052ea8e98841fcae748cb469991dbb SHA256 688560de1cde57ab8d9e0ef7dc6436dbf0267fe8884f9014e50ff92b297b01a8
+EBUILD afpfs-ng-0.8.1.ebuild 794 RMD160 741e1be06a7924c2b3715e9100a0933f5adb1085 SHA1 98bcfebac26286812d3bd7581409e9424e169e9c SHA256 d1568e289aae6133c5092c5dc633d3adc57b7cb98693d5306e0b922bfd861963
diff --git a/sys-fs/afpfs-ng/afpfs-ng-0.8.1.ebuild b/sys-fs/afpfs-ng/afpfs-ng-0.8.1.ebuild
new file mode 100644
index 0000000..5905989
--- /dev/null
+++ b/sys-fs/afpfs-ng/afpfs-ng-0.8.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils autotools
+
+DESCRIPTION="An Apple Filing Protocol client implemented in FUSE"
+HOMEPAGE="http://sourceforge.net/projects/afpfs-ng/"
+SRC_URI="mirror://sourceforge/afpfs-ng/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/libgcrypt
+	sys-libs/readline
+	dev-libs/gmp
+	sys-fs/fuse"
+
+src_unpack() {
+	unpack "${A}"
+	cd ${S}
+	eautoreconf
+}
+
+src_install() {
+	dobin cmdline/.libs/afpcmd cmdline/.libs/afpgetstatus fuse/.libs/afpfsd fuse/.libs/mount_afp
+	dolib lib/.libs/libafpclient.{so.0.0.0,a}
+	dodoc COPYING AUTHORS ChangeLog docs/README docs/performance docs/FEATURES.txt docs/REPORTING-BUGS.txt
+	doman fuse/*.1 cmdline/*.1
+}