Cleanup old. Fixes bug #526858.

Package-Manager: portage-2.2.15/cvs/Linux x86_64

3 files changed, 5 insertions, 103 deletions

diff --git a/media-gfx/xsane/ChangeLog b/media-gfx/xsane/ChangeLog
index 125f573da72b..2f6ee237596e 100644
--- a/media-gfx/xsane/ChangeLog
+++ b/media-gfx/xsane/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/xsane
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.119 2014/12/04 08:36:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.120 2014/12/04 09:50:42 mrueg Exp $
+
+  04 Dec 2014; Manuel Rüger <mrueg@gentoo.org> -xsane-0.999.ebuild:
+  Cleanup old. Fixes bug #526858.
 
   04 Dec 2014; Agostino Sarubbo <ago@gentoo.org> xsane-0.999-r1.ebuild:
   Stable for ppc64, wrt bug #526922
diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest
index d34e4f982a60..552732c306f3 100644
--- a/media-gfx/xsane/Manifest
+++ b/media-gfx/xsane/Manifest
@@ -1,27 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX xsane-0.999-lcms2.patch 11790 SHA256 edfc133483fc3975d9409314a2834403865e891f7744e59c4431a0f0050ebd04 SHA512 4734fd4599e2fed7b86a94836a40725fafb70e9252885faf092495fabfbaa02a7c245b3cacea19e5e1c455a3a74b475ad8cb215fbba3fa64bc066068abddbb29 WHIRLPOOL babe07abbc784f2d35309ca9d805a5bfab0c9037ea9159c3f0051b466b9b40aa53a561a864b26b6c68e1d3821e0719b2156fdf144ad1169963879002d07a727c
 DIST xsane-0.998-patches-2.tar.xz 54804 SHA256 84af533cba6309cf44892da8952b6203daa4dcfaf64e2efd1dddc5144e4cab4c SHA512 973ccac2fe3b6089049c1c5ba3e4cb0db29fdc79de372f8a7b461ee108e5bfc3f4a84997552fc3d3b651bbe9f98d247a5974d90e8949089b2ea52118eab6ad1f WHIRLPOOL 2294601aa696c442e8d2b5173b8ee04d158439e0ae02dd22c7d5c8f9fce98c8238a42e0867a5e511d206dd4030f7a15df2a98676471abe1e91870883662add56
 DIST xsane-0.999.tar.gz 2950621 SHA256 5782d23e67dc961c81eef13a87b17eb0144cae3d1ffc5cf7e0322da751482b4b SHA512 73ec961fce1a86b5d6f5bac0995d222785eb4b077dc8e72492b092d2bf4500455426e80e4d27233721cd38ec84f77fb9f92190a6afe45bdaf7ffd1ee50b431ed WHIRLPOOL 7d50f6ecd8ad671d36a6b92eb365a6361da8d90bfea3136cf7add0890313294903f8cbc75684cbc24e42a028f83922a0308783fb20d89b0d6b14b1f949283ad5
 EBUILD xsane-0.999-r1.ebuild 2244 SHA256 1b2f82767652f65a69fd02bff3832459dc1695c1f5ce6d694b6f70e4c1c9483d SHA512 8bf940ee795aa1f45eaa3a7e04a533b6b5e686774de38060a6419902b6e1614b33aa09ad51f61feb53057564fc382958017f4b51c22121c4ca5329d02324517e WHIRLPOOL b29dbaf29471a88bc6ee9042dbecf651ac8773b60a8e6e01f63858f559c6ac8b1428f8734c51a65309870206bc1d3a78abcde821b056a419bb315b22cefed704
