Adding desktop entry (bug #160264) + a little version bump.

Package-Manager: portage-2.1.1-r2

5 files changed, 113 insertions, 12 deletions

diff --git a/media-gfx/xsane/ChangeLog b/media-gfx/xsane/ChangeLog
index 7928130389d0..1e45e8692091 100644
--- a/media-gfx/xsane/ChangeLog
+++ b/media-gfx/xsane/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/xsane
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.54 2006/11/01 11:35:59 phosphan Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.55 2007/03/07 13:19:12 phosphan Exp $
+
+*xsane-0.994 (07 Mar 2007)
+
+  07 Mar 2007; Patrick Kursawe <phosphan@gentoo.org> xsane-0.991.ebuild,
+  +xsane-0.994.ebuild:
+  Adding desktop entry (bug #160264) + a little version bump.
 
   01 Nov 2006; Patrick Kursawe <phosphan@gentoo.org> xsane-0.991.ebuild:
   Adding missing pkgconfig dependency, bug #153070
diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest
index 0a789d484e0c..a91767d436aa 100644
--- a/media-gfx/xsane/Manifest
+++ b/media-gfx/xsane/Manifest
@@ -1,12 +1,17 @@
 DIST xsane-0.991.tar.gz 2930784 RMD160 a1ef5315914e6525c0667bf253aff25d01ccb644 SHA1 22725e8a956955b75ac6791f69a3e9a4ae744ac7 SHA256 e239286b5a934267ad55c481b697013cec51b9428022454d424abd994341cbee
-EBUILD xsane-0.991.ebuild 1683 RMD160 4c9b36bcd32e7e280fe944b4146e89d6ecaa6a33 SHA1 edaa1e7d4854a671ea39cdb9e658d68f5c4f8e26 SHA256 32ed7e2251a7660865d19f4725f03c0d9cec3da22ca686b14c8da7bc978472c9
-MD5 1bf3005505d06309f19ec93ee8e7d526 xsane-0.991.ebuild 1683
-RMD160 4c9b36bcd32e7e280fe944b4146e89d6ecaa6a33 xsane-0.991.ebuild 1683
-SHA256 32ed7e2251a7660865d19f4725f03c0d9cec3da22ca686b14c8da7bc978472c9 xsane-0.991.ebuild 1683
-MISC ChangeLog 6885 RMD160 a4de96ff7c18bd25a1e44184aa8041de1cefbcc8 SHA1 83b0223d203b5f83ee3a7834f56fcfa7b9b53e89 SHA256 8dc1f08c034ac78d564978d474594568741f7cf1f6e46f3d3b973e67054c7d16
-MD5 637e7bdd8c53b06c66a69afc30dfc86e ChangeLog 6885
-RMD160 a4de96ff7c18bd25a1e44184aa8041de1cefbcc8 ChangeLog 6885
-SHA256 8dc1f08c034ac78d564978d474594568741f7cf1f6e46f3d3b973e67054c7d16 ChangeLog 6885
+DIST xsane-0.994.tar.gz 3303013 RMD160 5ce83791e16a0c805b2850bb17092092264a3ce1 SHA1 64a936f0e95b5c5d296e34407d72813dd802b309 SHA256 67d72b8b76a44f106bf758db319c490d2c6c9edf9a269544e71e5c783a58ad0a
+EBUILD xsane-0.991.ebuild 1764 RMD160 e6a1b5a61697f39dc7bfc3420086a53efbe23131 SHA1 afe51b95d55058365e1a5a06dbabb2035ee28036 SHA256 7b6636cfc3c0db908c0fe27fab05bd0d53613e2bb98f111491324facfc9b5477
+MD5 5f46cca3d89f32d55092d9abd120b012 xsane-0.991.ebuild 1764
+RMD160 e6a1b5a61697f39dc7bfc3420086a53efbe23131 xsane-0.991.ebuild 1764
+SHA256 7b6636cfc3c0db908c0fe27fab05bd0d53613e2bb98f111491324facfc9b5477 xsane-0.991.ebuild 1764
+EBUILD xsane-0.994.ebuild 1948 RMD160 7714a4a80ad2466ae5e3290b120b91b1a98419ba SHA1 af11f49dda1641e7a453f6b00cced83d1d218763 SHA256 4e77382cf15ff0d1eae25eb30bbd2f2ac8e3bb8b81fb48f17ddc5cc37124f6d4
+MD5 55aa08a1951dbca8379eabab9e04467d xsane-0.994.ebuild 1948
+RMD160 7714a4a80ad2466ae5e3290b120b91b1a98419ba xsane-0.994.ebuild 1948
+SHA256 4e77382cf15ff0d1eae25eb30bbd2f2ac8e3bb8b81fb48f17ddc5cc37124f6d4 xsane-0.994.ebuild 1948
+MISC ChangeLog 7072 RMD160 bbfec423b6c20298062ed4f3eed4904bb39b45bd SHA1 5a6f7f91a462bcdd6630ac2f89505e0037e3e55d SHA256 3cd5f0098929a1a282f0ec31f4a66195e82301290e1ed551bfbd3e12b0adb74e
+MD5 564ba6ba256cded0852878ba144e864a ChangeLog 7072
+RMD160 bbfec423b6c20298062ed4f3eed4904bb39b45bd ChangeLog 7072
+SHA256 3cd5f0098929a1a282f0ec31f4a66195e82301290e1ed551bfbd3e12b0adb74e ChangeLog 7072
 MISC metadata.xml 347 RMD160 9c5418a1d8b854e2712e7e289975451d9c637879 SHA1 28c80bd21faa8459043efc31e8fe8a097c42fde8 SHA256 484450961ffb985cd8f2e3d470e1bc2a608cda571a6c571381b679f062c903f3
 MD5 1f00d52c238ab654e46144b458cb8090 metadata.xml 347
 RMD160 9c5418a1d8b854e2712e7e289975451d9c637879 metadata.xml 347
@@ -14,3 +19,6 @@ SHA256 484450961ffb985cd8f2e3d470e1bc2a608cda571a6c571381b679f062c903f3 metadata
 MD5 635eaaeed727b6ba85a165a2f5b485b0 files/digest-xsane-0.991 238
 RMD160 f01b2b99f274dc822d94bd9bbff9f7c06430e5ba files/digest-xsane-0.991 238
 SHA256 d169bcf15de3d86e898f75f6fc8ee06b9097c8aa6f017da6df5ebd9bedc9be12 files/digest-xsane-0.991 238
+MD5 678b7b08b45e083d275697d93b7d2659 files/digest-xsane-0.994 238
+RMD160 d5486ee28a4de073cec98e83615c83c7d7b53c61 files/digest-xsane-0.994 238
+SHA256 97ea950839ef0f0674d87d51f6d1f48aadf13ddb82feeb95de7995c22cd551db files/digest-xsane-0.994 238
diff --git a/media-gfx/xsane/files/digest-xsane-0.994 b/media-gfx/xsane/files/digest-xsane-0.994
new file mode 100644
index 000000000000..0c69b6211d6a
--- /dev/null
+++ b/media-gfx/xsane/files/digest-xsane-0.994
@@ -0,0 +1,3 @@
+MD5 7d02656026797a46a84bda63006f5668 xsane-0.994.tar.gz 3303013
+RMD160 5ce83791e16a0c805b2850bb17092092264a3ce1 xsane-0.994.tar.gz 3303013
+SHA256 67d72b8b76a44f106bf758db319c490d2c6c9edf9a269544e71e5c783a58ad0a xsane-0.994.tar.gz 3303013
diff --git a/media-gfx/xsane/xsane-0.991.ebuild b/media-gfx/xsane/xsane-0.991.ebuild
index c9b4bfca45d5..28f2519dcdc0 100644
--- a/media-gfx/xsane/xsane-0.991.ebuild
+++ b/media-gfx/xsane/xsane-0.991.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.991.ebuild,v 1.9 2006/11/01 11:35:59 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.991.ebuild,v 1.10 2007/03/07 13:19:12 phosphan Exp $
 
 inherit eutils
 
@@ -61,6 +61,8 @@ src_install() {
 		dodir "${plugindir}"
 		dosym /usr/bin/xsane "${plugindir}"
 	fi
+	newicon src/xsane-48x48.png ${PN}.png
+	make_desktop_entry xsane "X-Sane" ${PN}
 }
 
 pkg_postinst() {
diff --git a/media-gfx/xsane/xsane-0.994.ebuild b/media-gfx/xsane/xsane-0.994.ebuild
new file mode 100644
index 000000000000..040f609eae57
--- /dev/null
+++ b/media-gfx/xsane/xsane-0.994.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.994.ebuild,v 1.1 2007/03/07 13:19:12 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 ~ia64 ~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() {
+	einstall || die
+	dodoc xsane.[A-Z]*
+	dohtml -r doc
+
+	# 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
+		einfo ""
+		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."
+		einfo ""
+	fi
+}