Add a git snapshot #545130 by hfk22.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 362 insertions, 20 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 204bb14236a8..df25ef2fb548 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.273 2015/07/08 10:45:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.274 2015/07/08 10:47:04 vapier Exp $
+
+*sane-backends-1.0.25_pre20150628 (08 Jul 2015)
+
+  08 Jul 2015; Mike Frysinger <vapier@gentoo.org>
+  +sane-backends-1.0.25_pre20150628.ebuild:
+  Add a git snapshot #545130 by hfk22.
 
   08 Jul 2015; Mike Frysinger <vapier@gentoo.org>
   files/sane-backends-1.0.24-automagic_systemd.patch,
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 5673e50aae1d..4e588b6f4e9f 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -2,33 +2,35 @@
 Hash: SHA256
 
 AUX niash_array_index.patch 4141 SHA256 a44687911c10e66c1a57efe73508d1c78eed55fa2699fe7e13c62ddc7b646187 SHA512 13dcba7d609cb5fe27442918818b46dd55b3d4c65aeb3f379377671775cf28f8cd48950a0633fb3abb33db29b223798c0b00a86a029956ae0bc323edc344d28f WHIRLPOOL c93d1c770e49550eb72f82f2a48385600b806531cc4e6072fa7317515c16ac7847acb63be7d8c94592fee299e433f438a2f7db82f362d7a57e79c42a2b13940b
-AUX sane-backends-1.0.24-automagic_systemd.patch 1310 SHA256 5461cb3aa8bad1b299cd92c525cf6af5a3af5a82e81a74549a7f660d026ee610 SHA512 1edf28a2d106cf05df92a55ef3bf4ea530c9ee69a2517f14a33a5ff30ba69702d818677da1715ab19169a4d5575f1c7c2755431193d48a40d4f80d11e6308120 WHIRLPOOL 9404f9938567bec86487969fa0e1af21cf83c8aa88344983c09a2380c279c3de7b9c4bcd8a41836ffc3ab9628bfe4f8a38c0c165f5d933adefc66fb589fdf5d6
-AUX sane-backends-1.0.24-cross-compile.patch 574 SHA256 beb113ee487dd4a9a221689eaa601cb7dbec2a4e25122ec46c3765bcd9dbcd16 SHA512 f16fbed42ec273d9361ab40a3489b3f7ddc179c1aebee20027c49e716a605056e587db10e990474647abcae5a7468d6d2bc43e42a94bc97ab091ae7ea7a6becd WHIRLPOOL 0343d7294672858d2b49b90b42353f33ea2d5419aa26b73b5c25a374c3761273570fc05e4e4f3a2136c5b948feba82e2ac0acedaf6bd4944c3f945e3e0f28505
-AUX sane-backends-1.0.24-kodakaio_avahi.patch 2900 SHA256 83f2a75a379fd964e8662d61394dd61d674bfaf5d4cf13d12725af83aaa36f7e SHA512 c00c01d2b7ad1770117403373ece89b14ff58ed23b6719b01f89c381dd88a1195c6c57c1d3ca25d7036ea21128a36f14675e7bfae0e6db671db24fb4c1422674 WHIRLPOOL ee3be39baa2a33615308d1805d0c5f59ae6e1b4e72f481ef0629c71f94f4d26dbd06e2dca12a969e883f0453e07953c1bfbc8cbafc19dca16f5ec1e2c86ceaeb
+AUX sane-backends-1.0.24-automagic_systemd.patch 1800 SHA256 9e2fbec72ccaee7b2ac90770f0b9f1136e8b6232423d1c6662889ad3cf18d4d7 SHA512 e76083f857c56647851ef64a714ce604b07d34f5132ad5fcbbe2eef07cf5ea7c4c389e1c3a724e2036f9c940dd4388479c56e817ee370e16892ff40ba0d97e02 WHIRLPOOL a0dcee1e6d938ef9f6c62bae95b81adfdfef169e7ab30f08bcd5e4f0407dc183f8181aa402fa3122f88beed06f05538bb501d00163f64ee17160c4caafbbe2b9
+AUX sane-backends-1.0.24-cross-compile.patch 1031 SHA256 ee22b72f78c3443bc9e30190dcef2219dd25d7b377aae04b1cf32834ff5fd282 SHA512 8d42a2393e592b2c33b810c24c558a48ab2f42f8726661ab089429ea7756badc973293a042f4ab3d7f2ec57b7ae36e4594d64ff1cfa71cd9d828452d2b375724 WHIRLPOOL e2bec4a4360b85115f936518276bbdb767f7a07ed183445a48d0ea271165b7718f789e949dffd2d430330f138ba81ec394e4c3f115fd229a6efe7de99318188f
+AUX sane-backends-1.0.24-kodakaio_avahi.patch 3582 SHA256 057b03f7ab50d4a90c5fded1f5315322608b8efbb29e574cd45ad759858a2c8c SHA512 98261755561dd0eec6a64a18302da98f66d5b5252afb8cbe9b3839287b9dbc5be83f2537faf7138ef85cfde6a874efa9b4655bc48b8030f984545b9b2db96365 WHIRLPOOL 8c42dd31f87db8e7f7b148f4949bb4871333f1eb944b76a955aa25f51bc5e46b32283d94b1b2ac65a87476e5ff831a77b30062af2f5aca1f1551762fe8c6789f
 AUX sane-backends-1.0.24-saned_pidfile_location.patch 345 SHA256 c95f305d01fd0dfb63944788f450d798a8882412f1d3e6da5c7e49f33cceba51 SHA512 49519b8fea68292b8cbd7bdcaf5b4803a1b890800e17015ace1d662e4503cc0844f191793c8f42cd6aa7e9922ee9f961d4784e30f22abc497973be1978bf1b24 WHIRLPOOL d72b314c7e4898c83a4c79e6fa39af978bd60e2b78afa58c1f8e1709b5f597292e965d330a58cd4109780fb2051dcd7880008f65d2b204fe476cbf3ce898e22b
