diff options
author | 2015-01-27 23:51:57 +0000 | |
---|---|---|
committer | 2015-01-27 23:51:57 +0000 | |
commit | 2d4fda5dcbdd7409115d5eeac9f63c79869cd1fc (patch) | |
tree | 152a94cc721d6e0599ab10680ea9451c4b1e7813 /media-gfx | |
parent | Remove old versions. (diff) | |
download | gentoo-2-2d4fda5dcbdd7409115d5eeac9f63c79869cd1fc.tar.gz gentoo-2-2d4fda5dcbdd7409115d5eeac9f63c79869cd1fc.tar.bz2 gentoo-2-2d4fda5dcbdd7409115d5eeac9f63c79869cd1fc.zip |
Remove old versions.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x6521e06d)
Diffstat (limited to 'media-gfx')
10 files changed, 12 insertions, 1313 deletions
diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog index 59a16a5946b1..3781f722098f 100644 --- a/media-gfx/sane-backends/ChangeLog +++ b/media-gfx/sane-backends/ChangeLog @@ -1,6 +1,16 @@ # 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.268 2014/12/04 08:39:15 ago Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.269 2015/01/27 23:51:57 teiresias Exp $ + + 27 Jan 2015; Christopher Brannon <teiresias@gentoo.org> + -sane-backends-1.0.23.ebuild, -sane-backends-1.0.23-r1.ebuild, + -sane-backends-1.0.23-r2.ebuild, -sane-backends-1.0.24-r3.ebuild, + -files/parallel-install-1.0.19.patch, + -files/sane-backends-1.0.23-automagic-cups.patch, + -files/sane-backends-1.0.23-automagic-v4l.patch, + -files/sane-backends-1.0.23-saned_pidfile_location.patch, + -files/kodakaio-fixes.patch: + Remove old versions. 04 Dec 2014; Agostino Sarubbo <ago@gentoo.org> sane-backends-1.0.24-r5.ebuild: Stable for ppc64, wrt bug #525750 diff --git a/media-gfx/sane-backends/files/kodakaio-fixes.patch b/media-gfx/sane-backends/files/kodakaio-fixes.patch deleted file mode 100644 index b4c7b85997cf..000000000000 --- a/media-gfx/sane-backends/files/kodakaio-fixes.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- backend/kodakaio.c 2013-03-15 08:24:26.000000000 +0100 -+++ backend/kodakaio.c.new 2013-03-15 08:30:06.000000000 +0100 -@@ -2129,6 +2129,9 @@ - } - - #if HAVE_CUPS -+ -+const char * _httpResolveURI (const char *uri, char *resolved_uri, size_t resolved_size, int options, int(*cb)(void *context), void *context); -+ - /* ProcessDevice is called by cupsGetDevices to process each discovered device in turn */ - void - ProcessDevice(const char *device_class, const char *device_id, const char *device_info, const char *device_make_and_model, const char *device_uri, const char *device_location, void *user_data) -@@ -2172,7 +2175,7 @@ - options |= _HTTP_RESOLVE_FQDN ? not sure if or when required - options = 0 seems to work */ - DBG(5, "using _httpResolveURI\n"); -- resolved = _httpResolveURI(device_uri, uribuffer, sizeof(uribuffer), 0, NULL, NULL); -+ resolved = _httpResolveURI(device_uri, uribuffer, sizeof(uribuffer), 0, 0, NULL); - - /* extract the IP address */ - if(extract_from_id(resolved, "socket://", ':', ip_addr, sizeof(ip_addr)) != 0) { -@@ -2197,7 +2200,7 @@ - - reply = cupsGetDevices(CUPS_HTTP_DEFAULT, CUPS_TIMEOUT_DEFAULT, - "dnssd", CUPS_EXCLUDE_NONE, ProcessDevice, Dummy); -- if(reply != IPP_OK) printf("Failed cupsGetDevices\n"); -+ if(reply != IPP_OK) DBG(1,"Failed cupsGetDevices\n"); - - return 0; - } diff --git a/media-gfx/sane-backends/files/parallel-install-1.0.19.patch b/media-gfx/sane-backends/files/parallel-install-1.0.19.patch deleted file mode 100644 index bc26ef53a389..000000000000 --- a/media-gfx/sane-backends/files/parallel-install-1.0.19.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- backend/Makefile.in 2008-08-12 21:50:12.000000000 +0200 -+++ backend/Makefile.in.new 2008-08-12 21:58:24.000000000 +0200 -@@ -234,8 +234,10 @@ - - install: $(INSTALL_LOCKPATH) install-be@BE_INSTALL_FLAVOR@ install-libsane install-becfg - --install-be: -+install-paths: - $(MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(libsanedir) $(DESTDIR)$(configdir) -+ -+install-be: install-paths - @# Install all backends in $(prefix)/lib/sane/ - @list="$(LIBS)"; for be in $$list; do \ - echo installing $${be} in $(DESTDIR)$(libsanedir)/$${be}...; \ -@@ -267,13 +269,13 @@ - cp -p .libs/libsane-$${be}.so $(DESTDIR)$(BEOS_ADDONDIR)/$${be} || exit 1; \ - done - --install-libsane: -+install-libsane: install-paths - @echo installing libsane.la in $(DESTDIR)$(libdir)/libsane.la... - @$(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) libsane.la \ - $(DESTDIR)$(libdir)/libsane.la >/dev/null - @$(LIBTOOL) $(MINST) --finish $(DESTDIR)$(libdir) - --install-becfg: -+install-becfg: install-paths - @list="$(CONFIGS)"; for cfg in $$list; do \ - if test ! -r $${cfg}; then continue; fi; \ - if test -f $(DESTDIR)$(configdir)/$${cfg}; then \ diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.23-automagic-cups.patch b/media-gfx/sane-backends/files/sane-backends-1.0.23-automagic-cups.patch deleted file mode 100644 index bcdd944e4a7a..000000000000 --- a/media-gfx/sane-backends/files/sane-backends-1.0.23-automagic-cups.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Naur sane-backends-1.0.23/configure.in sane-backends-1.0.23.new/configure.in ---- sane-backends-1.0.23/configure.in 2012-08-19 13:31:34.000000000 -0700 -+++ sane-backends-1.0.23.new/configure.in 2013-08-26 14:41:22.613012270 -0700 -@@ -326,16 +326,24 @@ - AC_DEFINE(HAVE_DEV_URANDOM, 1, [Is /dev/urandom available?]) - fi - --nl added by PN 3/2/12 to detect cups --$as_echo "checking for cups" --if test -e /usr/include/cups/cups.h ; then -- AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?]) -+AC_ARG_ENABLE(cups, -+ AC_HELP_STRING([--enable-cups], [enable CUPS support]), -+ [enable_cups=$enableval], [enable_cups=no]) -+ -+if test "$enable_cups" != no; then -+ dnl added by PN 3/2/12 to detect cups -+ $as_echo "checking for cups" -+ if test -e /usr/include/cups/cups.h ; then -+ AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?]) - with_cups="yes" - LIBS="-lcups $LIBS" --else -+ else - $as_echo "cups.h not found, you may want to install a cups development package" - $as_echo "in order to autodetect network scanners in kodakaio." - with_cups="no" -+ fi -+else -+ with_cups=no - fi - - dnl *********** diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.23-automagic-v4l.patch b/media-gfx/sane-backends/files/sane-backends-1.0.23-automagic-v4l.patch deleted file mode 100644 index 78a6c7be207b..000000000000 --- a/media-gfx/sane-backends/files/sane-backends-1.0.23-automagic-v4l.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/configure.in b/configure.in -index b62d4d3..76e37b2 100644 ---- a/configure.in -+++ b/configure.in -@@ -129,7 +129,16 @@ SANE_CHECK_LOCKING - SANE_CHECK_GPHOTO2 - - --PKG_CHECK_MODULES(LIBV4L, libv4l1, have_libv4l1=yes, have_libv4l1=no) -+AC_ARG_WITH(v4l, -+ AC_HELP_STRING([--with-v4l], -+ [include the v4l backend @<:@default=yes@:>@]), -+ [# If --with-v4l=no or --without-v4l, disable backend -+ # as "$with_v4l" will be set to "no"]) -+ -+if test "$with_v4l" != "no" ; then -+ PKG_CHECK_MODULES(LIBV4L, libv4l1, have_libv4l1=yes, have_libv4l1=no) -+fi -+ - AC_SUBST(LIBV4L_LIBS) - AC_SUBST(LIBV4L_CFLAGS) - diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.23-saned_pidfile_location.patch b/media-gfx/sane-backends/files/sane-backends-1.0.23-saned_pidfile_location.patch deleted file mode 100644 index c682961f7c3f..000000000000 --- a/media-gfx/sane-backends/files/sane-backends-1.0.23-saned_pidfile_location.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sane-backends-1.0.23/frontend/saned.c -+++ sane-backends-1.0.23/frontend/saned.c -@@ -221,7 +221,7 @@ - int numchildren; - - #define SANED_CONFIG_FILE "saned.conf" --#define SANED_PID_FILE "/var/run/saned.pid" -+#define SANED_PID_FILE "/var/run/saned/saned.pid" - - #define SANED_SERVICE_NAME "sane-port" - #define SANED_SERVICE_PORT 6566 diff --git a/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild deleted file mode 100644 index b5f3bb1b0fd2..000000000000 --- a/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild +++ /dev/null @@ -1,295 +0,0 @@ -# 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.23-r1.ebuild,v 1.3 2013/05/08 19:35:31 vapier Exp $ - -EAPI="5" - -inherit 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" - -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/3752/sane-backends-1.0.23.tar.gz.1 - https://alioth.debian.org/frs/download.php/3753/sane-backends-1.0.23.tar.gz.2 - https://alioth.debian.org/frs/download.php/3754/sane-backends-1.0.23.tar.gz.3" - -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:0 ) - gphoto2? ( - media-libs/libgphoto2:= - virtual/jpeg - ) - v4l? ( media-libs/libv4l ) - xinetd? ( sys-apps/xinetd ) - snmp? ( net-analyzer/net-snmp ) -" - -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_unpack() { - local file - for file in ${A}; do - cat "${DISTDIR}/${file}" - done > "${P}.tar.gz" - unpack ./"${P}.tar.gz" -} - -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.23-saned_pidfile_location.patch \ - "${FILESDIR}"/kodakaio-fixes.patch -} - -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) $(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_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." -} diff --git a/media-gfx/sane-backends/sane-backends-1.0.23-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.23-r2.ebuild deleted file mode 100644 index 79b5fe1b40c3..000000000000 --- a/media-gfx/sane-backends/sane-backends-1.0.23-r2.ebuild +++ /dev/null @@ -1,303 +0,0 @@ -# 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.23-r2.ebuild,v 1.1 2013/08/27 12:03:20 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" - -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/3752/sane-backends-1.0.23.tar.gz.1 - https://alioth.debian.org/frs/download.php/3753/sane-backends-1.0.23.tar.gz.2 - https://alioth.debian.org/frs/download.php/3754/sane-backends-1.0.23.tar.gz.3" - -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 - sane_backends_kodakaio? ( net-print/cups ) - 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 ) -" - -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_unpack() { - local file - for file in ${A}; do - cat "${DISTDIR}/${file}" - done > "${P}.tar.gz" - unpack ./"${P}.tar.gz" -} - -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}-automagic-cups.patch \ - "${FILESDIR}"/${P}-automagic-v4l.patch \ - "${FILESDIR}"/${PN}-1.0.23-saned_pidfile_location.patch \ - "${FILESDIR}"/kodakaio-fixes.patch - 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_kodakaio; then - myconf="${myconf} --enable-cups" - 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 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." -} diff --git a/media-gfx/sane-backends/sane-backends-1.0.23.ebuild b/media-gfx/sane-backends/sane-backends-1.0.23.ebuild deleted file mode 100644 index cd80e2aac46a..000000000000 --- a/media-gfx/sane-backends/sane-backends-1.0.23.ebuild +++ /dev/null @@ -1,288 +0,0 @@ -# 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.23.ebuild,v 1.17 2013/05/08 19:35:31 vapier Exp $ - -EAPI="5" - -inherit 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" - -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/" - -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:0 ) - gphoto2? ( - media-libs/libgphoto2:= - virtual/jpeg - ) - v4l? ( media-libs/libv4l ) - xinetd? ( sys-apps/xinetd )" - -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" - -SRC_URI="https://alioth.debian.org/frs/download.php/3752/sane-backends-1.0.23.tar.gz.1 - https://alioth.debian.org/frs/download.php/3753/sane-backends-1.0.23.tar.gz.2 - https://alioth.debian.org/frs/download.php/3754/sane-backends-1.0.23.tar.gz.3" -SLOT="0" -LICENSE="GPL-2 public-domain" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" - -pkg_setup() { - enewgroup scanner - enewuser saned -1 -1 -1 scanner -} - -src_unpack() { - rm -f "${P}.tar.gz" - for file in ${A}; do - cat "${DISTDIR}/${file}" >> "${P}.tar.gz" - done - tar xzf "${P}.tar.gz" -} - -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 - -} - -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) - # 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_enable avahi) \ - $(use_enable ipv6) \ - $(use_enable threads pthread) \ - ${myconf} -} - -src_compile() { - emake VARTEXFONTS="${T}/fonts" || die - - 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} || die - 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 -} - -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" - elog "If you are using an USB scanner, add the saned user" - elog "to the usb group." - fi -} diff --git a/media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild b/media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild deleted file mode 100644 index e9d632a3e6b1..000000000000 --- a/media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild +++ /dev/null @@ -1,299 +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-r3.ebuild,v 1.12 2014/08/02 18:17:59 ago 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 - 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 ) - 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:0= ) -" - -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}-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 - - # 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." -} |