Fix working directory handling, bug 396127; drop old

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

3 files changed, 47 insertions, 35 deletions

diff --git a/media-gfx/xsane/ChangeLog b/media-gfx/xsane/ChangeLog
index ac6f960bc1c0..39138bb6055c 100644
--- a/media-gfx/xsane/ChangeLog
+++ b/media-gfx/xsane/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/xsane
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.93 2011/12/29 22:18:51 halcy0n Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.94 2012/01/15 23:00:47 dilfridge Exp $
+
+*xsane-0.998-r1 (15 Jan 2012)
+
+  15 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> -xsane-0.996.ebuild,
+  +xsane-0.998-r1.ebuild:
+  Fix working directory handling, bug 396127; drop old
 
   29 Dec 2011; Mark Loeser <halcy0n@gentoo.org> xsane-0.998.ebuild:
   Stable for ppc64; bug #380917
diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest
index d183c97df685..71553e990341 100644
--- a/media-gfx/xsane/Manifest
+++ b/media-gfx/xsane/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX MissingCapsFlag.patch 412 RMD160 d47a4387277f6478062c2e0ad113687be6befa37 SHA1 524ad7a060713f68e7f1b1a87d52aef115375152 SHA256 bb1f80b0eaff16e120c76544feb724e52cd50a4724e9de8c680ef3808b486c30
-DIST xsane-0.996.tar.gz 3343648 RMD160 c927274a1d09aa74c95fc2a55f4494b261840f23 SHA1 2f2a709b577463cc57d6dacec4a530a8c4feb8c6 SHA256 a54b06735b669bd18159924b9175fcb0fc1450b5d57d5c0a233b9ae34156ad7d
+DIST xsane-0.998-patches-2.tar.xz 54804 RMD160 2ee1c2446e05f29b991e1741f5dc845fc6cae19d SHA1 2bee9c7470686694ec66e7842c42e9dcabca33b3 SHA256 84af533cba6309cf44892da8952b6203daa4dcfaf64e2efd1dddc5144e4cab4c
 DIST xsane-0.998-patches.tar.xz 54828 RMD160 81eec017e8a61bf7152b9ea73e71c11de6b977ca SHA1 bda04294705a76405c85f60587a66d9fd051c506 SHA256 0ffcc52ec5b11d5e854e7df38c4ac298920116f2453056a1565dc1f83a64f72e
 DIST xsane-0.998.tar.gz 2950560 RMD160 aecf63ac3f15b878d01b697ac3ca95de34d18323 SHA1 59e238b310979f71a8e15b692eab3c5b2ce6fc32 SHA256 a32e2f8057782a29619f082dcf6b5f944bf12abe3d4121c516f7c9589064c26e
-EBUILD xsane-0.996.ebuild 1958 RMD160 1e6c4ec02348b5b69545b26e03fc675935e6de79 SHA1 76943125dd88ff62f83009c4469500f12c053258 SHA256 f6f8b7aea2a2de0bab5ca5c9b09eb59d355d87d481cfcae80541e6f0f869f36b
+EBUILD xsane-0.998-r1.ebuild 2223 RMD160 f05d6c9fea967271b4c551d345e5a7cde3246606 SHA1 f8f3d592f772320d9045518fa0fb78aee381cabd SHA256 56c64029433829675e44e99bbc44b07d0a83c60296a7fe826966e4b718049e57
 EBUILD xsane-0.998.ebuild 2200 RMD160 e20640fb6be09d0aa1fb3f7b5f19eacfbe1f2340 SHA1 c796357ffba5f8f59dc9129cfad6f07609914f18 SHA256 1941cf145ba854c8ffdfe2bab3dbd765289b6908a88de708d3594e49ce0a986d
-MISC ChangeLog 11873 RMD160 3d608ad8cc3b0462b1a517c60de65d12fa0c21e6 SHA1 89b84cb3b56a574e00e4da96dd919b5f1945e61f SHA256 11cb1d396afec93dcb88fe973983e42cb2164b2ac1d077a813a7b8dd4c3e04d4
+MISC ChangeLog 12066 RMD160 a57d49d757b92f7688b6a4722e0a4a6a4334082e SHA1 82ebaa522bdcd82b7d21c64e412f47dd387204f1 SHA256 33c6b0258726a940d13883041733155b81f90980258727388e0ae2454656c335
 MISC metadata.xml 536 RMD160 80b112256ac62a7c8c9a7c9c3e54f103659b176c SHA1 9347d82534d0df1647fc144f0a3460beda1a80cd SHA256 f707de877394da20d06198b2e7949381aa4923621aec6909dbc00e2d06ada22c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJO/OdRAAoJEPTTRK0uRVaN6IkQAILzYpFih3ULesZmCFMLU2pY
