amd64/x86 stable, drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

8 files changed, 28 insertions, 247 deletions

diff --git a/net-print/cndrvcups-common-lb/ChangeLog b/net-print/cndrvcups-common-lb/ChangeLog
index f1e0406de033..fbb305dbb659 100644
--- a/net-print/cndrvcups-common-lb/ChangeLog
+++ b/net-print/cndrvcups-common-lb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cndrvcups-common-lb
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-common-lb/ChangeLog,v 1.4 2014/09/25 09:27:48 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-common-lb/ChangeLog,v 1.5 2015/04/08 21:32:22 pacho Exp $
+
+  08 Apr 2015; Pacho Ramos <pacho@gentoo.org>
+  -cndrvcups-common-lb-2.70-r2.ebuild, cndrvcups-common-lb-2.90.ebuild:
+  amd64/x86 stable, drop old
 
 *cndrvcups-common-lb-2.90 (25 Sep 2014)
 
diff --git a/net-print/cndrvcups-common-lb/Manifest b/net-print/cndrvcups-common-lb/Manifest
index 243c984263e2..d90b77ac9b78 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST Linux_UFRII_PrinterDriver_V270_uk_EN.tar.gz 79196275 SHA256 282821cad7d0e0dacf9e49815cdc62f32404ea214fdab462e9e328fa9b1eea18 SHA512 6cb761db3873533772a770181e5383f9b9d5e2fd208edd0de8525faf4728111addb5720c86f5b8fdee876588c967acf168a64ae291b7cd202759c03b241cfe78 WHIRLPOOL 3092effe07cd042247e1f8f9de0752ee031f15eb51e539639a12f4fc81e1fabf874ee1fb4b515d4e7f2090405d0867eafe9439c93503fed4d0914fa5fa209655
 DIST Linux_UFRII_PrinterDriver_V290_uk_EN.tar.gz 90901373 SHA256 bcc9db26e261d239438aeb15f171b5b0e7fd305abd0729be0e806bb4c039654a SHA512 23181155f5719fa0a9c216c058be749b5faaa8ee745d260eba2e5e284ef4ff161e344289a7c301a2d74cc919c5031763b0daf41cd07686cfdce188492a9b34b2 WHIRLPOOL 82bb966d823f8019d6275d421ebd2ff848556415e1767bd8fc2638d97479e15029a48818e5b45e9210781f4f37fd269dde46763404314b6c47ee0b4670e03600
