Drop version with unsatisfiable deps

Package-Manager: portage-2.2.10/cvs/Linux x86_64

3 files changed, 6 insertions, 317 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index b899e17cbbad..3661e4f2dd7c 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,10 @@
 # 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.257 2014/06/18 19:24:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.258 2014/07/16 05:20:46 patrick Exp $
+
+  16 Jul 2014; Patrick Lauer <patrick@gentoo.org>
+  -sane-backends-1.0.24-r1.ebuild:
+  Drop version with unsatisfiable deps
 
   18 Jun 2014; Michał Górny <mgorny@gentoo.org> sane-backends-1.0.24-r5.ebuild:
   Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index fab14a4cc84f..663c71ed88cd 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX kodakaio-fixes.patch 1319 SHA256 531a83ba5c27407a6ef1c73a4e5cc96dcfafda5083e01b018bd4c7754d61367f SHA512 e800dc116df194754067b134b81386651a35784f42c1b645e577e63c8302d4dd5a0db4a29869d8f90e9ef661dd7810bede5eb4de932499160fead5ec05b2d961 WHIRLPOOL ca2d2aa77e08775d076577d74dcb097d9ecc431ac8e72bfd35b3a90bdc6402880a2e2cdfb033bf9c5d3616e570b7d99b55c557c8c971d27db25d3ffd3d71b29b
 AUX niash_array_index.patch 4141 SHA256 a44687911c10e66c1a57efe73508d1c78eed55fa2699fe7e13c62ddc7b646187 SHA512 13dcba7d609cb5fe27442918818b46dd55b3d4c65aeb3f379377671775cf28f8cd48950a0633fb3abb33db29b223798c0b00a86a029956ae0bc323edc344d28f WHIRLPOOL c93d1c770e49550eb72f82f2a48385600b806531cc4e6072fa7317515c16ac7847acb63be7d8c94592fee299e433f438a2f7db82f362d7a57e79c42a2b13940b
 AUX parallel-install-1.0.19.patch 1117 SHA256 5c3cb9747058df277eb6d7db8574252149834b61b68e0569ddf61bf67869449f SHA512 9f5b1245d76bb4e7511b00c0d2cc68c7477c56588bec480a68ed717825b4a177ae03a1873c2967a9e685f51445f6121eee688649fb325116fb9298980184cf95 WHIRLPOOL e4a66212c9b97ac4134a50452291c7af34837d9e6dca819e050c5eeecf30ac23d116e35b4c2f2b097c0beb3240b151c5babd9fb53e154a75961be31c41d4b860
@@ -22,27 +19,7 @@ DIST sane-backends-1.0.24.tar.gz 5778749 SHA256 27c7085a54f1505d8b551e6f1e69d30e
 EBUILD sane-backends-1.0.23-r1.ebuild 6716 SHA256 e32dfb1d2487652cf2977f79f6744fc7e2da676daeab2d9ba21fb75f70c97488 SHA512 3802f885e17cfa90e1dc4b7c91a16db4eb1fa4e803b655799557e8207cddc8b9cd0d548fdbc34e9ab9b28916b2e6d96905ec1d0d1648b760fe7e2617218dd2c6 WHIRLPOOL a38682c1b6a7212253f2bb0f9dea5adcd995908d2009bee548cfd0699dec2297f7940333e349f502cc66c4faf9ece869ff5453f28e7ba6efd3cd692b2155a311
 EBUILD sane-backends-1.0.23-r2.ebuild 6994 SHA256 0dad30427f3d982aaaf5bb0e34d9d370d50ad43179f4000543e7ff2b4dcab6ec SHA512 a9e5c521a087dccb61385a9ec73be611f84ef61a90f289c49e169d22e0db88dc8997acde18c0fa7e014b7812f962d76f2780dc45409d17945287d411e0789de6 WHIRLPOOL 2e0c37396f2583c6d728ccd27ebe55a9890be416c397459f6ca16172c205dd473fe85829eed270f00f01d7ee9cfabeb4b2d91c28ac2480992c6a96514a74e41c
 EBUILD sane-backends-1.0.23.ebuild 6453 SHA256 f8f16bc95d192d4ab4d509d67585d7ef423c0b68488f209ccea2fc843ad1aaa7 SHA512 2aa779439770a7993466b113555106c122e989b9226fb15e2b616f17d0ebf50da22154eff751043fec828fe529191fffe3e1d5b3465ce522d155f83f45284f8b WHIRLPOOL a6e07f218cfb297dd99a3bcbc28186b79ad81e2309dd4049e1c70922cb6b0583d0f1f598c136ce09c45a27d964aeaefa34b0fabff12c0452b936cb2af62c625f
