Version bump and apply a lot of fixes from different distributions, taking this (with printing and graphics herds as backup) as this looks a bit orphan for a long time.

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

4 files changed, 116 insertions, 9 deletions

diff --git a/media-gfx/xsane/ChangeLog b/media-gfx/xsane/ChangeLog
index 63bb602ad359..56dcfc8dfa27 100644
--- a/media-gfx/xsane/ChangeLog
+++ b/media-gfx/xsane/ChangeLog
@@ -1,6 +1,14 @@
 # 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.85 2011/03/02 10:13:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.86 2011/07/08 13:04:13 pacho Exp $
+
+*xsane-0.998 (08 Jul 2011)
+
+  08 Jul 2011; Pacho Ramos <pacho@gentoo.org> +xsane-0.998.ebuild,
+  metadata.xml:
+  Version bump and apply a lot of fixes from different distributions, taking
+  this (with printing and graphics herds as backup) as this looks a bit orphan
+  for a long time.
 
   02 Mar 2011; Justin Lecher <jlec@gentoo.org> xsane-0.996.ebuild,
   xsane-0.997.ebuild:
diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest
index 105a39ba43c4..73828df66095 100644
--- a/media-gfx/xsane/Manifest
+++ b/media-gfx/xsane/Manifest
@@ -4,14 +4,17 @@ Hash: SHA1
 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.997.tar.gz 3411262 RMD160 85a239ba9919eda994729b0efb8951642414a8ce SHA1 0d4a8e0a9928c6edbf5b00aa2c5f8e2a316164fe SHA256 38228535db2c70c0e8263cac6c03afbd54ab2a5d244c168ea0f7cf041164b66c
+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.997.ebuild 1881 RMD160 e88d51b3f847a1109ae60430db48fb72ea2b316e SHA1 8cce364902ba15dd1f390725d56e737e8b9762bb SHA256 e83d325367587e3429913ae355d880df0a1b9d394e1eaccf645556e9caef9bb5
-MISC ChangeLog 10801 RMD160 33f1fd927f8205a3ea5d2ef642279c1dd763bc5d SHA1 a85d825d96058774ae790a855c5c81faa168a090 SHA256 91abd8e61a5a529f7842207150d878acac3e1883bb96618399dcbc827f8aef8b
-MISC metadata.xml 276 RMD160 ed7192bb10385257edf507175b0fbe08a4cef0bf SHA1 34ad6f828da8def431c12a3cc12d7160a05740a5 SHA256 0aad37bb4af869b85e5b4073b8a3f2c7a8d3ad000a4f1e6c241e464db9ad5d2a
+EBUILD xsane-0.998.ebuild 2082 RMD160 624f06a6404e4c95d0fe4d673156a0b5c718fa62 SHA1 a4699b5d80c0dcd1faf21414fb52138042cc9696 SHA256 785eb83a07d3e9621db96f9b176375dc6d74ad5fff48d105d50faf910d2e439c
+MISC ChangeLog 11089 RMD160 e0de142ff6a58509e1725933440ad5cf142ff192 SHA1 dab49521db5b9764fb4f61766b7408b4a60dcd03 SHA256 cfdad52b21467168ab07b3a22a7c207dee8545af043013a879e188661f75c76c
+MISC metadata.xml 536 RMD160 80b112256ac62a7c8c9a7c9c3e54f103659b176c SHA1 9347d82534d0df1647fc144f0a3460beda1a80cd SHA256 f707de877394da20d06198b2e7949381aa4923621aec6909dbc00e2d06ada22c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1uGEQACgkQgAnW8HDreRa85ACeN/iGSEYPwmdtyIbpPprVGAMo
-T7EAnjSz2+uqPDohNBWGHp+/ab3OLTo4
-=eNab
+iEYEARECAAYFAk4XAFIACgkQCaWpQKGI+9TkewCfQlJIlzf9B9HgcCWI2gsJwktH
+wQ8An3hWB/QYXrEH8w9flUdPl5Pe4HoH
+=cClY
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/xsane/metadata.xml b/media-gfx/xsane/metadata.xml
index f924403c63c3..d353fec626d5 100644
--- a/media-gfx/xsane/metadata.xml
+++ b/media-gfx/xsane/metadata.xml
@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>printing</herd>
+<herd>graphics</herd>
 <maintainer>
-<email>phosphan@gentoo.org</email>
-<description>Package free for adoption,</description>
+	<email>phosphan@gentoo.org</email>
+	<description>Package free for adoption</description>
 </maintainer>
+<maintainer>
+	<email>pacho@gentoo.org</email>
+	<description>Taking care until somebody wants to also help</description> 
+</maintainer>
+<use>
+        <flag name='ocr'>Enable support for Optical Character Recognition reader</flag>
+</use>
 </pkgmetadata>
diff --git a/media-gfx/xsane/xsane-0.998.ebuild b/media-gfx/xsane/xsane-0.998.ebuild
new file mode 100644
index 000000000000..a46d9dd008c8
--- /dev/null
+++ b/media-gfx/xsane/xsane-0.998.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.998.ebuild,v 1.1 2011/07/08 13:04:13 pacho Exp $
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="graphical scanning frontend"
+HOMEPAGE="http://www.xsane.org/"
+SRC_URI="http://www.xsane.org/download/${P}.tar.gz
+	http://dev.gentoo.org/~pacho/xsane/${P}-patches.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+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-1* )"
+
+PDEPEND="ocr? ( app-text/gocr )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	export OLDXSANE
+	if has_version '<=media-gfx/xsane-0.93'; then
+		OLDXSANE="yes"
+	else
+		OLDXSANE="no"
+	fi
+}
+
+src_prepare() {
+	# Apply multiple fixes from different distributions
+	epatch "${WORKDIR}/${P}-patches"/*.patch
+}
+
+src_configure() {
+	local extraCPPflags
+	if use lcms; then
+		extraCPPflags="-I /usr/include/lcms"
+	fi
+	CPPFLAGS="${CPPFLAGS} ${extraCPPflags}" econf --enable-gtk2 \
+		$(use_enable nls) \
+		$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable tiff) \
+		$(use_enable gimp) \
+		$(use_enable lcms)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc xsane.*
+
+	# link xsane so it is seen as a plugin in gimp
+	if use gimp; then
+		local plugindir
+		if [ -x /usr/bin/gimptool ]; then
+			plugindir="$(gimptool --gimpplugindir)/plug-ins"
+		elif [ -x /usr/bin/gimptool-2.0 ]; then
+			plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
+		else
+			die "Can't find GIMP plugin directory."
+		fi
+		dodir "${plugindir}"
+		dosym /usr/bin/xsane "${plugindir}"
+	fi
+
+	newicon src/xsane-48x48.png ${PN}.png
+}
+
+pkg_postinst() {
+	if [ x${OLDXSANE} = 'xyes' ]; then
+		ewarn "If you are upgrading from <=xsane-0.93, please make sure to"
+		ewarn "remove ~/.sane/xsane/xsane.rc _before_ you start xsane for"
+		ewarn "the first time."
+	fi
+}