diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
new file mode 100644
index 0000000..0050731
--- /dev/null
+++ b/app-text/calibre/Manifest
@@ -0,0 +1,2 @@
+DIST calibre-0.6.40.tar.gz 11420347 RMD160 7493d62eea08f7d7d6f99136b6d2c0ca6abf0bf8 SHA1 9ba8324f038e915e3ef6a08090782d3d4c3a5ee8 SHA256 5042ddd332b988edc939b985a574aacea74df8da14be0c5c33f34705080a5160
+EBUILD calibre-0.6.40.ebuild 4529 RMD160 30e02c241fc6974ab77196f7f8aae39bae033e56 SHA1 f6a7e90078f3999e7116b1639ceec4dccf1b4759 SHA256 07c1e433ded37f9b0d3774d9c221d5d92fdeb0c3d86c735481b2ed1d025b9f8e
diff --git a/app-text/calibre/calibre-0.6.40.ebuild b/app-text/calibre/calibre-0.6.40.ebuild
new file mode 100644
index 0000000..65aeca7
--- /dev/null
+++ b/app-text/calibre/calibre-0.6.40.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.37.ebuild,v 1.5 2010/02/10 21:04:19 ssuominen Exp $
+
+EAPI=2
+PYTHON_DEPEND=2:2.6
+PYTHON_USE_WITH=sqlite
+
+inherit python distutils eutils fdo-mime bash-completion
+
+DESCRIPTION="Ebook management application."
+HOMEPAGE="http://calibre-ebook.com/"
+SRC_URI="http://calibre-ebook.com/downloads/$P.tar.gz"
+
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 x86"
+
+SLOT="0"
+
+IUSE=""
+
+# libusb-compat is untested
+SHARED_DEPEND=">=dev-python/setuptools-0.6_rc5
+	>=dev-python/imaging-1.1.6
+	>=dev-libs/libusb-0.1.12:0
+	>=dev-python/PyQt4-4.6[X,svg,webkit]
+	>=dev-python/mechanize-0.1.11
+	>=media-gfx/imagemagick-6.3.5
+	>=x11-misc/xdg-utils-1.0.2
+	>=dev-python/dbus-python-0.82.2
+	>=dev-python/lxml-2.1.5
+	>=dev-python/python-dateutil-1.4.1
+	>=dev-python/beautifulsoup-3.0.5
+	>=dev-python/dnspython-1.6.0
+	>=app-text/poppler-0.12.3-r3[qt4,xpdf-headers]
+	>=sys-apps/help2man-1.36.4
+	>=dev-python/cssutils-0.9.7_alpha2
+	>=media-libs/libwmf-0.2.8
+	app-text/podofo"
+
+RDEPEND="$SHARED_DEPEND
+	>=dev-python/reportlab-2.1"
+
+DEPEND="$SHARED_DEPEND
+	dev-python/setuptools
+	>=gnome-base/librsvg-2.0.0
+	>=x11-misc/xdg-utils-1.0.2-r2
+	sys-apps/help2man"
+
+S=$WORKDIR/$PN
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s:'xdg-desktop-menu', 'install':'xdg-desktop-menu', 'install', '--mode', 'user':" \
+		-e "s:xdg-icon-resource install:xdg-icon-resource install --mode user:" \
+		-e "s:xdg-mime install:xdg-mime install --mode user:" \
+		-e "s:old_udev = '/etc:old_udev = '${D}etc:" \
+		-i src/calibre/linux.py || die "sed'ing in the IMAGE path failed"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed'ing in the IMAGE path failed"
+
+	distutils_src_prepare
+}
+
+src_install() {
+
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!$BASH
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database}
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database}
+
+	# --bindir and --sharedir don't seem to work.
+	# Pass them in anyway so we'll know when they are fixed.
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #295672 - Aavoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export XDG_CONFIG_HOME="$HOME/.config"
+	export CALIBRE_CONFIG_DIRECTORY="$XDG_CONFIG_HOME/calibre"
+	mkdir -p "$XDG_CONFIG_HOME" "$CALIBRE_CONFIG_DIRECTORY"
+
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+		distutils_src_install --bindir="${D}usr/bin" --sharedir="${D}usr/share"
+
+	grep -rlZ "${D}" "${D}" | xargs -0 sed -e "s:${D}:/:g" -i ||
+		die "failed to fix harcoded \$D in paths"
+
+	# Python modules are no longer installed in
+	# site-packages, so remove empty dirs.
+	find "${D}$(python_get_libdir)" -type d -empty -delete
+
+	# This code may fail if behavior of --root, --bindir or
+	# --sharedir changes in the future.
+	dodir /usr/lib
+	mv "${D}lib/calibre" "${D}usr/lib/" ||
+		die "failed to move lib dir"
+	find "${D}"lib -type d -empty -delete
+
+	dodir /usr/bin
+	mv "${D}bin/"* "${D}usr/bin/" ||
+		die "failed to move bin dir"
+	find "${D}"bin -type d -empty -delete
+
+	dodir /usr/share
+	mv "${D}share/"* "${D}usr/share/" ||
+		die "failed to move share dir"
+	find "${D}"share -type d -empty -delete
+
+	# The menu entries end up here due to '--mode user' being added to
+	# xdg-* options in src_prepare.
+	dodir /usr/share/mime/packages
+	chmod -fR a+rX,u+w,g-w,o-w "$HOME"/.local
+	mv "$HOME"/.local/share/mime/packages/* "$D"usr/share/mime/packages/ ||
+		die "failed to register mime types"
+	dodir /usr/share/icons
+	mv "$HOME"/.local/share/icons/* "$D"usr/share/icons/ ||
+		die "failed to install icon files"
+	domenu "$HOME"/.local/share/applications/*.desktop ||
+		die "failed to install .desktop menu files"
+
+	dobashcompletion "$D"etc/bash_completion.d/calibre
+	rm -r "${D}"etc/bash_completion.d
+	find "${D}"etc -type d -empty -delete
+
+	python_convert_shebangs -r 2 "$D"
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	distutils_pkg_postinst
+	bash-completion_pkg_postinst
+}
diff --git a/app-text/ecub/Manifest b/app-text/ecub/Manifest
new file mode 100644
index 0000000..30c5d87
--- /dev/null
+++ b/app-text/ecub/Manifest
@@ -0,0 +1,3 @@
+DIST ecub_1.09-1_amd64.deb 4492062 RMD160 a92fe52ea9002ae5207a810c0a14b81dda9fd0bf SHA1 4aecb790170ee59519437b5e06d99b72043fd112 SHA256 79d83fabd3394807bb16bba81d357b61d69036482d80ce013a01da3378035b02
+DIST ecub_1.09-1_i386.deb 4449600 RMD160 ef36ca39b9cd78d2f7200b1ee77fb758a68f0307 SHA1 f2bb5391440fc8400d78adec428291a1449b0c83 SHA256 3df557647b2dfb247724df02c1d118bbe12b2e222a6f2dc7d527127e9da7718e
+EBUILD ecub-1.09.ebuild 1172 RMD160 1fc958ffe712a108c4c6b837d3a439bdc6ee439b SHA1 424e92e017a14f35b1b64463d7b426a9d129162f SHA256 5ffea11d22eaa9f14b6599da15ed50e0aaf4d9115bcb9a5147104eaf7c654f2e
diff --git a/app-text/ecub/ecub-1.09.ebuild b/app-text/ecub/ecub-1.09.ebuild
new file mode 100644
index 0000000..fb8baaa
--- /dev/null
+++ b/app-text/ecub/ecub-1.09.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+DESCRIPTION="A simple to use EPUB and MobiPocket ebook creator"
+HOMEPAGE="http://www.juliansmart.com/ecub"
+SRC_URI="x86? ( http://www.anthemion.co.uk/ecub/ecub_${PV}-1_i386.deb )
+amd64? ( http://www.anthemion.co.uk/ecub/ecub_${PV}-1_amd64.deb )"
+
+# LICENSE="eCub"
+SLOT="0"
+KEYWORDS="x86 amd64"
+IUSE=""
+
+DEPEND="app-arch/deb2targz"
+RDEPEND=""
+
+src_unpack() {
+	ARCH_SUFFIX=""
+	if use x86 ; then
+		ARCH_SUFFIX="i386"
+	fi
+	if use amd64 ; then
+		ARCH_SUFFIX="amd64"
+	fi
+	DEBFILE="ecub_${PV}-1_${ARCH_SUFFIX}.deb"
+	TGZFILE="ecub_${PV}-1_${ARCH_SUFFIX}.tar.gz"
+	cd ${WORKDIR}
+	ln -s ${DISTDIR}/${DEBFILE} .
+	deb2targz ${DEBFILE}
+	tar xzf ${TGZFILE}
+	rm ${DEBFILE}
+}
+
+src_compile() {
+	true
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share
+	dodir /usr/share/applications
+	dodir /usr/share/pixmaps
+	cd ${WORKDIR}
+	cp -R "usr/share/ecub" "${D}usr/share/" || die
+	dosym /usr/share/ecub/ecub /usr/bin/ecub
+	insinto /usr/share/pixmaps
+	newins usr/share/ecub/appicons/ecub48x48.png ecub.png
+	insinto /usr/share/applications
+	doins usr/share/ecub/ecub.desktop
+}
+