-EBUILD sane-backends-1.0.24-r1.ebuild 6704 SHA256 a911a226db38cd0c160d6f18026a156c40700062b1515025ad4fc528c69bcfc2 SHA512 a0da35ba9d933a6e6f74d9b25d7cd5c360c59956339a17c669bf881733178f5e8c23b551b20f86934dd7dbe615a84dc26b4070eddcdb52abe0c795e57450493d WHIRLPOOL fb3bfde74661c97cc1a126fee58f8ec5bfff7e2b85c004829d1ccf27726b91552b108b0d03db14585704868492295a610072f009c9d9221840f997ec2fadeeee
 EBUILD sane-backends-1.0.24-r3.ebuild 6845 SHA256 379ea6fea6b4828eb8a337a5c14b8a440cf598dd25f78a516d6ee4cff26a575a SHA512 1fed8393ee0eaf6e30bd097e520cf1c7165b094cb72ead98c26d26d938807d4fa446c23ce01f99935a765143824f232bd83ad5c8e38f0108d9c7f51f8295adbe WHIRLPOOL edffbd3c6a337cd928661ff85f2b7fbf4edd174d14704e7ff0d819adadce6bc73e14dd83b5b0a4549bc467338a8940c73f69c3a020a7471f6dda944cba0fd663
 EBUILD sane-backends-1.0.24-r5.ebuild 7701 SHA256 d1eb05882983bdecaa1a1a6a8f93fae12925346c6bda52552fa1d26c4c5049bb SHA512 52d6c930973096d60dbf391100cd0c32c7ff1b09be40717db11f0ca85ae8c6225cf1be4db9ea1c8779aa9b9936c45bf870319af17127fc9d25564ca6c15b773f WHIRLPOOL 804f5e06804b18c391fa9bddac27d712545422f196c78978c81d2a658752fa289eafa79ab2c274bd65831ee81513b498b1de8465ac7610aed2591a63d7c77d4d
-MISC ChangeLog 44500 SHA256 eb339178bf1666e41fcf6c9d0319e4d19467b3837a849344aceaf86ff55527ee SHA512 4b0f7ce691e64a18696290aad9ba58ac39f250b1e3b21e229f5bafe9dd33e7dba49c7f81794467ee5e31db4d500d4f939a298f9c7b84bf2b9c45a8c25265d71f WHIRLPOOL 9cb12edaf45b98d1b88b0411f8b85b3554c7fe179145c6b2990a44dc618b5ceb5346931c50ce2e358600c7f1cb9aaab1fd2ddfde02c36584cdbe4a83208dd1f3
+MISC ChangeLog 44626 SHA256 a17dc5954516d86675d99a3246705308a21100baa57620219aaebb0838ab0f10 SHA512 73309c64d9fc4a27491649848b7e4b3646eeda42847bcf271b6b4448f7755779867a49212131142a5714cc8c0ceab7380d3319fd1e71332f6072503dba6a7f98 WHIRLPOOL 9781001a140e0a9adaa15a1719a94ae2dbf7e8b0e0f9b6991d49e88f63de243674248607d124f9445ac664bf3b5c8d1bf74f6bd843c0fbdf8fb7b2a3397ea375
 MISC metadata.xml 233 SHA256 c5f5ebf692f6c9e98fb12ac750be2e67f8b316b820dc6d36dfa3f22fead02ca4 SHA512 76ddd2dcdfdb17b98cd96ee032935125b95ee8b78722c1049b9beaef6cf482760c6bd7791d77ef5ca52c4185a5c01222a5f874c033ec3788cce2b4906ed18682 WHIRLPOOL 30cd038d04c297199c5d1d340f3612ce5e4226c099e1272b6c3257c2f9ff61cac32b577ffbcbdee7f888f8ededa9fa6d5aec6801249b2db53586531788f39229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQJ8BAEBCABmBQJToeeOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOsIYQAMJ0wVpJh1pRCtEJDvmY/k3M
-GePQjlD0JQU7FqAX9W1oQWovh8plf/QraJyHiXQOfdlvFojbejiSQb8csRkWEU4X
-CtBnZFtoUHhTB8fdeOhmX5XXj7VZOP1RRAAl5FdkJHxaHh/bOWcOIj1gFPzWYbRZ
-MtbhQt7sx7ipmO5r6hgT0swKB77kvLFIHhZWg6B8fa1oTrgQ7iA5gDuKvZt1/Hj+
-SALN4e9vxZ5EkP8MFa7mNri2f4iHjAdLjqbHrPOir7jHs3EL6phtV5ab5u09GSWg
-4b39nXQ+sx77s/nHpdEv0Gl9bAZ9YNTsohx4YKzgwWAsRtmIUp5ky6qZGydYwXiZ
-9XbbKExeIWSkabmAlrC2HarbYrPlifLGWaiMP8nBcxHgIshtPhRCoDAuBjUN0zMu
-d8E80i90pUCT9fqWyChKNGvOujbqJRaRzfvB9KL7wrmnWX4up+szXo/qpwSNTYyj
-IyqmywM24DKN5c35hdwE5zKC4rhD7VZd1Tx66oyAgW/89zzNA2d4nIWd6Gk2VY7j
-gAfTumiyge4ORdjBdeLFAgy+kS/lKwYpYVkE06O+/1YK5CQF4L2sxEE9NxP6eCUd
-rVC3RX+EbcUsDZlPHotOxOdddBmgJnoEnwVii3joY+xaVIN65+OwgFGkDkEydrMx
-qt0bw5oc3yrHg07Q7zkv
-=gjbY
------END PGP SIGNATURE-----
diff --git a/media-gfx/sane-backends/sane-backends-1.0.24-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.24-r1.ebuild
deleted file mode 100644
index 7995745318aa..000000000000
--- a/media-gfx/sane-backends/sane-backends-1.0.24-r1.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# 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-r1.ebuild,v 1.12 2014/03/03 17:00:17 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-209 )
-"
-
-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 a USB scanner, add all users who want"
-	elog "to access your scanner to the \"scanner\" group."
-}