Fix installation of missing files (#478290 by Michael Marineau)

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 117 insertions, 67 deletions

diff --git a/net-print/cndrvcups-common-lb/ChangeLog b/net-print/cndrvcups-common-lb/ChangeLog
index f0e92b86a56c..ce7f63ea995b 100644
--- a/net-print/cndrvcups-common-lb/ChangeLog
+++ b/net-print/cndrvcups-common-lb/ChangeLog
@@ -1,6 +1,12 @@
 # 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.2 2013/07/01 19:04:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-common-lb/ChangeLog,v 1.3 2013/10/14 18:31:11 pacho Exp $
+
+*cndrvcups-common-lb-2.70-r2 (14 Oct 2013)
+
+  14 Oct 2013; Pacho Ramos <pacho@gentoo.org>
+  +cndrvcups-common-lb-2.70-r2.ebuild, -cndrvcups-common-lb-2.70-r1.ebuild:
+  Fix installation of missing files (#478290 by Michael Marineau)
 
 *cndrvcups-common-lb-2.70-r1 (01 Jul 2013)
 
diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.70-r1.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.70-r1.ebuild
deleted file mode 100644
index eeddd5347187..000000000000
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.70-r1.ebuild
+++ /dev/null
@@ -1,66 +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-r1.ebuild,v 1.1 2013/07/01 19:04:05 pacho Exp $
-
-EAPI=5
-inherit autotools 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"
-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/}"
-
-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
-}
-
-src_install() {
-	MAKEOPTS+=" -j1" default
-}
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
new file mode 100644
index 000000000000..8f1cb700287f
--- /dev/null
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.70-r2.ebuild
@@ -0,0 +1,110 @@
+# 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
+}