From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4C2121381F3 for ; Mon, 14 Oct 2013 18:31:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF3CBE0ADF; Mon, 14 Oct 2013 18:31:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 79F1BE0ADF for ; Mon, 14 Oct 2013 18:31:14 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6CCBD33ED24 for ; Mon, 14 Oct 2013 18:31:13 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2262) id A8A992004C; Mon, 14 Oct 2013 18:31:11 +0000 (UTC) From: "Pacho Ramos (pacho)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, pacho@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in net-print/cndrvcups-common-lb: cndrvcups-common-lb-2.70-r2.ebuild ChangeLog cndrvcups-common-lb-2.70-r1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: cndrvcups-common-lb-2.70-r2.ebuild ChangeLog cndrvcups-common-lb-2.70-r1.ebuild X-VCS-Directories: net-print/cndrvcups-common-lb X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20131014183111.A8A992004C@flycatcher.gentoo.org> Date: Mon, 14 Oct 2013 18:31:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6f49840e-a791-4ad6-9853-ae6645653d68 X-Archives-Hash: 8a63464b5e6f742e3a3f108577693999 pacho 13/10/14 18:31:11 Modified: ChangeLog Added: cndrvcups-common-lb-2.70-r2.ebuild Removed: cndrvcups-common-lb-2.70-r1.ebuild Log: Fix installation of missing files (#478290 by Michael Marineau) (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) Revision Changes Path 1.3 net-print/cndrvcups-common-lb/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cndrvcups-common-lb/ChangeLog?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cndrvcups-common-lb/ChangeLog?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cndrvcups-common-lb/ChangeLog?r1=1.2&r2=1.3 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-print/cndrvcups-common-lb/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ChangeLog 1 Jul 2013 19:04:05 -0000 1.2 +++ ChangeLog 14 Oct 2013 18:31:11 -0000 1.3 @@ -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 + +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) 1.1 net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.70-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.70-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.70-r2.ebuild?rev=1.1&content-type=text/plain Index: cndrvcups-common-lb-2.70-r2.ebuild =================================================================== # 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 }