mgorny 14/05/21 19:00:07 Modified: ChangeLog Added: sane-backends-1.0.24-r4.ebuild Log: Enable multilib support, bug #493168. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.253 media-gfx/sane-backends/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/ChangeLog?rev=1.253&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/ChangeLog?rev=1.253&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/ChangeLog?r1=1.252&r2=1.253 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v retrieving revision 1.252 retrieving revision 1.253 diff -u -r1.252 -r1.253 --- ChangeLog 17 May 2014 14:04:05 -0000 1.252 +++ ChangeLog 21 May 2014 19:00:07 -0000 1.253 @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/sane-backends # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.252 2014/05/17 14:04:05 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.253 2014/05/21 19:00:07 mgorny Exp $ + +*sane-backends-1.0.24-r4 (21 May 2014) + + 21 May 2014; Michał Górny <mgo...@gentoo.org> +sane-backends-1.0.24-r4.ebuild: + Enable multilib support, bug #493168. 17 May 2014; Agostino Sarubbo <a...@gentoo.org> sane-backends-1.0.24-r3.ebuild: Stable for alpha, wrt bug #506928 1.1 media-gfx/sane-backends/sane-backends-1.0.24-r4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24-r4.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24-r4.ebuild?rev=1.1&content-type=text/plain Index: sane-backends-1.0.24-r4.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24-r4.ebuild,v 1.1 2014/05/21 19:00:07 mgorny Exp $ EAPI="5" inherit autotools eutils flag-o-matic multilib multilib-minimal udev user toolchain-funcs # gphoto and v4l are handled by their usual USE flags. # The pint backend was disabled because I could not get it to compile. IUSE_SANE_BACKENDS=" abaton agfafocus apple artec artec_eplus48u as6e avision bh canon canon630u canon_dr canon_pp cardscan coolscan coolscan2 coolscan3 dc210 dc240 dc25 dell1600n_net dmc epjitsu epson epson2 fujitsu genesys gt68xx hp hp3500 hp3900 hp4200 hp5400 hp5590 hpljm1005 hpsj5s hs2p ibm kodak kodakaio kvs1025 kvs20xx kvs40xx leo lexmark ma1509 magicolor matsushita microtek microtek2 mustek mustek_pp mustek_usb mustek_usb2 nec net niash p5 pie pixma plustek plustek_pp pnm qcam ricoh rts8891 s9036 sceptre sharp sm3600 sm3840 snapscan sp15c st400 stv680 tamarack teco1 teco2 teco3 test u12 umax umax1220u umax_pp xerox_mfp" IUSE="avahi doc gphoto2 ipv6 threads usb v4l xinetd snmp systemd" for backend in ${IUSE_SANE_BACKENDS}; do case ${backend} in # Disable backends that require parallel ports as no one has those anymore. canon_pp|hpsj5s|mustek_pp|\ pnm) IUSE+=" -sane_backends_${backend}" ;; mustek_usb2|kvs40xx) IUSE+=" sane_backends_${backend}" ;; *) IUSE+=" +sane_backends_${backend}" esac done REQUIRED_USE=" sane_backends_mustek_usb2? ( threads ) sane_backends_kvs40xx? ( threads ) " DESCRIPTION="Scanner Access Now Easy - Backends" HOMEPAGE="http://www.sane-project.org/"; SRC_URI="https://alioth.debian.org/frs/download.php/file/3958/${P}.tar.gz"; LICENSE="GPL-2 public-domain" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" RDEPEND=" sane_backends_dc210? ( virtual/jpeg[${MULTILIB_USEDEP}] ) sane_backends_dc240? ( virtual/jpeg[${MULTILIB_USEDEP}] ) sane_backends_dell1600n_net? ( virtual/jpeg[${MULTILIB_USEDEP}] media-libs/tiff[${MULTILIB_USEDEP}] ) avahi? ( >=net-dns/avahi-0.6.24[${MULTILIB_USEDEP}] ) sane_backends_canon_pp? ( sys-libs/libieee1284[${MULTILIB_USEDEP}] ) sane_backends_hpsj5s? ( sys-libs/libieee1284[${MULTILIB_USEDEP}] ) sane_backends_mustek_pp? ( sys-libs/libieee1284[${MULTILIB_USEDEP}] ) usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] virtual/jpeg[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) xinetd? ( sys-apps/xinetd ) snmp? ( net-analyzer/net-snmp ) systemd? ( sys-apps/systemd:0= ) " DEPEND="${RDEPEND} v4l? ( sys-kernel/linux-headers ) doc? ( virtual/latex-base dev-texlive/texlive-latexextra ) >=sys-apps/sed-4 virtual/pkgconfig[${MULTILIB_USEDEP}]" # We now use new syntax construct (SUBSYSTEMS!="usb|usb_device) RDEPEND="${RDEPEND} !<sys-fs/udev-114 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" MULTILIB_CHOST_TOOLS=( /usr/bin/sane-config ) pkg_setup() { enewgroup scanner enewuser saned -1 -1 -1 scanner } src_prepare() { cat >> backend/dll.conf.in <<-EOF # Add support for the HP-specific backend. Needs net-print/hplip installed. hpaio # Add support for the Epson-specific backend. Needs media-gfx/iscan installed. epkowa EOF epatch "${FILESDIR}"/niash_array_index.patch \ "${FILESDIR}"/${P}-unused-cups.patch \ "${FILESDIR}"/${P}-automagic_systemd.patch \ "${FILESDIR}"/${P}-systemd_pkgconfig.patch \ "${FILESDIR}"/${P}-kodakaio_avahi.patch \ "${FILESDIR}"/${P}-saned_pidfile_location.patch # Fix for "make check". sed -i -e 's/sane-backends 1.0.24git/sane-backends 1.0.24/' testsuite/tools/data/html* AT_NOELIBTOOLIZE=yes eautoreconf } src_configure() { append-flags -fno-strict-aliasing multilib-minimal_src_configure } multilib_src_configure() { # the blank is intended - an empty string would result in building ALL backends. local BACKENDS=" " use gphoto2 && BACKENDS="gphoto2" use v4l && BACKENDS="${BACKENDS} v4l" for backend in ${IUSE_SANE_BACKENDS}; do if use "sane_backends_${backend}" && [ ${backend} != pnm ]; then BACKENDS="${BACKENDS} ${backend}" fi done local myconf=( $(use_enable usb libusb_1_0) $(multilib_native_use_with snmp) ) # you can only enable this backend, not disable it... if use sane_backends_pnm; then myconf+=( --enable-pnm-backend ) fi if ! use doc; then myconf+=( --disable-latex ) fi if use sane_backends_mustek_pp; then myconf+=( --enable-parport-directio ) fi if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp; }; then myconf+=( sane_cv_use_libieee1284=no ) fi # if LINGUAS is set, just use the listed and supported localizations. if [ "${LINGUAS-NoLocalesSet}" != NoLocalesSet ]; then mkdir -p po || die echo > po/LINGUAS for lang in ${LINGUAS}; do if [ -a "${S}"/po/${lang}.po ]; then echo ${lang} >> po/LINGUAS fi done fi # relative path must be used for tests to work properly ECONF_SOURCE=../${P} \ SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \ BACKENDS="${BACKENDS}" \ econf \ $(use_with gphoto2) \ $(multilib_native_use_with systemd) \ $(use_with v4l) \ $(use_enable avahi) \ $(use_enable ipv6) \ $(use_enable threads pthread) \ ${myconf} } multilib_src_compile() { emake VARTEXFONTS="${T}/fonts" if use usb; then cd tools/hotplug || die sed -i -e '/^$/d' libsane.usermap || die fi if tc-is-cross-compiler; then # The build system sucks and doesn't handle this properly. # https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366 tc-export_build_env BUILD_CC cd "${BUILD_DIR}"/tools || die ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} -I. -I../include -I"${S}"/include \ "${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \ "${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die local dirs=( hal hotplug hotplug-ng udev ) local targets=( hal/libsane.fdi hotplug/libsane.usermap hotplug-ng/libsane.db udev/libsane.rules ) mkdir -p "${dirs[@]}" || die emake "${targets[@]}" fi } multilib_src_install() { emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \ docdir="${EPREFIX}"/usr/share/doc/${PF} if multilib_is_native_abi; then if use usb; then insinto /etc/hotplug/usb doins tools/hotplug/libsane.usermap fi udev_newrules tools/udev/libsane.rules 41-libsane.rules insinto "/usr/share/pkgconfig" doins tools/sane-backends.pc fi } multilib_src_install_all() { keepdir /var/lib/lock/sane fowners root:scanner /var/lib/lock/sane fperms g+w /var/lib/lock/sane dodir /etc/env.d if use usb; then exeinto /etc/hotplug/usb doexe tools/hotplug/libusbscanner newdoc tools/hotplug/README README.hotplug fi dodoc NEWS AUTHORS ChangeLog* PROBLEMS README README.linux prune_libtool_files --all if use xinetd; then insinto /etc/xinetd.d doins "${FILESDIR}"/saned fi newinitd "${FILESDIR}"/saned.initd saned newconfd "${FILESDIR}"/saned.confd saned } pkg_postinst() { if use xinetd; then elog "If you want remote clients to connect, edit" elog "/etc/sane.d/saned.conf and /etc/hosts.allow" fi elog "If you are using a USB scanner, add all users who want" elog "to access your scanner to the \"scanner\" group." }