-iOlop5KsaT0FWu09h2IVJQ+Jul3uEKhEuR8E6/ZKAmO911XbY8E8oWKqecd9/Rl3
-+ADSyZ9goOoI/SSQX/0FEPd/GT0DOVTX3g/+jN0r4CC/+WzGyszv5OkEyapCc0lf
-MrQDxjDLFxBA6gCiHXZ5YpBCcuauSEly4mpz0+qh05BRv9sj7egSxaJ2dOVE8i0u
-Ouc/k7WUpdSkWqy/lD8OOCSw3A7/1YA/DXik3Yd0+Q4GHr+Un8cQ47Pw8FWnAtP9
-withlhY88w9ClbxA18X6P1sIYQ3dXgMJvhHrVFZz+hhvGR79sDykKniYkFzgu7js
-D4X4rypKu3BHEcygbRdUsyNLaFgsS0R0UpPgYipb85oR67gJrgaI+Gdz3g8M+vYP
-hKEmUq+u/0aRXYSXJ8S5+ngdhyj2m+V/1Ep5UiUHt06MXiNSIyjZHiRPnNA8aYrC
-1EHKEO25RESQCM0bwL9Mva4wM+2Nnqlz+wAF1Bv0ia7d7IxfAte8gA1ltuQqnj6+
-RVzGu7ZKti+uzAB3t/XtSz2msH37ttKeufCH0Lrd5/QOevEVtUS0hd5QRpkqEr2h
-mQ3ZWDR0Td33hRfJNwdh4UEzCtTBJqdKGhO6AOaQp654eYFayQfSyh9E/GwYlSGZ
-GOReRsMZQEfY7Fy2QpBB
-=xUlq
+iQIcBAEBCgAGBQJPE1rdAAoJENwGBM22xffe08QP/0/23eB6MXvj6QMIrXAFTDYh
+khNQs4CcQKAifTgY7q9RVTJAbekWT+jSumhn0WVZfcWC8tksc6RpiOMJ3xsWWoue
+1ZHx/IyoF63iThaFZSEy0W7kjpeojAvZ1/KxPgSQNfFwxcwia8kQ1v/bgUsBwABa
+oLtGmh1SkrQ980X+dgt2Hhg20lzISfRkMUjPzXnEqi34smg5mMw1lrJD9ptVgLcf
+Ufqmri7/EqsETxtrxj40F3zdUCELZCoy3HqV3DzRM9mBfKx9sBWvFZhlpuIF7bXS
+TVjVIhDTh+LJWNpsWombKImXnXo1NXCHsM4xNQnWCfeB2s3sei9TJZWOh20ubjyw
+7fsfIDnsWtRHaIePFPV5/ECEiQerR9i8dPQNb0Uw/i6vK05r0UwYP+NWuiQ8fDNL
+lXeYBk1CBAj9n8NL3RX8B4DOIZCexaW1jv2iCzA57OEbwh9MhmpJhHwyYfEOP1qp
+xptLFb86RulJ+Feopkacne52fIE7Nvp8Y6zRuWCGp/koFf09JgWsdbiIFgS4W6ur
+KNnnQTvCOSgImXxbPAFkUqmhGgCkrEjxnsqM0xN1ENg03g7c2O2bqNRvzCnRhdiB
+kOPwiRzQSxuitnvUHKzW2TZNilJ2whYdAoNeR/goJetFOCi8d74t/tniAMeMob0c
+XhJqPlzrihy/ADFXMch1
+=ArCu
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/xsane/xsane-0.996.ebuild b/media-gfx/xsane/xsane-0.998-r1.ebuild
index 0ccd572a950a..4de6c73a4b9d 100644
--- a/media-gfx/xsane/xsane-0.996.ebuild
+++ b/media-gfx/xsane/xsane-0.998-r1.ebuild
@@ -1,27 +1,31 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.996.ebuild,v 1.11 2011/03/02 10:13:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.998-r1.ebuild,v 1.1 2012/01/15 23:00:47 dilfridge Exp $
 
-EAPI="1"
+EAPI="4"
 
 inherit eutils
 
 DESCRIPTION="graphical scanning frontend"
 HOMEPAGE="http://www.xsane.org/"
-SRC_URI="http://www.xsane.org/download/${P}.tar.gz"
+SRC_URI="http://www.xsane.org/download/${P}.tar.gz
+	http://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-2.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="nls jpeg png tiff gimp lcms"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nls jpeg png tiff gimp lcms ocr"
 
 RDEPEND="media-gfx/sane-backends
 	x11-libs/gtk+:2
+	x11-misc/xdg-utils
 	jpeg? ( virtual/jpeg )
 	png? ( media-libs/libpng )
 	tiff? ( media-libs/tiff )
 	gimp? ( media-gfx/gimp )
-	lcms? ( media-libs/lcms )"
+	lcms? ( =media-libs/lcms-1* )"
+
+PDEPEND="ocr? ( app-text/gocr )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
@@ -35,13 +39,15 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/MissingCapsFlag.patch"
+src_prepare() {
+	# Apply multiple fixes from different distributions
+	epatch "${WORKDIR}/${P}-patches-2"/*.patch
+
+	# Fix compability with libpng15 wrt #377363
+	sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c || die
 }
 
-src_compile() {
+src_configure() {
 	local extraCPPflags
 	if use lcms; then
 		extraCPPflags="-I /usr/include/lcms"
@@ -52,14 +58,13 @@ src_compile() {
 		$(use_enable png) \
 		$(use_enable tiff) \
 		$(use_enable gimp) \
-		$(use_enable lcms) \
-		|| die
-	emake || die
+		$(use_enable lcms)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	dodoc xsane.*
+
 	# link xsane so it is seen as a plugin in gimp
 	if use gimp; then
 		local plugindir
@@ -73,6 +78,7 @@ src_install() {
 		dodir "${plugindir}"
 		dosym /usr/bin/xsane "${plugindir}"
 	fi
+
 	newicon src/xsane-48x48.png ${PN}.png
 }