-EBUILD cndrvcups-common-lb-2.70-r2.ebuild 2891 SHA256 c101027bf683a02779983389da607a1ec7224270057072269859c465cbef70a8 SHA512 f8dc21151c83f172b0fff46459a4951d52f7c470726c3c30606eeeb9649dc6041990058979b54b07c896c04fb8ce253bc793c7a1ed63110ff439a598f9994b43 WHIRLPOOL 01023465782cb77e230f54f1d3c2d962d8757ffcce02973583df2bcf2f1a1e5d755fed52e0c29f325362cd3352bf748b991c28f20446021903eb49d18d68f623
-EBUILD cndrvcups-common-lb-2.90.ebuild 2903 SHA256 ae62548b15bef552d41a95fe274d9a183a380f2ee39cf808c67e305515a01a67 SHA512 2a735652b00d9a18cbe8e70c064c6af7cf36da38f20df03b671c6650b0d4dd6b3f7b72b77dad4e88a87e6aa1c17e0dbc19eaed3a300176a87d4654b48f61672f WHIRLPOOL 6e8a7f054f7fdb52dc01d7f8d1865171eaa5cf0ef6a8d60299ceafc7f98cd1aa3c0bda1dfed350db59f456e7358cc2ea631bda0a5c264d20da3f2e61fb2e5bed
-MISC ChangeLog 990 SHA256 1d3f9c9d2761268cb1665ea9345ef292c0b7b482087b196b38df593ad560491a SHA512 69532221065ff657094130557ff197d0c379c5508817b4c4b20ebf93bfd0a4a6902a3626f8bbfd259383886157e87505c90ee917bfabac33a38eb5638dbc39fd WHIRLPOOL ce5b4cc185bf558a120d068d2f471ef67045229d4113e10bc7edba9222cd2b1b578c4b577caf9443c1ed2777a4f7e179bb523f85f33156cd7f91d96addf26e95
+EBUILD cndrvcups-common-lb-2.90.ebuild 2901 SHA256 da54f31adbed3554bbfe446592d10e9678f28dec8f37625ba9de40b5774fbff2 SHA512 e94f3b9ef381417180869c7aade4274a64ca1db5ec60b53ee3f9ca03e76bb0f5b8e5929ab504226c5f502741143e6232f21088e1d231d8c88250fe8a886e65cd WHIRLPOOL f1b21c1fc988e97c8effcdf10240b97252a0cc544c6e72a5b2983bf79482945a3acd505fd73da26e34f8bf7c9c3bd05b1068d7da78ae1b25b563d3067fd895c2
+MISC ChangeLog 1138 SHA256 4d47efc59abc4d2b7b762b8cba553b0269639b70bf0bef2932de5e9872bec806 SHA512 fe2aecd6cf5b2c8d2fa99049668a9687dc3c34424ea012a3c18b2dcc22953cb4686ae064583f2041980b57e35a57779c6095cdcbb7abd2c097537c12c515da00 WHIRLPOOL 3e733f878a571cd41b848477d20a3a10dffeeb9160cfc105be81387ac1fb88621c17099b5f0c1fd1ae1a7c3dede4cc5360c0f06342cb23722e9b26cbd3eb1f7c
 MISC metadata.xml 225 SHA256 b7e6e80900482385366b93aef14189e6565e20272c8b46f2154acd91d61b849b SHA512 5e7f3cbd2fd2c315291abc5f2901d239ccf2f589216df57fde05f734cef55324329691aab12a66ddec9e17f8fba405824d4f65423ce21020a56bea2403aad019 WHIRLPOOL b3c5b48a1636f90cb2721a7fe7fbc854c4d99422cc539c6da84368a3a5372e2dd9c6e582d45797f30544fdd475bbcf8673448b8a54007fbfb99088970e938a17
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQj4BUACgkQCaWpQKGI+9QbtACfa/Tx0FmZCRbLSQ2flYabtYCX
-mhcAn14miyrEef26YM0fPLGBLXjFcsnz
-=1IDS
+iEYEAREIAAYFAlUlnmIACgkQCaWpQKGI+9TW/gCfaS9vwkhP6jzERw/YDX2nIOxX
+I4wAn2CL59OTMMBTUupc0wv5hhez5PpE
+=4rvW
 -----END PGP SIGNATURE-----
diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.70-r2.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.70-r2.ebuild
deleted file mode 100644
index 8f1cb700287f..000000000000
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.70-r2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.70-r2.ebuild,v 1.1 2013/10/14 18:31:11 pacho Exp $
-
-EAPI=5
-inherit autotools multilib versionator
-
-MY_PV="$(delete_all_version_separators)"
-SOURCES_NAME="Linux_UFRII_PrinterDriver_V${MY_PV}_uk_EN"
-
-DESCRIPTION="Common files for Canon drivers"
-HOMEPAGE="http://support-au.canon.com.au/contents/AU/EN/0100270808.html"
-SRC_URI="http://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAwMjcwODA5&cmp=ABS&lang=EN -> ${SOURCES_NAME}.tar.gz"
-
-LICENSE="Canon-UFR-II GPL-2 MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-# Needed because GPL2 stuff miss their sources in tarball
-RESTRICT="mirror"
-
-RDEPEND="
-	dev-libs/libxml2
-	gnome-base/libglade
-	net-print/cups
-	x11-libs/gtk+:2
-"
-DEPEND="${DEPEND}"
-
-S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb/}"
-
-# Don't raise a fuss over pre-built binaries
-QA_PREBUILT="
-	/usr/libexec/cups/filter/c3pldrv
-	/usr/$(get_abi_LIBDIR x86)/libColorGear.so.0.0.0
-	/usr/$(get_abi_LIBDIR x86)/libColorGearC.so.0.0.0
-	/usr/$(get_abi_LIBDIR x86)/libc3pl.so.0.0.1
-	/usr/$(get_abi_LIBDIR x86)/libcaepcm.so.1.0
-	/usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
-	/usr/$(get_abi_LIBDIR x86)/libcaiowrap.so.1.0.0
-	/usr/$(get_abi_LIBDIR x86)/libcanon_slim.so.1.0.0
-	/usr/$(get_libdir)/libcanonc3pl.so.1.0.0
-"
-QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}/${SOURCES_NAME}/Sources/"
-	unpack ./${P/-lb/}-1.tar.gz
-}
-
-change_dir() {
-	for i in cngplp buftool backend; do
-		cd "${i}"
-		"${@}"
-		cd "${S}"
-	done
-}
-
-src_prepare() {
-	sed -i -e \
-		"s:backenddir = \$(libdir)/cups/backend:backenddir = `cups-config --serverbin`/backend:" \
-		backend/Makefile.am || die
-
-	export "LIBS=-lgmodule-2.0"
-	change_dir eautoreconf
-}
-
-src_configure() {
-	change_dir econf
-}
-
-src_compile() {
-	change_dir emake
-
-	# Cannot be moved to 'change_dir' as it doesn't need eautoreconf
-	cd "${S}/c3plmod_ipc" && emake
-}
-
-src_install() {
-	MAKEOPTS+=" -j1" default
-
-	cd "${S}/c3plmod_ipc"
-	dolib.so libcanonc3pl.so.1.0.0
-	dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so.1"
-	dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so"
-
-	cd "${S}/data"
-	insinto /usr/share/caepcm
-	doins *
-
-	ABI=x86
-	cd "${S}/libs"
-	exeinto $(cups-config --serverbin)/filter
-	doexe c3pldrv
-	dolib.so libcaepcm.so.1.0
-	dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so.1"
-	dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so"
-	for lib in *.so.?.?.?; do
-		dolib.so "${lib}"
-		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}"
-		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}"
-	done
-
-	# c3pldrv dlopens the absolute path /usr/lib/libc3pl.so :(
-	if [[ "$(get_libdir)" != lib ]]; then
-		dosym "../$(get_libdir)/libc3pl.so" /usr/lib/libc3pl.so
-	fi
-}
diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.90.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.90.ebuild
index 222f8bb0fa1f..42a5c49e0723 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.90.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.90.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.90.ebuild,v 1.1 2014/09/25 09:27:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.90.ebuild,v 1.2 2015/04/08 21:32:22 pacho Exp $
 
 EAPI=5
 inherit autotools multilib versionator
@@ -14,7 +14,7 @@ SRC_URI="http://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAwMjcwODEx
 
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 # Needed because GPL2 stuff miss their sources in tarball
diff --git a/net-print/cndrvcups-lb/ChangeLog b/net-print/cndrvcups-lb/ChangeLog
index 8c7cf375a909..7c4c50c2d669 100644
--- a/net-print/cndrvcups-lb/ChangeLog
+++ b/net-print/cndrvcups-lb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cndrvcups-lb
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-lb/ChangeLog,v 1.5 2014/10/15 15:17:27 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-lb/ChangeLog,v 1.6 2015/04/08 21:32:48 pacho Exp $
+
+  08 Apr 2015; Pacho Ramos <pacho@gentoo.org> -cndrvcups-lb-2.70-r2.ebuild,
+  cndrvcups-lb-2.90.ebuild:
+  amd64/x86 stable, drop old
 
   15 Oct 2014; Pacho Ramos <pacho@gentoo.org> cndrvcups-lb-2.70-r2.ebuild,
   cndrvcups-lb-2.90.ebuild:
diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index c79ec39d6bf1..ba15d39e764c 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-lb/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST Linux_UFRII_PrinterDriver_V270_uk_EN.tar.gz 79196275 SHA256 282821cad7d0e0dacf9e49815cdc62f32404ea214fdab462e9e328fa9b1eea18 SHA512 6cb761db3873533772a770181e5383f9b9d5e2fd208edd0de8525faf4728111addb5720c86f5b8fdee876588c967acf168a64ae291b7cd202759c03b241cfe78 WHIRLPOOL 3092effe07cd042247e1f8f9de0752ee031f15eb51e539639a12f4fc81e1fabf874ee1fb4b515d4e7f2090405d0867eafe9439c93503fed4d0914fa5fa209655
 DIST Linux_UFRII_PrinterDriver_V290_uk_EN.tar.gz 90901373 SHA256 bcc9db26e261d239438aeb15f171b5b0e7fd305abd0729be0e806bb4c039654a SHA512 23181155f5719fa0a9c216c058be749b5faaa8ee745d260eba2e5e284ef4ff161e344289a7c301a2d74cc919c5031763b0daf41cd07686cfdce188492a9b34b2 WHIRLPOOL 82bb966d823f8019d6275d421ebd2ff848556415e1767bd8fc2638d97479e15029a48818e5b45e9210781f4f37fd269dde46763404314b6c47ee0b4670e03600
