Version bump + possible fix for bug #113925 (couldn't reproduce it)

Package-Manager: portage-2.0.51.22-r2

diff --git a/media-gfx/xsane/ChangeLog b/media-gfx/xsane/ChangeLog
index f76b116debb1b2548f1fd2b3c95b63002d99e75d..66dcc6ebd31ba5f5f15e5ba1d77d1f4854e9ed77 100644 (file)
--- a/media-gfx/xsane/ChangeLog
+++ b/media-gfx/xsane/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/xsane
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.41 2005/09/20 16:09:10 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.42 2005/11/30 07:20:39 phosphan Exp $
+
+*xsane-0.98a (30 Nov 2005)
+
+  30 Nov 2005; Patrick Kursawe <phosphan@gentoo.org> xsane-0.97.ebuild,
+  xsane-0.97-r1.ebuild, +xsane-0.98a.ebuild:
+  Version bump + possible fix for bug #113925 (couldn't reproduce it)
 
 *xsane-0.97-r1 (20 Sep 2005)
 

diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest
index fe47102896f2b680df20085b77e4c6cf7d200131..0e2be655826c68156e6a0966473428d1d4dc95a2 100644 (file)
--- a/media-gfx/xsane/Manifest
+++ b/media-gfx/xsane/Manifest
@@ -1,6 +1,8 @@
-MD5 1ec14e1ee0ca39dda7b4e5633402ddaf xsane-0.97-r1.ebuild 1630
-MD5 8c5d4fdcaf6572134cefe867a24ae018 xsane-0.97.ebuild 1677
-MD5 6ae34fea270d96a514c3b684fafcf3a1 ChangeLog 5116
+MD5 a4416ea123de82828b0caf78bdc0fb6d xsane-0.97-r1.ebuild 1634
+MD5 56c10f08c157591519451f7a2a271c6d xsane-0.98a.ebuild 1632
+MD5 0d9837fd281c0a06adf23414c6dc2e47 xsane-0.97.ebuild 1681
+MD5 ca62d69c7fd961ecdf88079b43417991 ChangeLog 5332
 MD5 1f00d52c238ab654e46144b458cb8090 metadata.xml 347
 MD5 918ef3f00d812af7c8417080ff4b8f75 files/digest-xsane-0.97 63
 MD5 918ef3f00d812af7c8417080ff4b8f75 files/digest-xsane-0.97-r1 63
+MD5 6994739c50e135088e6a65d231c67230 files/digest-xsane-0.98a 64

diff --git a/media-gfx/xsane/files/digest-xsane-0.98a b/media-gfx/xsane/files/digest-xsane-0.98a
new file mode 100644 (file)
index 0000000..fc3269c
--- /dev/null
+++ b/media-gfx/xsane/files/digest-xsane-0.98a
@@ -0,0 +1 @@
+MD5 fec674f4c2e7395a86c2e8211deb99f7 xsane-0.98a.tar.gz 2897623

diff --git a/media-gfx/xsane/xsane-0.97-r1.ebuild b/media-gfx/xsane/xsane-0.97-r1.ebuild
index 61db7d792acd75cf0304d846a97c0221979f5111..f253a0d8e185bcb0b22195d9ee47916e776c9f22 100644 (file)
--- a/media-gfx/xsane/xsane-0.97-r1.ebuild
+++ b/media-gfx/xsane/xsane-0.97-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.97-r1.ebuild,v 1.1 2005/09/20 16:09:10 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.97-r1.ebuild,v 1.2 2005/11/30 07:20:39 phosphan Exp $
 
 DESCRIPTION="graphical scanning frontend"
 HOMEPAGE="http://www.xsane.org/"
@@ -59,7 +59,7 @@ src_install() {
 }
 
 pkg_postinst() {
-       if [ $OLDXSANE = 'yes' ]; then
+       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"

diff --git a/media-gfx/xsane/xsane-0.97.ebuild b/media-gfx/xsane/xsane-0.97.ebuild
index f009fcbe9c6ccd694fde430a220d5504e3e537cb..981eb7b27e145a4f560b05b2c15573ada2cccdad 100644 (file)
--- a/media-gfx/xsane/xsane-0.97.ebuild
+++ b/media-gfx/xsane/xsane-0.97.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.97.ebuild,v 1.11 2005/09/13 17:49:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.97.ebuild,v 1.12 2005/11/30 07:20:39 phosphan Exp $
 
 DESCRIPTION="graphical scanning frontend"
 HOMEPAGE="http://www.xsane.org/"
@@ -61,7 +61,7 @@ src_install() {
 }
 
 pkg_postinst() {
-       if [ $OLDXSANE = 'yes' ]; then
+       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"

diff --git a/media-gfx/xsane/xsane-0.98a.ebuild b/media-gfx/xsane/xsane-0.98a.ebuild
new file mode 100644 (file)
index 0000000..45d27dd
--- /dev/null
+++ b/media-gfx/xsane/xsane-0.98a.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.98a.ebuild,v 1.1 2005/11/30 07:20:39 phosphan Exp $
+
+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"
+
+DEPEND="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 )"
+
+pkg_setup() {
+       export OLDXSANE
+       if has_version '<=media-gfx/xsane-0.93'; then
+               OLDXSANE="yes"
+       else
+               OLDXSANE="no"
+       fi
+}
+
+src_compile() {
+       econf --enable-gtk2 \
+               $(use_enable nls) \
+               $(use_enable jpeg) \
+               $(use_enable png) \
+               $(use_enable tiff) \
+               $(use_enable gimp) \
+               || 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
+}
+
+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
+}