diff --git a/app-admin/drush/Manifest b/app-admin/drush/Manifest
index 71b1e86..c3bf599 100644
--- a/app-admin/drush/Manifest
+++ b/app-admin/drush/Manifest
@@ -1,2 +1,2 @@
 DIST drush-4.5.tar.gz 282760 RMD160 29566326577ebafb5321941c9abf92462bec7891 SHA1 81446d1bc61dc47a19050f809faa336633aeef17 SHA256 11a8ba3acbebf0be45407dee54a4c59cb9da7dfb461cf4ed9e27e78b2968fc99
-EBUILD drush-4.5.ebuild 1030 RMD160 27fe98e8d12f10bea1db1e2cdb6399c2b80b99be SHA1 50af5887b566ffc5aa118a2e8314e940d3426549 SHA256 473cc0ab792ffd49bacf9ffecbcb4c44dba95b08953f6a53cd85cd5279b58814
+EBUILD drush-4.5.ebuild 1050 RMD160 6ae836ee55e03275ce21a93df58fb18f27c7f9c7 SHA1 d2cf7c811c6584c34edc85018496b85c1113ff3d SHA256 5360da46a35830d73b50507f5f5b57f93a2807cd7a6dd3881305aee1e7b9349d
diff --git a/app-admin/drush/drush-4.5.ebuild b/app-admin/drush/drush-4.5.ebuild
index cb8aa87..d51eeca 100644
--- a/app-admin/drush/drush-4.5.ebuild
+++ b/app-admin/drush/drush-4.5.ebuild
@@ -37,4 +37,5 @@ src_install() {
 	for i in ${docs} LICENSE.txt drush.bat examples includes/.gitignore tests ; do
 		rm -rf "${D}/usr/share/drush/${i}"
 	done
+	keepdir /etc/drush
 }
diff --git a/net-print/cndrvcups-common/Manifest b/net-print/cndrvcups-common/Manifest
new file mode 100644
index 0000000..f0348b1
--- /dev/null
+++ b/net-print/cndrvcups-common/Manifest
@@ -0,0 +1,4 @@
+DIST CAPT_Printer_Driver_for_Linux_V200_uk_EN.tar.gz 24605162 RMD160 1808f62dea97ab2df629dbce83e05b52636fb5f6 SHA1 443b9d7f89a567a6859c46d283360fb26aa9979d SHA256 8504ae9a2fe1f8413d9e6aa15fa34d4b289b514a7a2de13da8efb4ace9d541bb
+DIST o1113enx_l_ufr220.zip 32622341 RMD160 56fb65b81e84740e6322e296402ec6e55fa40d83 SHA1 48803bef1820c9cf67d2c5f22dad354787d44d37 SHA256 c7d38c4fa0c3af5914767500f484b59afd5da71d0aa9c453de03d2a025fb21d8
+EBUILD cndrvcups-common-2.00-r2.ebuild 2393 RMD160 3728711ce057249ea5f95d589f9e94f97a40f147 SHA1 524532618b3aa3a14e91bdc9630dce1eb912ae38 SHA256 800e1cd521a43137034791b5b2e2e0cc3fd1b5a6dd6b58c5b3ae3904b6980433
+EBUILD cndrvcups-common-2.20.ebuild 1945 RMD160 558fa3133636ed82917012f319ac4f46bed660af SHA1 1686fde30dfb24c3d4d64e7dbf6ba795e70d4c67 SHA256 b33cca96fce29587d9530397e88daa3e013b7a459d2f69aca8da40bac795e58b
diff --git a/net-print/cndrvcups-common/cndrvcups-common-2.00-r2.ebuild b/net-print/cndrvcups-common/cndrvcups-common-2.00-r2.ebuild
new file mode 100644
index 0000000..eaa405a
--- /dev/null
+++ b/net-print/cndrvcups-common/cndrvcups-common-2.00-r2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit multilib eutils rpm versionator
+MY_PF=${PF/-r/-}
+DESCRIPTION="Common files for the Canon CUPS Capt driver"
+HOMEPAGE="http://www.canon.com/"
+SRC_URI="http://files.canon-europe.com/files/soft39340/software/CAPT_Printer_Driver_for_Linux_V200_uk_EN.tar.gz"
+LICENSE="CANON"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="-cngplp"    # enable or disable cngplp compilation, may cause build break on ~amd64, don't really know if cngplp is ever needed
+EAPI="2"
+
+DEPEND=">=net-print/cups-1.1.17"
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
+
+dir=/usr/$(get_libdir)
+CNGPLP=""
+
+QA_TEXTRELS="${dir:1}/libcaepcm.so.1.0
+	${dir:1}/libc3pl.so.0.0.1
+	${dir:1}/libcnlbcm.so.1.0
+	${dir:1}/libcaiousb.so.1.0.0"
+
+src_unpack() {
+	unpack ${A}
+	unpack ./CAPT_Printer_Driver_for_Linux_V200_uk_EN/Src/${MY_PF}.tar.gz
+	cd ${S}
+}
+
+src_configure(){
+	if hasuse cngplp; then CNGPLP="cngplp"; fi
+	for i in buftool ${CNGPLP}; do
+		cd ${i}
+		NOCONFIGURE=1 ./autogen.sh
+		econf
+		cd ..
+	done
+	cd cpca
+	NOCONFIGURE=1 ./autogen.sh
+	econf --enable-shared --disable-static
+	cd ..
+}
+
+src_compile() {
+	for i in buftool cpca c3plmod_ipc ${CNGPLP}; do
+		cd ${i}
+		emake
+		cd ..
+	done
+}
+
+src_install() {
+	for i in buftool cpca ${CNGPLP}; do
+		cd ${i}
+		make install DESTDIR=${D} || die "make install failed for ${i}" 
+		cd ..
+	done
+
+	OABI=${ABI}
+	has_multilib_profile && ABI="x86"
+	for i in $(cd libs; ls *.so.?.?.?; cd ..); do
+		dolib.so libs/${i}
+		dosym ${i} /usr/$(get_libdir)/${i%.?}
+		dosym ${i} /usr/$(get_libdir)/${i%.?.?}
+		dosym ${i} /usr/$(get_libdir)/${i%.?.?.?}
+	done
+	for i in $(cd libs; ls *.so.?.?; cd ..); do
+		dolib.so libs/${i}
+		dosym ${i} /usr/$(get_libdir)/${i%.?}
+		dosym ${i} /usr/$(get_libdir)/${i%.?.?}
+	done
+
+	dolib.so c3plmod_ipc/libcanonc3pl.so.1.0.0
+	dosym  libcanonc3pl.so.1.0.0 /usr/$(get_libdir)/libcanonc3pl.so.1.0
+	dosym  libcanonc3pl.so.1.0.0 /usr/$(get_libdir)/libcanonc3pl.so.1
+	dosym  libcanonc3pl.so.1.0.0 /usr/$(get_libdir)/libcanonc3pl.so
+
+	dobin libs/cnpkmodule
+	dobin libs/c3pldrv
+
+	ABI=${OABI}
+
+	insinto /usr/share/caepcm
+	doins data/*
+
+
+	dodoc LICENSE-common-*.txt README
+	for i in buftool cpca c3plmod_ipc ${CNGPLP}; do
+		docinto ${i}
+		dodoc ${i}/NEWS ${i}/README ${i}/AUTHORS ${i}/ChangeLog
+	done
+	docinto buftool
+	dodoc buftool/LICENSE.txt
+}
diff --git a/net-print/cndrvcups-common/cndrvcups-common-2.20.ebuild b/net-print/cndrvcups-common/cndrvcups-common-2.20.ebuild
new file mode 100644
index 0000000..296f3a3
--- /dev/null
+++ b/net-print/cndrvcups-common/cndrvcups-common-2.20.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit multilib
+EAPI=3
+#  o1113enx_l_ufr220.zip
+DESCRIPTION="Canon common files for the CUPS driver for Linux"
+HOMEPAGE="http://de.software.canon-europe.com/software/0040355.asp"
+SRC_URI="http://files.canon-europe.com/files/soft40355/software/o1113enx_l_ufr220.zip"
+LICENSE="CANON"
+RESTRICT="mirror"
+SLOT="0"
+
+KEYWORDS="~amd64"
+IUSE=""
+
+dir=/usr/$(get_libdir)
+CNGPLP=""
+
+DEPEND=">=net-print/cups-1.1.17"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	unpack ./UK/Sources/${PF}-1.tar.gz
+	cd ${S}
+}
+
+src_configure(){
+	if hasuse cngplp; then CNGPLP="cngplp"; fi
+	for i in buftool ${CNGPLP}; do
+		cd ${i}
+		NOCONFIGURE=1 ./autogen.sh
+		econf
+		cd ..
+	done
+}
+
+src_compile() {
+	for i in buftool c3plmod_ipc ${CNGPLP}; do
+		cd ${i}
+		emake
+		cd ..
+	done
+}
+
+src_install() {
+	for i in buftool ${CNGPLP}; do
+		cd ${i}
+		make install DESTDIR=${D} || die "make install failed for ${i}"
+		cd ..
+	done
+
+	OABI=${ABI}
+	has_multilib_profile && ABI="x86"
+	for i in $(cd libs; ls *.so.?.?.?; cd ..); do
+		dolib.so libs/${i}
+		dosym ${i} /usr/$(get_libdir)/${i%.?}
+		dosym ${i} /usr/$(get_libdir)/${i%.?.?}
+		dosym ${i} /usr/$(get_libdir)/${i%.?.?.?}
+	done
+	for i in $(cd libs; ls *.so.?.?; cd ..); do
+		dolib.so libs/${i}
+		dosym ${i} /usr/$(get_libdir)/${i%.?}
+		dosym ${i} /usr/$(get_libdir)/${i%.?.?}
+	done
+
+	dolib.so c3plmod_ipc/libcanonc3pl.so.1.0.0
+	dosym  libcanonc3pl.so.1.0.0 /usr/$(get_libdir)/libcanonc3pl.so.1.0
+	dosym  libcanonc3pl.so.1.0.0 /usr/$(get_libdir)/libcanonc3pl.so.1
+	dosym  libcanonc3pl.so.1.0.0 /usr/$(get_libdir)/libcanonc3pl.so
+
+	dobin libs/c3pldrv
+
+	ABI=${OABI}
+
+	insinto /usr/share/caepcm
+	doins data/*
+
+
+	dodoc LICENSE-common-*.txt README
+	for i in buftool c3plmod_ipc ${CNGPLP}; do
+		docinto ${i}
+		dodoc ${i}/NEWS ${i}/README ${i}/AUTHORS ${i}/ChangeLog
+	done
+	docinto buftool
+	dodoc buftool/LICENSE.txt
+}
diff --git a/net-print/cndrvcups-urf2/Manifest b/net-print/cndrvcups-urf2/Manifest
new file mode 100644
index 0000000..9bb75c7
--- /dev/null
+++ b/net-print/cndrvcups-urf2/Manifest
@@ -0,0 +1,2 @@
+DIST o1113enx_l_ufr220.zip 32622341 RMD160 56fb65b81e84740e6322e296402ec6e55fa40d83 SHA1 48803bef1820c9cf67d2c5f22dad354787d44d37 SHA256 c7d38c4fa0c3af5914767500f484b59afd5da71d0aa9c453de03d2a025fb21d8
+EBUILD cndrvcups-urf2-2.20.ebuild 1965 RMD160 95cb81381bc96b3fdbd6fbe65c606545612a4f63 SHA1 0b359d49a317274a74b70c85ab374f5c7f6cd7da SHA256 05243a97cb3fc29c436245bc514389a033ed31d33dee12ab208fb8740b8625c0
diff --git a/net-print/cndrvcups-urf2/cndrvcups-urf2-2.20.ebuild b/net-print/cndrvcups-urf2/cndrvcups-urf2-2.20.ebuild
new file mode 100644
index 0000000..7b04e9a
--- /dev/null
+++ b/net-print/cndrvcups-urf2/cndrvcups-urf2-2.20.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit multilib
+EAPI=3
+#  o1113enx_l_ufr220.zip
+DESCRIPTION="Canon common files for the CUPS driver for Linux"
+HOMEPAGE="http://de.software.canon-europe.com/software/0040355.asp"
+SRC_URI="http://files.canon-europe.com/files/soft40355/software/o1113enx_l_ufr220.zip"
+LICENSE="CANON"
+RESTRICT="mirror"
+SLOT="0"
+MY_PF="cndrvcups-lb"
+MY_P="${MY_PF}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+KEYWORDS="~amd64"
+IUSE=""
+
+dir=/usr/$(get_libdir)
+CNGPLP=""
+
+DEPEND=">=net-print/cups-1.1.17
+		=net-print/cndrvcups-common-${PV}"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	unpack ./UK/Sources/${MY_P}-1.tar.gz
+	cd ${S}
+}
+
+src_configure(){
+	for i in buftool; do
+		cd ${i}
+		NOCONFIGURE=1 ./autogen.sh
+		econf
+		cd ..
+	done
+}
+
+src_compile() {
+	for i in buftool c3plmod_ipc; do
+		cd ${i}
+		emake
+		cd ..
+	done
+}
+
+src_install() {
+	for i in buftool; do
+		cd ${i}
+		make install DESTDIR=${D} || die "make install failed for ${i}"
+		cd ..
+	done
+
+	OABI=${ABI}
+	has_multilib_profile && ABI="x86"
+	for i in $(cd libs; ls *.so.?.?.?; cd ..); do
+		dolib.so libs/${i}
+		dosym ${i} /usr/$(get_libdir)/${i%.?}
+		dosym ${i} /usr/$(get_libdir)/${i%.?.?}
+		dosym ${i} /usr/$(get_libdir)/${i%.?.?.?}
+	done
+	for i in $(cd libs; ls *.so.?.?; cd ..); do
+		dolib.so libs/${i}
+		dosym ${i} /usr/$(get_libdir)/${i%.?}
+		dosym ${i} /usr/$(get_libdir)/${i%.?.?}
+	done
+
+	dolib.so c3plmod_ipc/libcanonc3pl.so.1.0.0
+	dosym  libcanonc3pl.so.1.0.0 /usr/$(get_libdir)/libcanonc3pl.so.1.0
+	dosym  libcanonc3pl.so.1.0.0 /usr/$(get_libdir)/libcanonc3pl.so.1
+	dosym  libcanonc3pl.so.1.0.0 /usr/$(get_libdir)/libcanonc3pl.so
+
+	dobin libs/c3pldrv
+
+	ABI=${OABI}
+
+	insinto /usr/share/caepcm
+	doins data/*
+
+
+	dodoc LICENSE-common-*.txt README
+	for i in buftool c3plmod_ipc; do
+		docinto ${i}
+		dodoc ${i}/NEWS ${i}/README ${i}/AUTHORS ${i}/ChangeLog
+	done
+	docinto buftool
+	dodoc buftool/LICENSE.txt
+}