diff --git a/app-misc/openastro-data/Manifest b/app-misc/openastro-data/Manifest
new file mode 100644
index 0000000000000..aa7eb48e2f736
--- /dev/null
+++ b/app-misc/openastro-data/Manifest
@@ -0,0 +1 @@
+DIST openastro.org-data_1.6.orig.tar.gz 13603001 SHA256 1ea8a80ebb6077f2b5f4abafe532037a2bf6ff060afba5419cf1f5aaa0890370 SHA512 99f3b6db61e27ccf04a7e0ff3ba7da45b889e1177bfbc1192af1929fca7255dc2b18a4ac9eb536af9ceb11e7722e0a3420102c7e45a6c839abe87734e8be6591 WHIRLPOOL 33486b0c9c7b3b243acda872d5a8812a329ec2963305098a5bace73dadfc99b442a6d338ca98e305932a63298b4ea6b1550308fe22eaee243dedc825694ffbbc
diff --git a/app-misc/openastro-data/metadata.xml b/app-misc/openastro-data/metadata.xml
new file mode 100644
index 0000000000000..b433d43ad5cee
--- /dev/null
+++ b/app-misc/openastro-data/metadata.xml
@@ -0,0 +1,19 @@
+
+
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ lluixhi@gmail.com
+ Aric Belsito
+
+
+
+ devel@openastro.org
+ Pelle van der Scheer
+
+ https://bugs.launchpad.net/openastro.org
+
+
diff --git a/app-misc/openastro-data/openastro-data-1.6.ebuild b/app-misc/openastro-data/openastro-data-1.6.ebuild
new file mode 100644
index 0000000000000..006d8ab4f71ec
--- /dev/null
+++ b/app-misc/openastro-data/openastro-data-1.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-data}
+MY_PN=${MY_PN}.org-data
+
+DESCRIPTION="OpenAstro data files, ephemeris, famous people database, geo database"
+HOMEPAGE="http://openastro.org"
+SRC_URI="http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/app-misc/openastro/Manifest b/app-misc/openastro/Manifest
new file mode 100644
index 0000000000000..0c5d46528b824
--- /dev/null
+++ b/app-misc/openastro/Manifest
@@ -0,0 +1 @@
+DIST openastro.org_1.1.48.orig.tar.gz 205879 SHA256 504fe7fa224ef66f3be2752593b7bfde84c7b599c5f26733f6093b55bf2a5b2a SHA512 996e503a8dd2504da252ad2b20ac185301e81523629cbcf05fcf37ec4ca3859ef513a194feb2d05bd7c4cbe796bf514afa4eb242b8cd51c65d134b51165f97d3 WHIRLPOOL a73d27f48aea0ed9e7af55bb7e2efc912b17283b515de705ec72193fe187c05a11635bfb5a1ea98d95a2dcbf39bbf3eda4ece636ca5ab945dcafad6e690fa209
diff --git a/app-misc/openastro/metadata.xml b/app-misc/openastro/metadata.xml
new file mode 100644
index 0000000000000..209be477efe39
--- /dev/null
+++ b/app-misc/openastro/metadata.xml
@@ -0,0 +1,23 @@
+
+
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ lluixhi@gmail.com
+ Aric Belsito
+
+
+
+ devel@openastro.org
+ Pelle van der Scheer
+
+ https://bugs.launchpad.net/openastro.org
+
+
+
diff --git a/app-misc/openastro/openastro-1.1.48.ebuild b/app-misc/openastro/openastro-1.1.48.ebuild
new file mode 100644
index 0000000000000..da3d00fbc79e0
--- /dev/null
+++ b/app-misc/openastro/openastro-1.1.48.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN=${PN}.org
+
+DESCRIPTION="A fully-featured Open Source Astrology Program"
+HOMEPAGE="http://openastro.org"
+SRC_URI="http://ppa.launchpad.net/pellesimon/ubuntu/pool/main/o/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+IUSE="jpeg png"
+
+DEPEND="
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/pygtk:2[${PYTHON_USEDEP}]
+ dev-python/pycairo[svg,${PYTHON_USEDEP}]
+ dev-python/librsvg-python[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/pyswisseph[${PYTHON_USEDEP}]
+ app-misc/openastro-data[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+ jpeg? ( media-gfx/imagemagick[jpeg,svg] )
+ png? ( media-gfx/imagemagick[png,svg] )"
+
+S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/dev-python/pyswisseph/Manifest b/dev-python/pyswisseph/Manifest
new file mode 100644
index 0000000000000..ca7f91695a784
--- /dev/null
+++ b/dev-python/pyswisseph/Manifest
@@ -0,0 +1 @@
+DIST pyswisseph-2.00.00-2.tar.bz2 458443 SHA256 7b47f54a61ac17863a4d9e75269e53e09ad525780ac731eed6923415caa725cc SHA512 009542d370248989489e4d2a557b5f5cac27923bc06b9a9088b282f3f9cc8b31bfc43bba9cff3a44f8a77e20356b8a9ced60ec200b26815780af5588efbc9e4b WHIRLPOOL 0521769bed1311fe2c59d14f0a100873b06207ab59bf33cd8a54471958690b12b19ca57f3a7d99829f356c2193a5df1562b976ae2726c11e1800bd35aaf7b5c4
diff --git a/dev-python/pyswisseph/metadata.xml b/dev-python/pyswisseph/metadata.xml
new file mode 100644
index 0000000000000..812a6c8ecf521
--- /dev/null
+++ b/dev-python/pyswisseph/metadata.xml
@@ -0,0 +1,20 @@
+
+
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ lluixhi@gmail.com
+ Aric Belsito
+
+
+ https://github.com/astrorigin/pyswisseph/issues
+
+ smarquis@astrorigin.ch
+ Stanislas Marquis
+
+ astrorigin/pyswisseph
+
+
diff --git a/dev-python/pyswisseph/pyswisseph-2.00.00_p2.ebuild b/dev-python/pyswisseph/pyswisseph-2.00.00_p2.ebuild
new file mode 100644
index 0000000000000..29623a0b68fa8
--- /dev/null
+++ b/dev-python/pyswisseph/pyswisseph-2.00.00_p2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1
+
+PLEVEL=${PV##*_p}
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV}-${PLEVEL}
+
+DESCRIPTION="Python extension to the AstroDienst Swiss Ephemeris"
+HOMEPAGE="https://github.com/astrorigin/pyswisseph"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://github.com/astrorigin/pyswisseph.git"
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+DEPEND=""
+RDEPEND="${DEPEND}"