From: Patrick Kursawe Date: Tue, 2 Nov 2004 12:49:57 +0000 (+0000) Subject: Cleanup; -r6 stable for x86. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ca993c27a52b70c498ec85367c3f24be8f0b6aa3;p=gentoo.git Cleanup; -r6 stable for x86. --- diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog index 3d3ab801ec30..585275fa9f27 100644 --- a/media-gfx/sane-backends/ChangeLog +++ b/media-gfx/sane-backends/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/sane-backends # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.51 2004/10/19 10:31:38 absinthe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.52 2004/11/02 12:49:57 phosphan Exp $ + + 02 Nov 2004; Patrick Kursawe + -sane-backends-1.0.14-r2.ebuild, -sane-backends-1.0.14-r4.ebuild, + -sane-backends-1.0.14-r5.ebuild, sane-backends-1.0.14-r6.ebuild: + Cleanup; -r6 stable for x86. 19 Oct 2004; Dylan Carlson sane-backends-1.0.14-r2.ebuild, sane-backends-1.0.14-r3.ebuild: diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest index 62bea0858d6a..337cd046054b 100644 --- a/media-gfx/sane-backends/Manifest +++ b/media-gfx/sane-backends/Manifest @@ -1,18 +1,12 @@ -MD5 4edc7925ec6a3903bf0d1cdd42ef5635 ChangeLog 9023 -MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224 -MD5 41ccd3ca88b24476e6d95ef32d5f5111 sane-backends-1.0.13-r3.ebuild 1717 -MD5 576ba2031519418ec6e21ca1ac75ffd6 sane-backends-1.0.14-r2.ebuild 2175 +MD5 e4815c43a4a5df2997cd2184ca5e68eb sane-backends-1.0.14-r6.ebuild 2807 MD5 d66d87b38fbf69a3e5901270dc1c9b05 sane-backends-1.0.14-r3.ebuild 2482 -MD5 998c7cff0b6534a14fd02fd89e5cbc0d sane-backends-1.0.14-r4.ebuild 2735 -MD5 ed295c5fbe0c33ddc1e4b6f859c0cda7 sane-backends-1.0.14-r5.ebuild 2777 -MD5 fd476bd8b937c26a6d6562f6c779b4c9 sane-backends-1.0.14-r6.ebuild 2808 +MD5 41ccd3ca88b24476e6d95ef32d5f5111 sane-backends-1.0.13-r3.ebuild 1717 +MD5 775fa6e35df40228fc96c8c7410f9626 ChangeLog 9243 +MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224 +MD5 365f695ec2c079ac06dd5bbf495f87ce files/linux_sg3_err.h 4894 +MD5 820e842ff4247de984a89752ac129ceb files/libusbscanner-device.patch 582 MD5 026dc517ef9d45268cd506ec83519a0e files/canoscan-focus.patch 472 +MD5 cb4dcb744752238bdfed71fdcce81c79 files/libusbscanner-device-r1.patch 681 MD5 01607471a4380f74f7b9da650e5ca5ad files/digest-sane-backends-1.0.13-r3 160 -MD5 38efb4d762b212d339caa112194dbf56 files/digest-sane-backends-1.0.14-r2 160 MD5 38efb4d762b212d339caa112194dbf56 files/digest-sane-backends-1.0.14-r3 160 -MD5 cb4dcb744752238bdfed71fdcce81c79 files/libusbscanner-device-r1.patch 681 -MD5 820e842ff4247de984a89752ac129ceb files/libusbscanner-device.patch 582 -MD5 365f695ec2c079ac06dd5bbf495f87ce files/linux_sg3_err.h 4894 -MD5 e8109e4fa602f9e29257c4abea88f69d files/digest-sane-backends-1.0.14-r4 229 -MD5 e8109e4fa602f9e29257c4abea88f69d files/digest-sane-backends-1.0.14-r5 229 MD5 e8109e4fa602f9e29257c4abea88f69d files/digest-sane-backends-1.0.14-r6 229 diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r2 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r2 deleted file mode 100644 index 3249e577723f..000000000000 --- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r2 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 7ae5bf91aea34ef7956df6f53cf073bd sane-backends-1.0.14.tar.gz 3198777 -MD5 643de6a8321df8ef561170610b91b538 sane-backends-1.0.13-brothermfc-r1.patch.bz2 9727 diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r4 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r4 deleted file mode 100644 index df429dcc0a62..000000000000 --- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 7ae5bf91aea34ef7956df6f53cf073bd sane-backends-1.0.14.tar.gz 3198777 -MD5 1b2f83dcb5dae520ef845d071bceb4f5 backend-20040723_1.tar.gz 31201 -MD5 643de6a8321df8ef561170610b91b538 sane-backends-1.0.13-brothermfc-r1.patch.bz2 9727 diff --git a/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r5 b/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r5 deleted file mode 100644 index df429dcc0a62..000000000000 --- a/media-gfx/sane-backends/files/digest-sane-backends-1.0.14-r5 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 7ae5bf91aea34ef7956df6f53cf073bd sane-backends-1.0.14.tar.gz 3198777 -MD5 1b2f83dcb5dae520ef845d071bceb4f5 backend-20040723_1.tar.gz 31201 -MD5 643de6a8321df8ef561170610b91b538 sane-backends-1.0.13-brothermfc-r1.patch.bz2 9727 diff --git a/media-gfx/sane-backends/sane-backends-1.0.14-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.14-r2.ebuild deleted file mode 100644 index 6ecbb842ad4b..000000000000 --- a/media-gfx/sane-backends/sane-backends-1.0.14-r2.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2004 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.14-r2.ebuild,v 1.6 2004/10/19 10:31:38 absinthe Exp $ - -inherit eutils - -IUSE="usb gphoto2" - -DESCRIPTION="Scanner Access Now Easy - Backends" -HOMEPAGE="http://www.mostang.com/sane/" - -DEPEND=">=media-libs/jpeg-6b - x86? ( sys-libs/libieee1284 ) - =sys-apps/sed-4* - usb? ( dev-libs/libusb ) - gphoto2? ( media-gfx/gphoto2 )" - -BROTHERMFCDRIVER="sane-backends-1.0.13-brothermfc-r1.patch" - -SRC_URI="ftp://ftp.mostang.com/pub/sane/${P}/${P}.tar.gz - ftp://ftp.mostang.com/pub/sane/old-versions/${P}/${P}.tar.gz - usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2 )" -SLOT="0" -LICENSE="GPL-2 public-domain" -KEYWORDS="x86 amd64" - - -src_unpack() { - unpack ${A} - use usb && unpack ${BROTHERMFCDRIVER}.bz2 - cp ${FILESDIR}/linux_sg3_err.h ${S}/sanei - - cd ${S} - - #only generate the .ps and not the fonts - sed -i -e 's:$(DVIPS) sane.dvi -o sane.ps:$(DVIPS) sane.dvi -M1 -o sane.ps:' \ - doc/Makefile.in - #compile errors when using NDEBUG otherwise - sed -i -e 's:function_name:__FUNCTION__:g' backend/artec_eplus48u.c - use usb && epatch ${WORKDIR}/${BROTHERMFCDRIVER} - use usb && epatch ${FILESDIR}/libusbscanner-device.patch -} - -src_compile() { - local myconf - myconf="$(use_enable usb libusb) $(use_with gphoto2)" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --host=${CHOST} ${myconf} || die - make || die - if use usb; then - cd tools/hotplug - grep < libsane.usermap -v '^$' > libsane.usermap.new - mv libsane.usermap.new libsane.usermap - fi -} - -src_install () { - - - make prefix=${D}/usr \ - sysconfdir=${D}/etc \ - mandir=${D}/usr/share/man \ - docdir=${D}/usr/share/doc/${PF} \ - install || die - - if use usb; then - cd tools/hotplug - insinto /etc/hotplug/usb - exeinto /etc/hotplug/usb - doins libsane.usermap - doexe libusbscanner - newdoc README README.hotplug - cd ../.. - fi - - docinto backend - cd backend - dodoc GUIDE *.README *.BUGS *.CHANGES *.FAQ *.TODO - - echo "SANE_CONFIG_DIR=/etc/sane.d" > 30sane - insinto /etc/env.d - doins 30sane - -} - -pkg_preinst() -{ - enewgroup scanner -} diff --git a/media-gfx/sane-backends/sane-backends-1.0.14-r4.ebuild b/media-gfx/sane-backends/sane-backends-1.0.14-r4.ebuild deleted file mode 100644 index 099a2d28a7ff..000000000000 --- a/media-gfx/sane-backends/sane-backends-1.0.14-r4.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2004 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.14-r4.ebuild,v 1.1 2004/08/18 07:35:41 phosphan Exp $ - -inherit eutils - -IUSE="usb gphoto2" - -DESCRIPTION="Scanner Access Now Easy - Backends" -HOMEPAGE="http://www.mostang.com/sane/" - -DEPEND=">=media-libs/jpeg-6b - x86? ( sys-libs/libieee1284 ) - =sys-apps/sed-4* - usb? ( dev-libs/libusb ) - gphoto2? ( media-gfx/gphoto2 )" - -BROTHERMFCDRIVER="sane-backends-1.0.13-brothermfc-r1.patch" - -SRC_URI="ftp://ftp.mostang.com/pub/sane/${P}/${P}.tar.gz - ftp://ftp.mostang.com/pub/sane/old-versions/${P}/${P}.tar.gz - usb? ( mirror://sourceforge/hp3300backend/backend-20040723_1.tar.gz ) - usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2 )" -SLOT="0" -LICENSE="GPL-2 public-domain" -KEYWORDS="~x86 ~sparc ~ppc ~ppc64" - - -src_unpack() { - unpack ${A} - use usb && unpack ${BROTHERMFCDRIVER}.bz2 - cp ${FILESDIR}/linux_sg3_err.h ${S}/sanei - - cd ${S} - - #only generate the .ps and not the fonts - sed -i -e 's:$(DVIPS) sane.dvi -o sane.ps:$(DVIPS) sane.dvi -M1 -o sane.ps:' \ - doc/Makefile.in - #compile errors when using NDEBUG otherwise - sed -i -e 's:function_name:__FUNCTION__:g' backend/artec_eplus48u.c - use usb && epatch ${WORKDIR}/${BROTHERMFCDRIVER} - use usb && epatch ${FILESDIR}/libusbscanner-device-r1.patch - - if use usb; then - #patch sane-backends for NIASH chip support - einfo "Applying NIASH chip support patch" - cd ${WORKDIR}/backend - chmod +x patch-sane.sh - ./patch-sane.sh ${S} - fi -} - -src_compile() { - local myconf - myconf="$(use_enable usb libusb) $(use_with gphoto2)" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --host=${CHOST} ${myconf} || die - make || die - if use usb; then - cd tools/hotplug - grep < libsane.usermap -v '^$' > libsane.usermap.new - mv libsane.usermap.new libsane.usermap - fi -} - -src_install () { - - - make prefix=${D}/usr \ - sysconfdir=${D}/etc \ - mandir=${D}/usr/share/man \ - docdir=${D}/usr/share/doc/${PF} \ - install || die - - if use usb; then - cd tools/hotplug - insinto /etc/hotplug/usb - exeinto /etc/hotplug/usb - doins libsane.usermap - doexe libusbscanner - newdoc README README.hotplug - cd ../.. - fi - - docinto backend - cd backend - dodoc GUIDE *.README *.BUGS *.CHANGES *.FAQ *.TODO - - echo "SANE_CONFIG_DIR=/etc/sane.d" > 30sane - insinto /etc/env.d - doins 30sane - -} - -pkg_preinst() { - enewgroup scanner -} - -pkg_postinst() { - if use usb; then - einfo "There are some problems with the hotplug script when" - einfo "restarting hotplug with some kernel versions." - einfo "If you have trouble, please edit" - einfo "/etc/hotplug/usb/libusbscanner" - einfo "and see bug #50934 for details." - fi -} diff --git a/media-gfx/sane-backends/sane-backends-1.0.14-r5.ebuild b/media-gfx/sane-backends/sane-backends-1.0.14-r5.ebuild deleted file mode 100644 index 31e87c171bcb..000000000000 --- a/media-gfx/sane-backends/sane-backends-1.0.14-r5.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2004 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.14-r5.ebuild,v 1.1 2004/08/30 17:58:50 phosphan Exp $ - -inherit eutils - -IUSE="usb gphoto2" - -DESCRIPTION="Scanner Access Now Easy - Backends" -HOMEPAGE="http://www.mostang.com/sane/" - -DEPEND=">=media-libs/jpeg-6b - x86? ( sys-libs/libieee1284 ) - =sys-apps/sed-4* - usb? ( dev-libs/libusb ) - gphoto2? ( media-gfx/gphoto2 )" - -BROTHERMFCDRIVER="sane-backends-1.0.13-brothermfc-r1.patch" - -SRC_URI="ftp://ftp.mostang.com/pub/sane/${P}/${P}.tar.gz - ftp://ftp.mostang.com/pub/sane/old-versions/${P}/${P}.tar.gz - usb? ( mirror://sourceforge/hp3300backend/backend-20040723_1.tar.gz ) - usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2 )" -SLOT="0" -LICENSE="GPL-2 public-domain" -KEYWORDS="~x86 ~sparc ~ppc ~ppc64" - - -src_unpack() { - unpack ${A} - use usb && unpack ${BROTHERMFCDRIVER}.bz2 - cp ${FILESDIR}/linux_sg3_err.h ${S}/sanei - - cd ${S} - - epatch ${FILESDIR}/canoscan-focus.patch - - #only generate the .ps and not the fonts - sed -i -e 's:$(DVIPS) sane.dvi -o sane.ps:$(DVIPS) sane.dvi -M1 -o sane.ps:' \ - doc/Makefile.in - #compile errors when using NDEBUG otherwise - sed -i -e 's:function_name:__FUNCTION__:g' backend/artec_eplus48u.c - use usb && epatch ${WORKDIR}/${BROTHERMFCDRIVER} - use usb && epatch ${FILESDIR}/libusbscanner-device-r1.patch - - if use usb; then - #patch sane-backends for NIASH chip support - einfo "Applying NIASH chip support patch" - cd ${WORKDIR}/backend - chmod +x patch-sane.sh - ./patch-sane.sh ${S} - fi -} - -src_compile() { - local myconf - myconf="$(use_enable usb libusb) $(use_with gphoto2)" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --host=${CHOST} ${myconf} || die - make || die - if use usb; then - cd tools/hotplug - grep < libsane.usermap -v '^$' > libsane.usermap.new - mv libsane.usermap.new libsane.usermap - fi -} - -src_install () { - - - make prefix=${D}/usr \ - sysconfdir=${D}/etc \ - mandir=${D}/usr/share/man \ - docdir=${D}/usr/share/doc/${PF} \ - install || die - - if use usb; then - cd tools/hotplug - insinto /etc/hotplug/usb - exeinto /etc/hotplug/usb - doins libsane.usermap - doexe libusbscanner - newdoc README README.hotplug - cd ../.. - fi - - docinto backend - cd backend - dodoc GUIDE *.README *.BUGS *.CHANGES *.FAQ *.TODO - - echo "SANE_CONFIG_DIR=/etc/sane.d" > 30sane - insinto /etc/env.d - doins 30sane - -} - -pkg_preinst() { - enewgroup scanner -} - -pkg_postinst() { - if use usb; then - einfo "There are some problems with the hotplug script when" - einfo "restarting hotplug with some kernel versions." - einfo "If you have trouble, please edit" - einfo "/etc/hotplug/usb/libusbscanner" - einfo "and see bug #50934 for details." - fi -} diff --git a/media-gfx/sane-backends/sane-backends-1.0.14-r6.ebuild b/media-gfx/sane-backends/sane-backends-1.0.14-r6.ebuild index efb3cea5c336..a4efc04239aa 100644 --- a/media-gfx/sane-backends/sane-backends-1.0.14-r6.ebuild +++ b/media-gfx/sane-backends/sane-backends-1.0.14-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 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.14-r6.ebuild,v 1.2 2004/10/19 10:29:34 absinthe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.14-r6.ebuild,v 1.3 2004/11/02 12:49:57 phosphan Exp $ inherit eutils @@ -23,7 +23,7 @@ SRC_URI="ftp://ftp.mostang.com/pub/sane/${P}/${P}.tar.gz usb? ( mirror://gentoo/${BROTHERMFCDRIVER}.bz2 )" SLOT="0" LICENSE="GPL-2 public-domain" -KEYWORDS="~x86 ~sparc ~ppc ~ppc64 ~amd64" +KEYWORDS="x86 ~sparc ~ppc ~ppc64 ~amd64" src_unpack() {