diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
new file mode 100644
index 0000000..8c58a86
--- /dev/null
+++ b/media-gfx/openscad/Manifest
@@ -0,0 +1,2 @@
+EBUILD openscad-9999.ebuild 887 SHA256 217736b22330a9910d6052de95186c38a4a42800e81d428d2af27498c4716036 SHA512 28f5bdfac51e5058196a3f25ab5d60d872d4b7c66855f21a14c4acf6d056f6129847fb2d7544061de41eb71498d1d3156d5de03a4c0990596bd61481cd35a251 WHIRLPOOL 804caaff3ebd7aa4a6bf0350c798d2d2f2057e1fdfd6646834f2c79b20238ee4872f2e03c919ec6776c2add7b3dc0bdaad1ffa858a8fccc05c1e73e496968398
+MISC metadata.xml 839 SHA256 e92ca10a725c36e711270e747abbd22584b0baba005ae1d65e45c89755f40a84 SHA512 f13910d4339e820344e1c70edc384c4522ad506c50ffc80e843358199b0d2e27f9eafe99e4613f258a62abc4683b462d001fe71e19d849845f6f4cf75324ffd3 WHIRLPOOL ca3494c5d2314193a80315008ef44b08f48fa624922340e33402c8fc87729ab27fcbf491b0c802d7052e1e63df00948835d657d8214c76376cf8e61fd2813935
diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
new file mode 100644
index 0000000..0da060e
--- /dev/null
+++ b/media-gfx/openscad/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+mattm@gentoo.org
+Matthew Marlowe
+
+
+OpenSCAD is a software for creating solid 3D CAD objects. Unlike most free software for creating 3D models (such as the famous application Blender) it does not focus on the artistic aspects of 3D modelling but instead on the CAD aspects. Thus it might be the application you are looking for when you are planning to create 3D models of machine parts but pretty sure is not what you are looking for when you are more interested in creating computer-animated movies. OpenSCAD is free software and available for Linux/UNIX, MS Windows and Mac OS X.
+
+
+
diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
new file mode 100644
index 0000000..3112eca
--- /dev/null
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qt4-r2
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/openscad/openscad.git"
+else
+ SRC_URI="http://files.openscad.org/${P}.src.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="The Programmers Solid 3D CAD Modeller"
+HOMEPAGE="http://www.openscad.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+CDEPEND="media-gfx/opencsg
+ sci-mathematics/cgal
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qtopengl:4
+ dev-cpp/eigen:3
+ dev-libs/gmp:0
+ dev-libs/mpfr:0
+ dev-libs/boost:=
+ x11-libs/qscintilla
+"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}"
+
+src_prepare() {
+ #Use our CFLAGS (specifically don't force x86)
+ sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro || die
+
+ sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
+}
diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest
new file mode 100644
index 0000000..177a299
--- /dev/null
+++ b/sci-mathematics/cgal/Manifest
@@ -0,0 +1,4 @@
+DIST CGAL-4.7-1.tar.xz 13673360 SHA256 50bd0a1cad7a8957b09012f831eebaf7d670e2a3467e8f365ec0c71fa5436369 SHA512 8126e861fb091a21a0eaf777205d5d688a0d33f005b91c85b2e5fb91afa66796611ec8a314647a322141169483ab8ff0dba769840bf4fb0f4397cf167172b21f WHIRLPOOL 6f1b0c9855161c0841faf1022742fd09157d5605fb5d5046d2b3bde1f1027b3ee6813ac631fb981f026239e0027434102c16d25b1dfda8619c571adc8639a921
+DIST CGAL-4.7-doc_html-1.tar.xz 25248068 SHA256 2a15a16229dd90f991ea976761c8ae3c1f9e09f4023bb4446629c3b948a3b9bd SHA512 7542d1937c8cd8cfd174aa67b74b1e242c1dbbd40ca772eb0b7bdc80a947f0851222b10d098193b5c2cab1fe3f32cd40ab2555248bd99b7a29c296df288dabf7 WHIRLPOOL f7657994ffa71e4c5f30b75060cd87fc46686b5d2e1a05012b36a0c0f2a6b2ddcf40b9fb1ae038c69e3f363d12e92acf6455c2ad2838567d3a1cc31dd4722c54
+EBUILD cgal-4.7.ebuild 1601 SHA256 9ebc5ff0f0a3ca5cdb8932635d8a3cb349d6d4f4ebc673cc211b02b8dcd12ad8 SHA512 381eb36d0fcb763951be0d9860be9999b26f83d4cfee469d429926b4fdde1cb31f66b8484efad7e0ce4647c680196c9a3f86cb6a32f0d45856a2ced4876b3860 WHIRLPOOL f6412a07edf74b814c01bc1f9154c5e3fac260893b2a3d422c03e7a0fb5e5926ffd41885b85a47d27dd798b0ad3620e3ca9726cde0f4d14fafd35ec34c7a26e8
+MISC metadata.xml 1176 SHA256 cb26cc714b9f3fefb7c52a2f1d8a1b314193013d359e1d0edbc7096226683cf0 SHA512 5cf662c5843200b28ff691d04751d4b1b44bb0699a318233c05e4713f097da8432be5ac9b69a6ceb44abf8e213fbe711e1da1db75b3889a1c639d091f230ae22 WHIRLPOOL 56ee6667f068eea00b833fd8451062ccf659b70ddcd2ad3e4e5fc043ec5655c2263f637c49cd4880a652e73be6227115de682dda1dbe7738f44b7031255c7cd0
diff --git a/sci-mathematics/cgal/cgal-4.7.ebuild b/sci-mathematics/cgal/cgal-4.7.ebuild
new file mode 100644
index 0000000..69846f8
--- /dev/null
+++ b/sci-mathematics/cgal/cgal-4.7.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_BUILD_TYPE=Release
+
+inherit multilib cmake-utils
+
+MY_P=CGAL-${PV}
+
+DESCRIPTION="C++ library for geometric algorithms and data structures"
+HOMEPAGE="http://www.cgal.org/ https://gforge.inria.fr/projects/cgal/"
+SRC_URI="
+ https://github.com/CGAL/cgal/releases/download/releases%2F${MY_P}/${MY_P}.tar.xz -> ${MY_P}-1.tar.xz
+ doc? ( https://github.com/CGAL/cgal/releases/download/releases%2F${MY_P}/${MY_P}-doc_html.tar.xz -> ${MY_P}-doc_html-1.tar.xz )"
+
+LICENSE="LGPL-3 GPL-3 Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples +gmp mpfi qt4"
+
+RDEPEND="
+ dev-libs/boost
+ dev-libs/mpfr:0
+ sys-libs/zlib
+ x11-libs/libX11
+ virtual/glu
+ virtual/opengl
+ gmp? ( dev-libs/gmp[cxx] )
+ qt4? (
+ dev-qt/qtgui:4
+ dev-qt/qtopengl:4
+ )
+ mpfi? ( sci-libs/mpfi )"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="AUTHORS CHANGES* README"
+
+src_prepare() {
+ cmake-utils_src_prepare
+ sed \
+ -e '/install(FILES AUTHORS/d' \
+ -i CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCGAL_INSTALL_LIB_DIR=$(get_libdir)
+ -DWITH_CGAL_Qt3=OFF
+ -DWITH_LEDA=OFF
+ $(cmake-utils_use_with gmp)
+ $(cmake-utils_use_with gmp GMPXX)
+ $(cmake-utils_use_with qt4 CGAL_Qt4)
+ $(cmake-utils_use_with mpfi)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ use doc && HTML_DOCS=( "${WORKDIR}"/doc_html/. )
+ cmake-utils_src_install
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples demo
+ fi
+}
diff --git a/sci-mathematics/cgal/metadata.xml b/sci-mathematics/cgal/metadata.xml
new file mode 100644
index 0000000..a08e64a
--- /dev/null
+++ b/sci-mathematics/cgal/metadata.xml
@@ -0,0 +1,24 @@
+
+
+
+
+ sci-mathematics@gentoo.org
+ Gentoo Mathematics Project
+
+
+ The Computational Geometry Algorithms Library is a collaborative
+ open source library containing:
+ * the Kernel with geometric primitives such as points, vectors,
+ lines, predicates for testing things such as relative positions of
+ points, and operations such as intersections and distance calculation.
+ * the Basic Library which is a collection of standard data
+ structures and geometric algorithms, such as convex hull in 2D/3D,
+ (Delaunay) triangulation in 2D/3D, planar map, polyhedron, smallest
+ enclosing circle, and multidimensional query structures.
+ * the Support Library which offers interfaces to other packages,
+ e.g., for visualisation, and I/O, and other support facilities.
+
+
+