-AUX sane-backends-1.0.24-systemd_pkgconfig.patch 1324 SHA256 8a6a253e5869d0a5e9d3296b9e7525c892a74b12e25c8945fffeb52521efeaa8 SHA512 1d503302ef60e7a16d764997768a1aca3cf2a0109fc53d9c353761354aad2b34caa3dc2763c343fe1af6544021ed9c288f0e951e2d10218a80fd9d081aabb5d5 WHIRLPOOL 8e4df791a67f859d9f1893301bc238f1cf26d8568ffbfdefd7321d8e0f87ce5b079a378788af58b42f4506e15cac6bf7607410df2b54dae9b815a83b2134c28f
-AUX sane-backends-1.0.24-unused-cups.patch 1658 SHA256 ceb0b0809c90e8c89da70bf054c62d96a621e8a141ad2d4a9f9e48e222728376 SHA512 9c8eca84f7fe9bb4b9a80e622a577fa270f7790e84ad1cdac3894f8c6fd2f91756f14227a128c3e9252d16c16e7a51b3695c52e983871eae96d8afb2970a0296 WHIRLPOOL cd55ab0dbd86196c54e560a874e8e5c5435655c85068d35d8560fa8888dfb3bac19a4900ebfa59fde5e6a576ce3759b8bd7a61fce614872bec1afb6859cce53d
+AUX sane-backends-1.0.24-systemd_pkgconfig.patch 1885 SHA256 86844e78f2aebbf5282b4b4597510a71aedd96565015095e03b34edb3a4e1089 SHA512 caade198072bdaa2f91f7d233a99e54a75a1eddef38b18774888736971ef8ea1cfa25ef4031afb30db5514a05dd5beedd6ec5c949d41ab6bf261ec51a8d2b7cc WHIRLPOOL 058ba42be07e5ed6f0485c88fcda6a7d2471a36484923a00e5c33e04d520b3f155061bd6f7152c5d3ddcbadf12838b8eb7b830807f139a5a886d42148c38fdef
+AUX sane-backends-1.0.24-unused-cups.patch 2263 SHA256 ac7fa3ea3929309415b98571e0f497bb722b1a897f49d59b543102e9011f193c SHA512 711bcf1beeef0a996d8a1c769504cbed793b6944365880357d1a842fb8b4ea3baa8ae1fb73d9038c0eefb4fe6d3bf4063d28ad874aaf7aeee8a46b38cc496a05 WHIRLPOOL 1b1784e53e72bc71e39ad9a55ac737925a0f08658c4c9a11b78c0aab4ea205baacef19ecd5ad293daef1b1759592eaa8d82a34e2145f85b81d8ab1c2ea22980e
 AUX saned 150 SHA256 d18856d6dd26fac11988fea5217c8616686ad3c0c024ad5437efbf0fd24984f5 SHA512 26f3d66c6b1e75d87d7d430518aa878c77d5ab8d76a45847cef3ff15566341938eedf46c50d0fa8cdeef828df9cddefdd6fdd767c5de30d3aa7d64ed1911d910 WHIRLPOOL 5bdd707daeba740b980ce6dd51096716eec2c2939681f6abd9e7f73b50d8d384a68a07dcc11e9295cd123cc5d2a53d02def52133a559c3e33d63612028d2aac5
 AUX saned.confd 76 SHA256 197e44ba1f438a18f5f7d9f5858feb19c1ece4286d82a5e63caf9be5b964aa76 SHA512 8f4a99ef24c19b3a7213b3d25ea16f5bca8623735cf25d21e3a706e9e0135ac8cce5d0b8fb8728845977f41dcefe6bd858076d755515fc91b00e05ee5817d751 WHIRLPOOL ede920bf5eb1ee59263296a2ccce1ab2da2b04669c2f8a58de1fc4fa76cc1eee501290eb4fdaece464bc184cc0cfb17d100e9309a33d79c06142a3f03c91b837
 AUX saned.initd 411 SHA256 4dd4e7fa07bf2ab2d4f5753156f5df0ad2277523f6755b0eab3d2db3480989e2 SHA512 ec9c11c84dc405981fd854f99007a5fcae5403685894acd1d1108fc772147a54d9fad9103dcff708765efff644e972260459c19fe439af17db76562dc1b5ba84 WHIRLPOOL bec23753fc557a36a6990ed565519bb62e1bc9a6bd81c0c16cc956cd6dbc1c6fd661775b8c8bf05faa1f5bbbef2406498094a0adc48c9fd81e89f4531669c4e8
 DIST sane-backends-1.0.24.tar.gz 5778749 SHA256 27c7085a54f1505d8b551e6f1e69d30e1ee57328b18429bb2225dabf4c45462d SHA512 1e9f962bb9d27f17067eb662dabfc0a1aa0d06e16bec4bd28868124b468578d82f14f6d2c1f5de63d2cec57ca4584ec12d3b2c2b1de20f1199aece581453ebc5 WHIRLPOOL 19b939c920a3c157044c85a941debdc664d8781562fa3fc04f061b9d216b089be80edfd43479069382adf13e68160518fdbd5c84a5f4c506a46f8521d4ed2a1c