-EBUILD cndrvcups-lb-2.70-r2.ebuild 2797 SHA256 28b5fef6ea57986b8558cb734e2c1aba1e1c7a53379f4b0c2d5c5dfe985bccb5 SHA512 65fb0c88c62fb7155543ea32e6cc0e380080021d0f6d67032364ec47486382b40f546fc5df9406ee516582d4b69c77e3cbec0b0cfcff30aac8a40d532463f22f WHIRLPOOL 3027f47bc937a063dc58acfb72966e891ab73486212da5b397c1fba2efc3d819feb9cda246ba7bff29e24f4a4821db5942ad6eafc1123efba62ba84c748361ee
-EBUILD cndrvcups-lb-2.90.ebuild 2810 SHA256 49c7182aefc340fb3c79383d450ef63d63fe46014ed5e293757e5cf548558a48 SHA512 9928a0270f8c20eb537b93518dae7cc2a10b21d6b70852fde702ffb742addf0e3701b239d3aa30e0e2b3e03835102a6a0590907d6acf88fd62f0c953744bfd24 WHIRLPOOL dbfa5a40c3dec1f9a54b04f0131bb84ad7274e583d08b3f945bb48378f5e1f65436542c2b6502c2b9e271bd6eedc16a0de271eeb629b22d612ebc7ac2a10a3cb
-MISC ChangeLog 1065 SHA256 4e9eac62e93d47aa517eb38b6f92ad4115d104bfbc29afb5e296d463ebe542ef SHA512 c11cc20f0e1160d0535dba2bfe6e9d7850cfaf3c593121b8c2320bc8285cdadf5f9dc421d467697f239265bea3de7fe12d32d696e82fd950c21129fce42e2083 WHIRLPOOL 969daa3248bc08fb1c1e5eec381b77fb7465146ef1a1482fadd2e41f03e0a7f35bf3fdeb364ec2b98f6deef13ec68c360049c6652920f561192022c8d3e007cf
+EBUILD cndrvcups-lb-2.90.ebuild 2808 SHA256 a663958fa8ce571e811bd8a2cdb45b9605d5986e5607286efe4a3ac4a12bd58e SHA512 cf5716557a86310c3a919af2f0f8ca73a5bfcb97c3df2d2ee2cfd04d9719889cadf0aebb9dc7601a273c2a6acf6cf72e92a403bb91ded6fa64e748b0a0f6a18c WHIRLPOOL a89660659a8e2915b6485a83b59157057285712c2b926941bb84673d18a0bff54c1dc118f07829f954dbf21aa0bad782b6fa2bffb9d29710babf0421664b7b08
+MISC ChangeLog 1199 SHA256 ac747a4e5d33f4e6f33fdec1a8bbf892531c362e7656252ad3ebfb3c41872158 SHA512 6c5a483c6267a9d77524910f1b7788018bd31a8d164c5f37b93df9272967ac2ae4c0cc979c82305ce020ee6cd12f73fe11eb612ee827e1d7e472ccb9309c95d0 WHIRLPOOL 5b2246594d8d04db6e888a0620262bad8c7fd2b53af67f8cee8b6339bae1bf5dfa3e4b50cdbbd886cba5348b8a50b6bb1c2365c9fb65f37d516af15ece3ee898
 MISC metadata.xml 225 SHA256 b7e6e80900482385366b93aef14189e6565e20272c8b46f2154acd91d61b849b SHA512 5e7f3cbd2fd2c315291abc5f2901d239ccf2f589216df57fde05f734cef55324329691aab12a66ddec9e17f8fba405824d4f65423ce21020a56bea2403aad019 WHIRLPOOL b3c5b48a1636f90cb2721a7fe7fbc854c4d99422cc539c6da84368a3a5372e2dd9c6e582d45797f30544fdd475bbcf8673448b8a54007fbfb99088970e938a17
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ+kAgACgkQCaWpQKGI+9Se/gCeLlZAu6UmRhPmACJP1hDR9wR4
-ePoAn3FQGWpOuNSL0saiV5tbY4lVs7SG
-=T70G
+iEYEAREIAAYFAlUlnnwACgkQCaWpQKGI+9SUVwCeJOkR5l+9nHaT7UzZ0OXBI9I7
+4FIAnRc3d92Ynb8K7SXMpAQDgTgCacxS
+=afnR
 -----END PGP SIGNATURE-----
diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-2.70-r2.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-2.70-r2.ebuild
deleted file mode 100644
index 4f8aa61c16b1..000000000000
--- a/net-print/cndrvcups-lb/cndrvcups-lb-2.70-r2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-lb/cndrvcups-lb-2.70-r2.ebuild,v 1.2 2014/10/15 15:17:27 pacho Exp $
-
-EAPI=5
-inherit eutils autotools multilib versionator
-
-MY_PV="$(delete_all_version_separators)"
-SOURCES_NAME="Linux_UFRII_PrinterDriver_V${MY_PV}_uk_EN"
-
-DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux"
-HOMEPAGE="http://support-au.canon.com.au/contents/AU/EN/0100270808.html"
-SRC_URI="http://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAwMjcwODA5&cmp=ABS&lang=EN -> ${SOURCES_NAME}.tar.gz"
-
-LICENSE="Canon-UFR-II"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-# Needed because GPL2 stuff miss their sources in tarball
-RESTRICT="mirror"
-
-RDEPEND="
-	gnome-base/libglade
-	net-print/cups
-	~net-print/cndrvcups-common-lb-${PV}
-	x11-libs/gtk+:2
-	|| (
-		(
-			>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-			virtual/jpeg:62[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-		)
-	)
-"
-DEPEND="${DEPEND}"
-
-S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}"
-MAKEOPTS+=" -j1"
-
-# Don't raise a fuss over pre-built binaries
-QA_PREBUILT="
-	/usr/bin/cnpkbidi
-	/usr/bin/cnpkmoduleufr2
-	/usr/$(get_abi_LIBDIR x86)/libEnoJPEG.so.1.0.0
-	/usr/$(get_abi_LIBDIR x86)/libEnoJBIG.so.1.0.0
-	/usr/$(get_abi_LIBDIR x86)/libufr2filter.so.1.0.0
-	/usr/$(get_abi_LIBDIR x86)/libcnlbcm.so.1.0
-	/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0
-	/usr/$(get_abi_LIBDIR x86)/libcanonufr2.so.1.0.0
-"
-QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}/${SOURCES_NAME}/Sources/"
-	unpack ./${P}-1.tar.gz
-}
-
-change_dir() {
-	for i in ppd pstoufr2cpca cngplp cngplp/files cpca ; do
-		cd "${i}"
-		"${@}"
-		cd "${S}"
-	done
-}
-
-src_prepare() {
-	sed -i -e \
-		"s:filterdir = \$(libdir)/cups/filter:filterdir = `cups-config --serverbin`/filter:" \
-		pstoufr2cpca/filter/Makefile.am || die
-
-	export "LIBS=-lgmodule-2.0"
-	change_dir eautoreconf
-}
-
-src_configure() {
-	change_dir econf
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	cd "${S}/data"
-	insinto /usr/share/caepcm
-	doins *
-
-	cd "${S}/libs"
-	insinto /usr/share/cnpkbidi
-	doins cnpkbidi_info*
-
-	insinto /usr/share/ufr2filter
-	doins ThLB*
-
-	ABI=x86
-	dobin cnpkbidi cnpkmoduleufr2
-	dolib.so libcnlbcm.so.1.0
-	dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so.1"
-	dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so"
-	for lib in *.so.?.?.?; do
-		dolib.so "${lib}"
-		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}"
-		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}"
-	done
-
-	# c3pldrv dlopens the absolute path /usr/lib/libcnlbcm.so :(
-	if [[ "$(get_libdir)" != lib ]]; then
-		dosym "../$(get_libdir)/libcnlbcm.so" /usr/lib/libcnlbcm.so
-	fi
-}
diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild
index 3f5dd9d37460..7c3faf6e44f2 100644
--- a/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild,v 1.2 2014/10/15 15:17:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild,v 1.3 2015/04/08 21:32:48 pacho Exp $
 
 EAPI=5
 inherit eutils autotools multilib versionator
@@ -14,7 +14,7 @@ SRC_URI="http://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAwMjcwODEx
 
 LICENSE="Canon-UFR-II"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 # Needed because GPL2 stuff miss their sources in tarball