Cleanup due #473480

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

3 files changed, 5 insertions, 98 deletions

diff --git a/media-gfx/xsane/ChangeLog b/media-gfx/xsane/ChangeLog
index 93bae5051b39..16a2423f36a7 100644
--- a/media-gfx/xsane/ChangeLog
+++ b/media-gfx/xsane/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/xsane
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.103 2012/12/16 17:47:09 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.104 2013/07/21 09:41:31 pacho Exp $
+
+  21 Jul 2013; Pacho Ramos <pacho@gentoo.org> -xsane-0.998.ebuild, metadata.xml:
+  Cleanup due #473480
 
   16 Dec 2012; Raúl Porcel <armin76@gentoo.org> xsane-0.998-r1.ebuild:
   alpha/sparc stable wrt #442440
diff --git a/media-gfx/xsane/metadata.xml b/media-gfx/xsane/metadata.xml
index d353fec626d5..a203d1b2511d 100644
--- a/media-gfx/xsane/metadata.xml
+++ b/media-gfx/xsane/metadata.xml
@@ -4,12 +4,7 @@
 <herd>printing</herd>
 <herd>graphics</herd>
 <maintainer>
-	<email>phosphan@gentoo.org</email>
-	<description>Package free for adoption</description>
-</maintainer>
-<maintainer>
 	<email>pacho@gentoo.org</email>
-	<description>Taking care until somebody wants to also help</description> 
 </maintainer>
 <use>
         <flag name='ocr'>Enable support for Optical Character Recognition reader</flag>
diff --git a/media-gfx/xsane/xsane-0.998.ebuild b/media-gfx/xsane/xsane-0.998.ebuild
deleted file mode 100644
index c659c0fa9b36..000000000000
--- a/media-gfx/xsane/xsane-0.998.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.998.ebuild,v 1.8 2012/05/05 07:00:20 jdhore Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="graphical scanning frontend"
-HOMEPAGE="http://www.xsane.org/"
-SRC_URI="http://www.xsane.org/download/${P}.tar.gz
-	http://dev.gentoo.org/~pacho/xsane/${P}-patches.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-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"
-
-pkg_setup() {
-	export OLDXSANE
-	if has_version '<=media-gfx/xsane-0.93'; then
-		OLDXSANE="yes"
-	else
-		OLDXSANE="no"
-	fi
-}
-
-src_prepare() {
-	# Apply multiple fixes from different distributions
-	epatch "${WORKDIR}/${P}-patches"/*.patch
-
-	# Fix compability with libpng15 wrt #377363
-	sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c || die
-}
-
-src_configure() {
-	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)
-}
-
-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 /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
-}
-
-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
-}