+DIST sane-backends-git20150628.tar.gz 5765552 SHA256 4cfd1245df8ade75cbfaedec91b1daaea6d30e0736e5d2f9afcd0a56fc357711 SHA512 8e8160b2337502a0b77724ffaa5bd65a6daaa3fa5587f1b72e2714c9253e8130e96170d7f1de38210e17c5524cbe0953ff0464d29db194354d4e9b7249782eaf WHIRLPOOL d9b9a4f44cb3fcda9c8099d5ed3a9764e0a961f80ae1a89dda4e0ec8e6c24c830ad0feebd13c28af848c133a99e50d21c2f01269e434af31b17164a377edbbff
 EBUILD sane-backends-1.0.24-r5.ebuild 7736 SHA256 c5eb8693b77737ce43fb64ff253fc7f56661a6dc166cf8557f4a842b124f8b7f SHA512 f50d72c1c225b4c4e1bfd141793f64f79f10c33cbe52a5356f6944def1a785c8c70184489e035f021a6f37b43fd0fe8dd656cdddd45c8cf322aa5cc84ff58dce WHIRLPOOL 91b061da5de7e0497e53e851d86f06545691f7af68e1449bec42ffd91b943cf8ec69144c25c1bd0d8c3eaa5c31100050a8b49bc420db91317a49179151f915a8
