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, 118 insertions, 66 deletions

diff --git a/net-print/cndrvcups-lb/ChangeLog b/net-print/cndrvcups-lb/ChangeLog
index 7a51934897f5..08a2ec0da44f 100644
--- a/net-print/cndrvcups-lb/ChangeLog
+++ b/net-print/cndrvcups-lb/ChangeLog
@@ -1,6 +1,12 @@
 # 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.2 2013/07/01 19:10:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cndrvcups-lb/ChangeLog,v 1.3 2013/10/14 18:23:12 pacho Exp $
+
+*cndrvcups-lb-2.70-r2 (14 Oct 2013)
+
+  14 Oct 2013; Pacho Ramos <pacho@gentoo.org> +cndrvcups-lb-2.70-r2.ebuild,
+  -cndrvcups-lb-2.70-r1.ebuild:
+  Fix installation of missing files (#478290 by Michael Marineau)
 
 *cndrvcups-lb-2.70-r1 (01 Jul 2013)
 
diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-2.70-r1.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-2.70-r1.ebuild
deleted file mode 100644
index 767333d1796f..000000000000
--- a/net-print/cndrvcups-lb/cndrvcups-lb-2.70-r1.ebuild
+++ /dev/null
@@ -1,65 +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-lb/cndrvcups-lb-2.70-r1.ebuild,v 1.1 2013/07/01 19:10:18 pacho Exp $
-
-EAPI=5
-inherit eutils autotools 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"
-IUSE=""
-
-# Needed because GPL2 stuff miss their sources in tarball
-RESTRICT="mirror"
-
-RDEPEND="
-	dev-libs/libxml2
-	gnome-base/libglade
-	net-print/cups
-	~net-print/cndrvcups-common-lb-${PV}
-	x11-libs/gtk+:2
-"
-DEPEND="${DEPEND}"
-
-S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}"
-MAKEOPTS+=" -j1"
-
-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
-}
diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-2.70-r2.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-2.70-r2.ebuild
new file mode 100644
index 000000000000..73c1d882a79b
--- /dev/null
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-2.70-r2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2013 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.1 2013/10/14 18:23:12 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
+	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
+	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
+}