Adding build-time blocker for sane-backends-1.0.20 and above, removing obsolete version, correcting metadata.

(Portage version: 2.1.6.13/cvs/Linux i686)

4 files changed, 10 insertions, 84 deletions

diff --git a/media-gfx/xsane/ChangeLog b/media-gfx/xsane/ChangeLog
index 47e84455d74c..f0acc632a9b5 100644
--- a/media-gfx/xsane/ChangeLog
+++ b/media-gfx/xsane/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/xsane
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.78 2009/05/01 17:42:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.79 2009/06/23 21:48:33 phosphan Exp $
+
+  23 Jun 2009; Patrick Kursawe <phosphan@gentoo.org> metadata.xml,
+  -xsane-0.995.ebuild, xsane-0.996.ebuild:
+  Adding build-time blocker for sane-backends-1.0.20 and above, removing
+  obsolete version, correcting metadata.
 
   01 May 2009; Raúl Porcel <armin76@gentoo.org> xsane-0.996.ebuild:
   sparc stable wrt #256597
diff --git a/media-gfx/xsane/metadata.xml b/media-gfx/xsane/metadata.xml
index d2c5d286a5fa..f924403c63c3 100644
--- a/media-gfx/xsane/metadata.xml
+++ b/media-gfx/xsane/metadata.xml
@@ -4,6 +4,6 @@
 <herd>no-herd</herd>
 <maintainer>
 <email>phosphan@gentoo.org</email>
-<description>Package free for adoption, I don't have much time and my scanner is connected to a dialup machine</description>
+<description>Package free for adoption,</description>
 </maintainer>
 </pkgmetadata>
diff --git a/media-gfx/xsane/xsane-0.995.ebuild b/media-gfx/xsane/xsane-0.995.ebuild
deleted file mode 100644
index 9e9629c72cb6..000000000000
--- a/media-gfx/xsane/xsane-0.995.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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.995.ebuild,v 1.7 2008/08/10 17:14:54 klausman 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() {
-	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
-		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
-}
diff --git a/media-gfx/xsane/xsane-0.996.ebuild b/media-gfx/xsane/xsane-0.996.ebuild
index f3c6781ba355..e83b0c52c737 100644
--- a/media-gfx/xsane/xsane-0.996.ebuild
+++ b/media-gfx/xsane/xsane-0.996.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.6 2009/05/01 17:42:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.996.ebuild,v 1.7 2009/06/23 21:48:33 phosphan Exp $
 
 inherit eutils
 
@@ -22,7 +22,8 @@ RDEPEND="media-gfx/sane-backends
 	lcms? ( media-libs/lcms )"
 
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	!>=media-gfx/sane-backends-1.0.20"
 
 pkg_setup() {
 	export OLDXSANE