-MISC ChangeLog 46625 SHA256 2e9677c93974364c71a3317d2070e8a16b42099f405794ca8ee375ba09d4f720 SHA512 d1ade5b3201e31fdb6225ebb0a7fbfcd6446d1a33817a6abef3cb54b82bcdee75a038fcc8222417ec98600f28064a0ad403cad882cee7d7e8326179210990157 WHIRLPOOL 1a4e413023c510daa22dc11f6b6bfb8ae825132ae68c1bf0ddeb80137fcf8e1fd2e15e2a476b5f00b63feae3d8f960b8ea473aca9e99866ef4949ae83735714d
+EBUILD sane-backends-1.0.25_pre20150628.ebuild 7913 SHA256 806650189ce3c30deeca53f186bf57c6426989a65db680a2141bbf67960786aa SHA512 c064e5b6b0ac24b3829f74b23169a764669f47de92e13390632607d503450e6bb26f5fc36134e39f23671057f9cad0d70d63bb35a5ccee3ab7ee65eb667933c5 WHIRLPOOL b07437f0bdd18d8455464c6968a455087d1e1899a1c77ae20227abef96094a4a8697b0fe00723e72b120bef02da4cee69231a4dc70460bcf9b0cea8dcfb0bbbc
+MISC ChangeLog 47169 SHA256 c4c5d45b21fba13d67b8e7d090ec5d87882e6e94c943b01f25c0b2eaffc91770 SHA512 a3e299f4f2078bfd50949f3e2e69ab9ae9d3e4dc71a3ae116d881222657acdd082968e1c64a43183179c7c476d93dd2787572fc5f86c22c4c636fa5a544f9684 WHIRLPOOL 799d019f7d346c62994ccc3932f030e24a9f2180e46e2c33327a817f55b0fe30c3774561da1ff5aaf6dbc183a29957917e260dbf35ca0506cfc9ca3399333217
 MISC metadata.xml 212 SHA256 70bbfd181623c884c763902ca127ef24c917b2e55cda0869e6ffaa6c4ebc5757 SHA512 85ac7770baae8cc7c2c52dcd077a448cfb394ec6585e274ffa01c8f92a862d22c6ba0553b71cf2ae6b6f28f6faa5c3d615537f35f9fe0da9f43a2c9043953784 WHIRLPOOL 221b2f4e9b984954eb7268028287339e8678c794c7b4e40ab2baaa037c8e87bac30c8b64473efade9b3ee1ce226aab4ad36760147eee5af7cfd7c081473c839b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVVbtxAAoJEPGu1DbS6WIAzJ0QAJDsJ8M9rApQnCnS0wy0qbeo
