Version bump. Drop unused patch.

(Portage version: 2.2.3/cvs/Linux x86_64, signed Manifest commit with key )

3 files changed, 87 insertions, 15 deletions

diff --git a/media-gfx/xsane/ChangeLog b/media-gfx/xsane/ChangeLog
index 639c6865d527..dcb27f495d73 100644
--- a/media-gfx/xsane/ChangeLog
+++ b/media-gfx/xsane/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/xsane
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.105 2013/08/06 18:07:48 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.106 2013/09/12 20:28:41 mrueg Exp $
+
+*xsane-0.999 (12 Sep 2013)
+
+  12 Sep 2013; Manuel Rüger <mrueg@gentoo.org> +xsane-0.999.ebuild,
+  -files/MissingCapsFlag.patch:
+  Version bump. Drop unused patch.
 
   06 Aug 2013; Markus Meier <maekke@gentoo.org> xsane-0.998-r1.ebuild:
   add ~arm, bug #473828
diff --git a/media-gfx/xsane/files/MissingCapsFlag.patch b/media-gfx/xsane/files/MissingCapsFlag.patch
deleted file mode 100644
index 0ab55c097242..000000000000
--- a/media-gfx/xsane/files/MissingCapsFlag.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/xsane-back-gtk.c	2009-06-24 00:12:18.000000000 +0200
-+++ src/xsane-back-gtk,c.new	2009-06-24 00:13:41.000000000 +0200
-@@ -2612,10 +2612,7 @@
-       continue;
-     }
- 
--    if (!(opt->cap & SANE_CAP_ALWAYS_SETTABLE))
--    {
--      gtk_widget_set_sensitive(xsane.element[i].widget, sensitive);
--    }
-+    gtk_widget_set_sensitive(xsane.element[i].widget, sensitive);
-   }
- 
-   if (xsane.xsanemode_widget)
diff --git a/media-gfx/xsane/xsane-0.999.ebuild b/media-gfx/xsane/xsane-0.999.ebuild
new file mode 100644
index 000000000000..206274146dba
--- /dev/null
+++ b/media-gfx/xsane/xsane-0.999.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.999.ebuild,v 1.1 2013/09/12 20:28:41 mrueg Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="graphical scanning frontend"
+HOMEPAGE="http://www.xsane.org/"
+SRC_URI="http://www.xsane.org/download/${P}.tar.gz
+	http://dev.gentoo.org/~dilfridge/distfiles/${PN}-0.998-patches-2.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+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}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Apply multiple fixes from different distributions
+	# Drop included patch and reuse patchset from prior version
+	rm "${WORKDIR}/${PN}-0.998-patches-2"/005-update-param-crash.patch || die
+	epatch "${WORKDIR}/${PN}-0.998-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
+
+	# Fix AR calling directly (bug #442606)
+	sed -i -e 's:ar r:$(AR) r:' lib/Makefile.in || die
+	tc-export AR
+}
+
+src_configure() {
+	local extraCPPflags
+	if use lcms; then
+		extraCPPflags="-I ${EPREFIX}/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 "${EPREFIX}"/usr/bin/gimptool ]; then
+			plugindir="$(gimptool --gimpplugindir)/plug-ins"
+		elif [ -x "${EPREFIX}"/usr/bin/gimptool-2.0 ]; then
+			plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
+		else
+			die "Can't find GIMP plugin directory."
+		fi
+		dodir "${plugindir#${EPREFIX}}"
+		dosym /usr/bin/xsane "${plugindir#${EPREFIX}}"/xsane
+	fi
+
+	newicon src/xsane-48x48.png ${PN}.png
+}