-EBUILD xsane-0.999.ebuild 2243 SHA256 75e7bdffa206d4a8ffb05228c0ba1c6d3c9bb83285f7dc5140a82a992705c379 SHA512 2127957c7c4199d360f30fcfb0bf80375c2e7a17792e154d8f3cefd35bdf17b344d4589753b79397c1fd04061c8dc326900e6c9385e19dd1027aab25c6513f6b WHIRLPOOL ea61fd1609d6df2fa3bd5f8aab26a8aa220b12ffa27591d9e5f49677685f301c908ff273af820209e25a3eeae921775bf879f5c8a5abd5b2ac77706b5d45eadf
-MISC ChangeLog 15050 SHA256 16be0ca157429ac32927fbe96e97f274b9bd979f9f75b0b2799be897c12c3443 SHA512 ec2223c444056115e00497825755a3f914c67451d8874cd2541a7a9ad8f7bcb674ec807ac4000d6db891b60955672c2fa43c1c8e3b3018aa40f38c6c4e943b0e WHIRLPOOL a928c0899b2560a471d877a781a0447347895719775bd43bdc2124b21ea0ba3ebbbad9389e607804839e98986ac1549d0069470dba33975ae08c9f75065f6dd3
+MISC ChangeLog 15156 SHA256 5f2e2d2f1d1dda461f4b12d8cfa1920f15797a416efdddb0b222aabfe3ffda39 SHA512 4e313513cddd220829c8e8673931c92cb4c8e41c8b4808ce0327f377d736c3fa3ab70297329efe00f00c1470538ac32370ec1a65ea52182b9d48ca20a5621634 WHIRLPOOL 07c5ccf84add54bc2f80dcb019653624cb612cdc8c826a42353775fceb110699d8d9d72f7e2fb39ec1023b2164e954fd6ba701445bc904e3f0a802f620bc2775
 MISC metadata.xml 344 SHA256 b2857349b71ce0e456a6c8f738fe15071736b83fc9ebb094f59226a957cf0e33 SHA512 83042db54904dee13977d1a2c683c265428cc45e2742c5601bdb1d3408145d296c1bdf76381d01de6f4c2d2aa2bad8f77eb70ed7404cf6676bf7101e50473386 WHIRLPOOL ed5cc7a43e31023ed36fd84a8dbfb1d8a3c3d7461e45380a56193fb2058c3dc86caec5ca970e8fab48c5f96122be8ef26c24aec03204fe0eb55a9731cf6ea458
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJUgB0rAAoJELp701BxlEWfto0P/1E+oS0puLx7GEf8ZbOMM9KZ
-TMk9NZpKztaPFdQoAP2yljQFgEMuYpE3gFl5+s4wFvy9SYyUBYrdZDg4r5goAaf7
-MGRW3RoLyNYu18ZBNjdWZeeFF5zRLpEpBrMuSU8JtEacFy+v08SqjEto1lsQN/wg
-7Ps722UIRL86/fyAMTIF3ZQGtyFV8aD5yDVkYLOW05SPHQMECUhsUx167+EJZ2BA
-X10Vbvi4U8pmPnr/wT1xxvQnDNTn+R5gxK8DwP8mXRQtzGqmKQdTISSbsHNCeM1m
-8jlqksWSWA/4IB3sLx/MZ8MmzA06+2pNlAQEbuWDJzNefNSg4uWUA3LAuz73fefp
-1S3Q2+ukN1hJz8FT/28H2vq6B2BLr+Qv76LRxvFzNherKc09O7Idnv4GHesAzS8J
-cLBnwXKAyyLgGLsLehr8dRtRTMMeBNq4wS/gH1/o2P8Wg2HuKJVWrcH8xHN2FPnO
-b/82a1WLcXgO5/GHlOpxvrWZRtWXN/C/6wX13fTLRvd0mb8nfVYUbIDyT0PfeWhM
-qNLj0a4Zz4oA3w5ruug5bMUuaw/9hRVK8d4K0APDpg2ms9lp/DyArJh4++Eha6sM
-s8UQiHvNzaDMIpLPFd3L7MkGlodTZezcfsKeTVSkUq7VmhTX+nKFKbj/8h2czugp
-WyDTCd2/hzpYHq3i93zj
-=sk85
------END PGP SIGNATURE-----
diff --git a/media-gfx/xsane/xsane-0.999.ebuild b/media-gfx/xsane/xsane-0.999.ebuild
deleted file mode 100644
index d0e8e63ec730..000000000000
--- a/media-gfx/xsane/xsane-0.999.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 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.7 2014/01/18 19:55:52 ago 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
-}