-ejB8XzakifxY/M4CyGB3AW2O09Kt7RxVbu1pZdUK2yGeOK1XC4yHIStuc3SeJhiP
-WibUbLYquZSXerAm0T6nO3c9Ijq5+TY+CEJ9/XTJV6v0HdhLosqd7mO9L/lMmLTB
-EI7ycabw4Ye9j9mSRVLvo26vlkuHLIrZYZ86puVv8Ef66zNUnZYTOwdeXaVRruTo
-ohhuWqbX6fLzl6jw/StAQJYr2tRF2sS7aiPyqufZhckI9FfmUXMLlF4KB5cku+R5
-sgZC/E2CUdkBwfuQ8fwjI5yvqgZ+3Pylw08YxAVmANLuBarf8PByxCOwMpfhU/Wp
-XDVM7vuKg07LrmkBMDqLPwB/7O2Ox/N7qZ0c5i0ZWlbecr7PlTYOe9DaCQdqLvR4
-6irSGgSA+LcPw8LRuOrF7mrMIH2didBF5G36oSUilB7FVDQLQs4hOvqCISJbNiUg
-y4Ye/s+TD56rgQhkAGER3VZE86vXL4KDBm2f9jdKhGKGU2jOOw30ETMIphIB5UTP
-O+H8QxWlngN2aTVBoncDOTNe1Xx7dEB5pnIAHSJr0HgoHk4fisVJEXhzT+KEKZ+8
-58ckk071gXSEv4mZ4WeGqQ6YciAeIub7hWdxSfA3AbSWzrWXrgiy9W9Rg2K2zFSh
-3Kj07k5EcFeND6V0ZyUj
-=Fk5F
+iQIcBAEBCAAGBQJVnP+pAAoJEPGu1DbS6WIA2C4P/0VpD/MjQ3GDaxMLXfWvt9nv
+s/VpUECV+BwZpTjZ0tWIKCjqkwXoIf6QDEqsz2t7gOwMWi80bQlkMFbnooepAPgv
+jwJQaUtHO/N7C+qOP1kPJFzOWxitIgT9injSyBz8+H3F4mZmrv+CVMcdZSYbxa+o
+9FwcxQhsU+wUOoheOC140fQSj7PCshyE/Laxh90CbUyDuFGERNOVtBXlY17ROcja
+PgoFoZKeOWc/XO4RPqPlrq/1cnIpKfFOcSCDhx35XoqKZsXCpI3UwwEniCXsQYlU
+bzDEPQmvvc6VS/m6u8xQHzyyupykd8gowxD+QK+mn1+p+arAskerDTBF2VopyCa1
+C/yrGZhsZO7UbSz9ch5TcNDlHJztbzWWPM+Y7wKN9et/XMPWkT9bQW+FCIwp05xT
+5UWnwXs2axhy0Tk0kN+SHypjYm42/p5z6GlVtzAYm+AaGGQaO3JcPH8hlyIaEL2M
+p9bxBE9UHn6hSPrYu3U5brIMoTC8mgvQqdmF8DaQ9xjl5p9Jv2wOkzX7C78h4W/6
+Sz00ppqWkuzyZS73or0QlclsRAZeTOMga9p1ivXylHzQLy6srv8Pk0dU1mUPtT9i
+qjpGtmsgKy2YCPwELM0soJLXwQaFAb4Lw50eZUoPYIGBdwJBrHW6ceSaby5G8PZW
+jxw3QUohIPGdHzLGaDWW
+=Db0k
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild b/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild
new file mode 100644
index 000000000000..3cc95b2a7079
--- /dev/null
+++ b/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild
@@ -0,0 +1,334 @@
+# Copyright 1999-2015 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.25_pre20150628.ebuild,v 1.1 2015/07/08 10:47:04 vapier 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/"
+if [[ ${PV} == *_pre* ]] ; then
+	MY_P="${PN}-git${PV#*_pre}"
+	SRC_URI="http://www.sane-project.org/snapshots/${MY_P}.tar.gz
+		mirror://gentoo/${MY_P}.tar.gz"
+	S=${WORKDIR}/${MY_P}
+else
+	MY_P=${P}
+	SRC_URI="https://alioth.debian.org/frs/download.php/file/3958/${P}.tar.gz"
+fi
+
+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-0-r2[${MULTILIB_USEDEP}] )
+	sane_backends_dc240? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] )
+	sane_backends_dell1600n_net? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}]
+									>=media-libs/tiff-3.9.7-r1[${MULTILIB_USEDEP}] )
+	avahi? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+	sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
+	usb? ( >=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}] )
+	gphoto2? (
+		>=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
+		>=virtual/jpeg-0-r2[${MULTILIB_USEDEP}]
+	)
+	v4l? ( >=media-libs/libv4l-0.9.5[${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
+	)
+	>=virtual/pkgconfig-0-r1[${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}"/${PN}-1.0.24-automagic_systemd.patch \
+		"${FILESDIR}"/${PN}-1.0.24-systemd_pkgconfig.patch \
+		"${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch \
+		"${FILESDIR}"/${PN}-1.0.24-cross-compile.patch
+	# Fix for "make check".
+	sed -i -e 's/sane-backends 1.0.24git/sane-backends 1.0.24/' testsuite/tools/data/html*
+	mv configure.{in,ac} || die
+	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=../${MY_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."
+}