Version bump

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

6 files changed, 254 insertions, 14 deletions

diff --git a/net-print/cndrvcups-common-lb/ChangeLog b/net-print/cndrvcups-common-lb/ChangeLog
index ce7f63ea995b..f1e0406de033 100644
--- a/net-print/cndrvcups-common-lb/ChangeLog
+++ b/net-print/cndrvcups-common-lb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/cndrvcups-common-lb
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-common-lb/ChangeLog,v 1.3 2013/10/14 18:31:11 pacho Exp $
+# 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 $
+
+*cndrvcups-common-lb-2.90 (25 Sep 2014)
+
+  25 Sep 2014; Pacho Ramos <pacho@gentoo.org> +cndrvcups-common-lb-2.90.ebuild:
+  Version bump
 
 *cndrvcups-common-lb-2.70-r2 (14 Oct 2013)
 
diff --git a/net-print/cndrvcups-common-lb/Manifest b/net-print/cndrvcups-common-lb/Manifest
index f2585dc88409..243c984263e2 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -2,13 +2,15 @@
 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
-MISC ChangeLog 853 SHA256 ec940c589c4ea6233da0927d16115340d45ae00d04b4dde2356737ff9807e911 SHA512 ae44b1f5a1cf9958573a85ee3e671b471dc2c1955aa533d55d158391669dbeab439f16363a87568b48619be0e4d21825a70f96fb970ca626b914f72005b8b14d WHIRLPOOL d0b6d7e973eb89b4c54399b989c1c2dc52052a47dcff99eeccb19091d55eb32cfec995103c9d17348fbf8c86642ab9b6041aa7e43cf2e48fbec059136f5392df
+EBUILD cndrvcups-common-lb-2.90.ebuild 2903 SHA256 ae62548b15bef552d41a95fe274d9a183a380f2ee39cf808c67e305515a01a67 SHA512 2a735652b00d9a18cbe8e70c064c6af7cf36da38f20df03b671c6650b0d4dd6b3f7b72b77dad4e88a87e6aa1c17e0dbc19eaed3a300176a87d4654b48f61672f WHIRLPOOL 6e8a7f054f7fdb52dc01d7f8d1865171eaa5cf0ef6a8d60299ceafc7f98cd1aa3c0bda1dfed350db59f456e7358cc2ea631bda0a5c264d20da3f2e61fb2e5bed
+MISC ChangeLog 990 SHA256 1d3f9c9d2761268cb1665ea9345ef292c0b7b482087b196b38df593ad560491a SHA512 69532221065ff657094130557ff197d0c379c5508817b4c4b20ebf93bfd0a4a6902a3626f8bbfd259383886157e87505c90ee917bfabac33a38eb5638dbc39fd WHIRLPOOL ce5b4cc185bf558a120d068d2f471ef67045229d4113e10bc7edba9222cd2b1b578c4b577caf9443c1ed2777a4f7e179bb523f85f33156cd7f91d96addf26e95
 MISC metadata.xml 225 SHA256 b7e6e80900482385366b93aef14189e6565e20272c8b46f2154acd91d61b849b SHA512 5e7f3cbd2fd2c315291abc5f2901d239ccf2f589216df57fde05f734cef55324329691aab12a66ddec9e17f8fba405824d4f65423ce21020a56bea2403aad019 WHIRLPOOL b3c5b48a1636f90cb2721a7fe7fbc854c4d99422cc539c6da84368a3a5372e2dd9c6e582d45797f30544fdd475bbcf8673448b8a54007fbfb99088970e938a17
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlJcOHAACgkQCaWpQKGI+9RoDgCfWEhXmSNCDvrtRFETUQaDR6GS
-MKQAn1oAMMKqHqmZbtlB+t8/qb2BDfsy
-=VwAy
+iEYEAREIAAYFAlQj4BUACgkQCaWpQKGI+9QbtACfa/Tx0FmZCRbLSQ2flYabtYCX
+mhcAn14miyrEef26YM0fPLGBLXjFcsnz
+=1IDS
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..222f8bb0fa1f
--- /dev/null
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.90.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2014 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 $
+
+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=MDEwMDAwMjcwODEx&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
+
+	einstalldocs
+
+	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-lb/ChangeLog b/net-print/cndrvcups-lb/ChangeLog
index 08a2ec0da44f..fbe6dc5a7f0f 100644
--- a/net-print/cndrvcups-lb/ChangeLog
+++ b/net-print/cndrvcups-lb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/cndrvcups-lb
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-lb/ChangeLog,v 1.3 2013/10/14 18:23:12 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-lb/ChangeLog,v 1.4 2014/09/25 09:28:08 pacho Exp $
+
+*cndrvcups-lb-2.90 (25 Sep 2014)
+
+  25 Sep 2014; Pacho Ramos <pacho@gentoo.org> +cndrvcups-lb-2.90.ebuild:
+  Version bump
 
 *cndrvcups-lb-2.70-r2 (14 Oct 2013)
 
diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index a12cfa870cba..4e23b07fc20c 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-lb/Manifest
@@ -2,13 +2,15 @@
 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 2729 SHA256 d1bbfedf334e2ee37eb65566be6d6e83d82122e92f2185b60169eb73fc0bddbd SHA512 28b1d1df30f8e3e1dbfead9e2f3fdac316c693d5a7a841048c6420cd5d686790d3843947ec7053d3c808b06dd33cc32fd17fbfbcca6cf87fa262c20faea698f1 WHIRLPOOL 57a33e17fe7989b5220aab352a143272afdc0a217c9aef86a9404722d807be5a581aa33ba35c2f051203a74fab537db94b7000ac2f6c0a7ed41c739f59b109a4
-MISC ChangeLog 783 SHA256 183744de7edfb47f2da35c26ad8c15ee069cc29c582d374840fa0c1abf7eabf2 SHA512 1db338614ace3669ea21930a13f58302a68d5c64d2b999745f0541a6c9e4985574ad14a12307fb5f9b78d236456928cba2dd788be3f13b5e0cf786de2047e662 WHIRLPOOL bd006ae481ca4f710dbccc6f708dfa1bc80c559085b9d203f7771969854f358398accad183ade96d57ecd2815d0909f173676c3f6271a6c169cd0d119375657f
+EBUILD cndrvcups-lb-2.90.ebuild 2742 SHA256 deb6689ac878537cba8164cccbc8ca9edba62a21ab66b4275429a52605ce535c SHA512 03a9b05fcd3fbf73c92e1cd86b3afe9fa3be8c5682d89e972e23a968e17874b578ca71f2b0e7cdc1f1e0b154762d987eeb5d869d64eade5de28237164bbb7691 WHIRLPOOL 0d0d6f37444e288133681027fe5812d2d49bd6e90da24490f244863e269475e976619dbb00e1fb9f95d6987747780899bb0c73ffd4746044c714b695abdf5e76
+MISC ChangeLog 906 SHA256 e7fc7ea53a7a50c9dc2d7e25ea30285daeb43274f12f3c43e4e8edf56a53f992 SHA512 a18314db3191f2e4b9cbbfdc1e10a4fe1dbb373fe7085669210182e4962be596101f08123db99141c779c418382a8c4d5e9f944709df9c725b0f912129982273 WHIRLPOOL a29712fe0f332c00316c7d6fd9a120c91cdaf38d45c3103a42cb9a59b084d186b81e677e0c2b2dea3952452fb3dc8e40286715da311fa225d5c8b0d70bacebc7
 MISC metadata.xml 225 SHA256 b7e6e80900482385366b93aef14189e6565e20272c8b46f2154acd91d61b849b SHA512 5e7f3cbd2fd2c315291abc5f2901d239ccf2f589216df57fde05f734cef55324329691aab12a66ddec9e17f8fba405824d4f65423ce21020a56bea2403aad019 WHIRLPOOL b3c5b48a1636f90cb2721a7fe7fbc854c4d99422cc539c6da84368a3a5372e2dd9c6e582d45797f30544fdd475bbcf8673448b8a54007fbfb99088970e938a17
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlJcNpIACgkQCaWpQKGI+9Tu3ACfYwSEHftCctDOhs8RHDQTEBvl
-ZDgAn3XStTwhC0zxD+dDugvPWPDz1GWp
-=zZhP
+iEYEAREIAAYFAlQj4CkACgkQCaWpQKGI+9TKWwCdG/79lBCEL9jOKCE04+YZvaRA
+99oAn0GDA2XOld9LwIETzwk7UrtZTzN9
+=uBG+
 -----END PGP SIGNATURE-----
diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild
new file mode 100644
index 000000000000..18c5067a1e9d
--- /dev/null
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild
@@ -0,0 +1,114 @@
+# 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.90.ebuild,v 1.1 2014/09/25 09:28:08 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=MDEwMDAwMjcwODEx&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
+	amd64? (
+		app-emulation/emul-linux-x86-baselibs
+	)
+	x86? (
+		dev-libs/libxml2
+		virtual/jpeg:62
+	)
+"
+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
+
+	einstalldocs
+
+	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
+}