diff --git a/net-print/cndrvcups-common/Manifest b/net-print/cndrvcups-common/Manifest
deleted file mode 100644
index 474e817..0000000
--- a/net-print/cndrvcups-common/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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 54da1898a3e07ba5e2fe5a6cc15d0c5858243e19 SHA1 c38705890121a8a84c92dd77cf37dc411d0fa13c SHA256 1cb3c043aec9cebf6ad6ddcea276f439c96d8f417ccbf3c6372811c286d43992
-EBUILD cndrvcups-common-2.20.ebuild 1946 RMD160 93b2feeb58421d9ddd0bd99fcb77d90f1f849106 SHA1 69d6f6d65d3273d4dc46e26a64cf0880c630f68c SHA256 bd0a4da2bedf3c845d8d15e1001e987cf3a335bca0b3e5c65201f4c433d644b0
diff --git a/net-print/cndrvcups-common/cndrvcups-common-2.00-r2.ebuild b/net-print/cndrvcups-common/cndrvcups-common-2.00-r2.ebuild
deleted file mode 100644
index 4f69c00..0000000
--- a/net-print/cndrvcups-common/cndrvcups-common-2.00-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-EAPI="2"
-
-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
-
-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
deleted file mode 100644
index 76c525b..0000000
--- a/net-print/cndrvcups-common/cndrvcups-common-2.20.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-inherit multilib
-
-#  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
deleted file mode 100644
index 9bb75c7..0000000
--- a/net-print/cndrvcups-urf2/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 7b04e9a..0000000
--- a/net-print/cndrvcups-urf2/cndrvcups-urf2-2.20.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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
-}