diff --git a/dev-tex/pythontex/Manifest b/dev-tex/pythontex/Manifest
new file mode 100644
index 0000000..e73dfec
--- /dev/null
+++ b/dev-tex/pythontex/Manifest
@@ -0,0 +1,2 @@
+DIST pythontex-0.14.tar.gz 9704671 SHA256 d26501386d313cc7a0375e4ea3bec61aed38abb059f09042c8e0e015e980bce4 SHA512 dc37e3ac112ace95d4ac253f51fe08074cf465537fa8e686637dd2342edb397e89a1e9ee1111fd6b93bcf4194b8bbbcb5cbcc5256d4c451809bf96bb28ae3db6 WHIRLPOOL 9a5106446b61f514b3575170abcba0b9cd6eb2c896c6a12174cd4ae1c01e442e7625cde2cab06b2828e3fc07f4fac9edca4388253c49e8952fb4ad7829355366
+DIST pythontex-0.15.tar.gz 1765050 SHA256 5020ca647239368d38e64787cd41b43922677a80338cc7f61ab3786fe20e2fa6 SHA512 cbca1dc9208028bfe1a8ab47f6c145ec2bd0af0ad2c733ef80e1f9ee77199670c8701d30e7634207064dd073e5456bb1d1853ce4e1729f64c44967a52111b0d8 WHIRLPOOL 1e912201d5644dedb8fbe093e85bb056c8f677ffbdcd1888deedcec346b9b8a9791a127ee2f60f825170d3d323586e12c0a8af902edeec0f97a1d96ae0217d80
diff --git a/dev-tex/pythontex/metadata.xml b/dev-tex/pythontex/metadata.xml
new file mode 100644
index 0000000..17dc4a8
--- /dev/null
+++ b/dev-tex/pythontex/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <use>
+    <flag name="highlighting">PLEASE FIX MY DESCRIPTION</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">gpoore/pythontex</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-tex/pythontex/pythontex-0.14-r1.ebuild b/dev-tex/pythontex/pythontex-0.14-r1.ebuild
new file mode 100644
index 0000000..33ba193
--- /dev/null
+++ b/dev-tex/pythontex/pythontex-0.14-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit latex-package python-r1
+
+DESCRIPTION="Fast Access to Python from within LaTeX"
+HOMEPAGE="https://github.com/gpoore/pythontex"
+SRC_URI="https://github.com/gpoore/pythontex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LPPL-1.3 BSD"
+KEYWORDS="~amd64"
+IUSE="highlighting"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-texlive/texlive-latex"
+RDEPEND="${DEPEND}
+	dev-texlive/texlive-latex
+	highlighting? ( dev-python/pygments[${PYTHON_USEDEP}] )"
+
+TEXMF=/usr/share/texmf-site
+
+src_compile() {
+	cd ${PN} || die
+	ebegin "Compiling ${PN}"
+	rm ${PN}.sty || die
+	VARTEXFONTS="${T}/fonts" latex ${PN}.ins extra || die
+	eend
+}
+
+src_install() {
+	dodoc ${PN}/README "${S}"/*rst ${PN}_quickstart/*
+
+	cd ${PN} || die
+
+	installation() {
+		if python_is_python3; then
+			python_domodule {de,}${PN}3.py
+		else
+			python_domodule {de,}${PN}2.py
+		fi
+		python_domodule ${PN}_{engines,utils}.py
+		python_doscript {de,}${PN}.py syncpdb.py
+		python_optimize
+	}
+	python_foreach_impl installation
+
+	latex-package_src_doinstall dtx ins sty
+}
diff --git a/dev-tex/pythontex/pythontex-0.15.ebuild b/dev-tex/pythontex/pythontex-0.15.ebuild
new file mode 100644
index 0000000..33ba193
--- /dev/null
+++ b/dev-tex/pythontex/pythontex-0.15.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit latex-package python-r1
+
+DESCRIPTION="Fast Access to Python from within LaTeX"
+HOMEPAGE="https://github.com/gpoore/pythontex"
+SRC_URI="https://github.com/gpoore/pythontex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LPPL-1.3 BSD"
+KEYWORDS="~amd64"
+IUSE="highlighting"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-texlive/texlive-latex"
+RDEPEND="${DEPEND}
+	dev-texlive/texlive-latex
+	highlighting? ( dev-python/pygments[${PYTHON_USEDEP}] )"
+
+TEXMF=/usr/share/texmf-site
+
+src_compile() {
+	cd ${PN} || die
+	ebegin "Compiling ${PN}"
+	rm ${PN}.sty || die
+	VARTEXFONTS="${T}/fonts" latex ${PN}.ins extra || die
+	eend
+}
+
+src_install() {
+	dodoc ${PN}/README "${S}"/*rst ${PN}_quickstart/*
+
+	cd ${PN} || die
+
+	installation() {
+		if python_is_python3; then
+			python_domodule {de,}${PN}3.py
+		else
+			python_domodule {de,}${PN}2.py
+		fi
+		python_domodule ${PN}_{engines,utils}.py
+		python_doscript {de,}${PN}.py syncpdb.py
+		python_optimize
+	}
+	python_foreach_impl installation
+
+	latex-package_src_doinstall dtx ins sty
+}
diff --git a/dev-tex/pythontex/pythontex-9999.ebuild b/dev-tex/pythontex/pythontex-9999.ebuild
new file mode 100644
index 0000000..69c2654
--- /dev/null
+++ b/dev-tex/pythontex/pythontex-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit latex-package python-r1 git-r3
+
+DESCRIPTION="Fast Access to Python from within LaTeX"
+HOMEPAGE="https://github.com/gpoore/pythontex"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/gpoore/pythontex.git"
+
+SLOT="0"
+LICENSE="LPPL-1.3 BSD"
+KEYWORDS=""
+IUSE="highlighting"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-texlive/texlive-latex"
+RDEPEND="${DEPEND}
+	dev-texlive/texlive-latex
+	highlighting? ( dev-python/pygments[${PYTHON_USEDEP}] )"
+
+TEXMF=/usr/share/texmf-site
+
+src_compile() {
+	cd ${PN} || die
+	ebegin "Compiling ${PN}"
+	rm ${PN}.sty || die
+	VARTEXFONTS="${T}/fonts" latex ${PN}.ins extra || die
+	eend
+}
+
+src_install() {
+	dodoc ${PN}/README "${S}"/*rst ${PN}_quickstart/*
+
+	cd ${PN} || die
+
+	installation() {
+		if python_is_python3; then
+			python_domodule {de,}${PN}3.py
+		else
+			python_domodule {de,}${PN}2.py
+		fi
+		python_domodule ${PN}_{engines,utils}.py
+		python_doscript {de,}${PN}.py syncpdb.py
+		python_optimize
+	}
+	python_foreach_impl installation
+
+	latex-package_src_doinstall dtx ins sty
+}
diff --git a/sci-biology/SAMRI/ChangeLog b/sci-biology/samri/ChangeLog
similarity index 100%
rename from sci-biology/SAMRI/ChangeLog
rename to sci-biology/samri/ChangeLog
diff --git a/sci-biology/SAMRI/metadata.xml b/sci-biology/samri/metadata.xml
similarity index 100%
rename from sci-biology/SAMRI/metadata.xml
rename to sci-biology/samri/metadata.xml
diff --git a/sci-biology/SAMRI/SAMRI-9999.ebuild b/sci-biology/samri/samri-9999.ebuild
similarity index 100%
rename from sci-biology/SAMRI/SAMRI-9999.ebuild
rename to sci-biology/samri/samri-9999.ebuild