Version bump. Does not install the HTML documentation twice any more and uses the .desktop file from upstream.

Package-Manager: portage-2.1.4.4

3 files changed, 88 insertions, 2 deletions

diff --git a/media-gfx/xsane/ChangeLog b/media-gfx/xsane/ChangeLog
index 7e9b08ecc9e3..962b78ae4219 100644
--- a/media-gfx/xsane/ChangeLog
+++ b/media-gfx/xsane/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/xsane
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.71 2008/08/10 17:14:54 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.72 2008/09/29 11:40:28 phosphan Exp $
+
+*xsane-0.996 (29 Sep 2008)
+
+  29 Sep 2008; Patrick Kursawe <phosphan@gentoo.org> +xsane-0.996.ebuild:
+  Version bump. Does not install the HTML documentation twice any more and
+  uses the .desktop file from upstream.
 
   10 Aug 2008; Tobias Klausmann <klausman@gentoo.org> xsane-0.995.ebuild:
   Stable on alpha, bug #231189
diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest
index bf78acec76a9..455142ed96c8 100644
--- a/media-gfx/xsane/Manifest
+++ b/media-gfx/xsane/Manifest
@@ -1,6 +1,8 @@
 DIST xsane-0.994.tar.gz 3303013 RMD160 5ce83791e16a0c805b2850bb17092092264a3ce1 SHA1 64a936f0e95b5c5d296e34407d72813dd802b309 SHA256 67d72b8b76a44f106bf758db319c490d2c6c9edf9a269544e71e5c783a58ad0a
 DIST xsane-0.995.tar.gz 3307923 RMD160 889f4058ce65f007cf1482901d252748e3874de5 SHA1 9d4e8050f5b61034e20adbb5cf88b50e3e744050 SHA256 66a042253c35a54361a8c6c45c49b7b250bd45a024c449803673fc31e72a340b
+DIST xsane-0.996.tar.gz 3343648 RMD160 c927274a1d09aa74c95fc2a55f4494b261840f23 SHA1 2f2a709b577463cc57d6dacec4a530a8c4feb8c6 SHA256 a54b06735b669bd18159924b9175fcb0fc1450b5d57d5c0a233b9ae34156ad7d
 EBUILD xsane-0.994.ebuild 1913 RMD160 a3967e3ba14e454e18e879e73ebe09cc3ae691b3 SHA1 b545f69bee8f82b28a3f2d0c715a066dc6162ef6 SHA256 7d15bc180eb49a4f91b57e0e8a3173ed8431eb3068b1143f8f3f7394cc05f6bc
 EBUILD xsane-0.995.ebuild 1914 RMD160 4999d68b87f491b2eb6e6ea9e88bee495addb8e4 SHA1 26aeceea6c5295376f8f2452ea3c35b990f29fe3 SHA256 256d4fef1547c3ab7da98aa8026a4408177549ba968faceb6dbccf5dd89ce8e0
-MISC ChangeLog 8832 RMD160 f33281c34570bddee92822678ec07b0dee70bcdf SHA1 85557f2a2d49c9e3c62b4a7f4c7c2766324fdf30 SHA256 e488cb6a626211fe0bb0c77e24124b1dfd8c7cafbe63c7a03ef826fb3a63e657
+EBUILD xsane-0.996.ebuild 1919 RMD160 3e3735c075a3d9ac762bd3e0625f7ffd1705bbe5 SHA1 93bfed3965d9859f51039cd9581c4985841316c9 SHA256 3957cbc2a824f6fec37d664ecfdb4e9665161b5fe2ff59cd42c448c66900c3d9
+MISC ChangeLog 9050 RMD160 a00b3bfb5c0a257f0fa2f12921822d4a9a51cc07 SHA1 94b106a207ac14cf09671b863f5d40fa77f0d222 SHA256 1eddb696d66a18c0e7a7c8476b0cb5fa47a0c3bb4bdcc2799c95f6d4812253da
 MISC metadata.xml 347 RMD160 9c5418a1d8b854e2712e7e289975451d9c637879 SHA1 28c80bd21faa8459043efc31e8fe8a097c42fde8 SHA256 484450961ffb985cd8f2e3d470e1bc2a608cda571a6c571381b679f062c903f3
diff --git a/media-gfx/xsane/xsane-0.996.ebuild b/media-gfx/xsane/xsane-0.996.ebuild
new file mode 100644
index 000000000000..88117657abf8
--- /dev/null
+++ b/media-gfx/xsane/xsane-0.996.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2008 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.1 2008/09/29 11:40:28 phosphan Exp $
+
+inherit eutils
+
+DESCRIPTION="graphical scanning frontend"
+HOMEPAGE="http://www.xsane.org/"
+SRC_URI="http://www.xsane.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nls jpeg png tiff gimp lcms"
+
+RDEPEND="media-gfx/sane-backends
+	>=x11-libs/gtk+-2.0
+	jpeg? ( media-libs/jpeg )
+	png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )
+	gimp? ( media-gfx/gimp )
+	lcms? ( media-libs/lcms )"
+
+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_compile() {
+	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) \
+		|| die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	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
+	make_desktop_entry xsane "X-Sane" ${PN}
+}
+
+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
+}