* [gentoo-commits] gentoo-x86 commit in media-gfx/sane-backends: ChangeLog sane-backends-1.0.24-r1.ebuild sane-backends-1.0.24.ebuild
@ 2013-10-22 2:24 Christopher Brannon (teiresias)
0 siblings, 0 replies; only message in thread
From: Christopher Brannon (teiresias) @ 2013-10-22 2:24 UTC (permalink / raw
To: gentoo-commits
teiresias 13/10/22 02:24:22
Modified: ChangeLog
Added: sane-backends-1.0.24-r1.ebuild
Removed: sane-backends-1.0.24.ebuild
Log:
Remove *unused* automagic dependency, fix "make check" failure.
sane-backends no longer depends on cups, but the detection code was
still in the configure script.
The patch is from upstream's git; it will go away in 1.0.25.
Also, fix make check failure due to
incorrect hard-coded data. Closes bug #488658.
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0x6521e06d)
Revision Changes Path
1.230 media-gfx/sane-backends/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/ChangeLog?rev=1.230&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/ChangeLog?rev=1.230&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/ChangeLog?r1=1.229&r2=1.230
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- ChangeLog 16 Oct 2013 01:21:17 -0000 1.229
+++ ChangeLog 22 Oct 2013 02:24:22 -0000 1.230
@@ -1,6 +1,16 @@
# ChangeLog for media-gfx/sane-backends
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.229 2013/10/16 01:21:17 teiresias Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.230 2013/10/22 02:24:22 teiresias Exp $
+
+*sane-backends-1.0.24-r1 (22 Oct 2013)
+
+ 22 Oct 2013; Christopher Brannon <teiresias@gentoo.org>
+ -sane-backends-1.0.24.ebuild, +sane-backends-1.0.24-r1.ebuild,
+ +files/sane-backends-1.0.24-unused-cups.patch:
+ Remove *unused* automagic dependency, fix "make check" failure.
+ sane-backends no longer depends on cups, but the detection code was
+ still in the configure script. Also, fix make check failure due to
+ incorrect hard-coded data. Closes bug #488658.
*sane-backends-1.0.24 (16 Oct 2013)
1.1 media-gfx/sane-backends/sane-backends-1.0.24-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24-r1.ebuild?rev=1.1&content-type=text/plain
Index: sane-backends-1.0.24-r1.ebuild
===================================================================
# Copyright 1999-2013 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-r1.ebuild,v 1.1 2013/10/22 02:24:22 teiresias Exp $
EAPI="5"
inherit autotools eutils flag-o-matic multilib 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
if [ ${backend} = pnm ]; then
IUSE="${IUSE} -sane_backends_pnm"
elif [ ${backend} = mustek_usb2 -o ${backend} = kvs40xx ]; then
IUSE="${IUSE} sane_backends_${backend}"
else
IUSE="${IUSE} +sane_backends_${backend}"
fi
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 )
sane_backends_dc240? ( virtual/jpeg )
sane_backends_dell1600n_net? ( virtual/jpeg
media-libs/tiff )
avahi? ( >=net-dns/avahi-0.6.24 )
sane_backends_canon_pp? ( sys-libs/libieee1284 )
sane_backends_hpsj5s? ( sys-libs/libieee1284 )
sane_backends_mustek_pp? ( sys-libs/libieee1284 )
usb? ( virtual/libusb:1 )
gphoto2? (
media-libs/libgphoto2:=
virtual/jpeg
)
v4l? ( media-libs/libv4l )
xinetd? ( sys-apps/xinetd )
snmp? ( net-analyzer/net-snmp )
systemd? ( sys-apps/systemd )
"
DEPEND="${RDEPEND}
v4l? ( sys-kernel/linux-headers )
doc? (
virtual/latex-base
dev-texlive/texlive-latexextra
)
>=sys-apps/sed-4
virtual/pkgconfig"
# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device)
RDEPEND="${RDEPEND}
!<sys-fs/udev-114"
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}-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
# 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) $(use_with snmp)"
# you can only enable this backend, not disable it...
if use sane_backends_pnm; then
myconf="${myconf} --enable-pnm-backend"
fi
if ! use doc; then
myconf="${myconf} --disable-latex"
fi
if use sane_backends_mustek_pp; then
myconf="${myconf} --enable-parport-directio"
fi
if ! ( use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ); then
myconf="${myconf} sane_cv_use_libieee1284=no"
fi
# if LINGUAS is set, just use the listed and supported localizations.
if [ "${LINGUAS-NoLocalesSet}" != NoLocalesSet ]; then
echo > po/LINGUAS
for lang in ${LINGUAS}; do
if [ -a po/${lang}.po ]; then
echo ${lang} >> po/LINGUAS
fi
done
fi
SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
BACKENDS="${BACKENDS}" econf \
$(use_with gphoto2) \
$(use_with systemd) \
$(use_with v4l) \
$(use_enable avahi) \
$(use_enable ipv6) \
$(use_enable threads pthread) \
${myconf}
}
src_compile() {
emake VARTEXFONTS="${T}/fonts"
if use usb; then
cd tools/hotplug
grep -v '^$' libsane.usermap > libsane.usermap.new
mv libsane.usermap.new libsane.usermap
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 "${S}"/tools
${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} -I. -I../include \
../sanei/sanei_config.c ../sanei/sanei_constrain_value.c \
../sanei/sanei_init_debug.c 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
}
src_install () {
emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
docdir="${EPREFIX}"/usr/share/doc/${PF}
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
insinto /etc/hotplug/usb
exeinto /etc/hotplug/usb
doins tools/hotplug/libsane.usermap
doexe tools/hotplug/libusbscanner
newdoc tools/hotplug/README README.hotplug
fi
udev_newrules tools/udev/libsane.rules 41-libsane.rules
insinto "/usr/share/pkgconfig"
doins tools/sane-backends.pc
dodoc NEWS AUTHORS ChangeLog* PROBLEMS README README.linux
find "${ED}" -name "*.la" | while read file; do rm "${file}"; done
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 an USB scanner, add all users who want"
elog "to access your scanner to the \"scanner\" group."
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-10-22 2:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-22 2:24 [gentoo-commits] gentoo-x86 commit in media-gfx/sane-backends: ChangeLog sane-backends-1.0.24-r1.ebuild sane-backends-1.0.24.ebuild Christopher Brannon (teiresias)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox