Remove old.

Package-Manager: portage-2.2.0_alpha131/cvs/Linux x86_64

4 files changed, 13 insertions, 128 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index 61baeeb387c7..7cc0cdf1878f 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/inkscape
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.185 2012/09/24 04:56:49 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.186 2012/09/24 04:58:47 radhermit Exp $
+
+  24 Sep 2012; Tim Harder <radhermit@gentoo.org>
+  -files/inkscape-0.48.1-lcms.patch, -inkscape-0.48.2.ebuild:
+  Remove old.
 
   24 Sep 2012; Tim Harder <radhermit@gentoo.org> inkscape-0.48.3.1.ebuild:
   Move G2CONF to src_configure and fix build with >=boost-1.50.
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 3efd15d3b446..f9fd9881878d 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -2,24 +2,21 @@
 Hash: SHA256
 
 AUX inkscape-0.48.0-spell.patch 1815 SHA256 697c781a7aa378f0e65160838fd13919f70b4d886dd77b8b9bdfe7f3181f1a4f SHA512 17f0f9397eebbd5a322757db9f574e4fc848bc1f53e2e0f603eb3c5d7bdf6772b8461189365533fbaa5adb4fdce5264b0c3da015c9ed5ca54873d64cc860880c WHIRLPOOL 6868334e146f00b81c521e54bc261e0153c17e8fd6b176fda826e75203674b8e6904fa092db2856b6512dfe2040b9f268781af909a9a2690bdd8e9152fbdfded
-AUX inkscape-0.48.1-lcms.patch 368 SHA256 10afc0e2c125229cd9bd7f34cd8ec743ff9188af81e2d6184298374c58102363 SHA512 f902fb242d2b124034c428f5efa4e8aeac3bde106eb087bc2bf2aa1adca78585569a402ab523fbdcf87b730d7887c152fa43a639f8f3ebfbadbf29b0b7bd2f88 WHIRLPOOL 3d159abefaf16e30ce3ed4f24f113195dd7f0596f12f862d65712b26cdd84ab987527a4f0fb4e705292e6f95f7c04bc39f9922cc542fc66e102a5766f9b6343f
 AUX inkscape-0.48.1-libpng15.patch 1616 SHA256 55e113db90267d6789cdb6a54a6c744bd0e9d755b2a7b5835a3713ea04e98c87 SHA512 f783982c8cf2cfc805cb56b6f93e5ecfdce676955f5ddd150f8d9868aa3d7d5ad571dcb1fe12c9c03e35cc05609625ea129894c95b002f0897571016d177c58e WHIRLPOOL d8f3576bb78c9e2491adc0778987f3c72846a3dc1b561c9d4550ef85aca6c8d5fff5a24a8b1854a302891339aecee4aefd4d80121c0db23cb85e2f29a6a10e1c
 AUX inkscape-0.48.2-libwpg.patch 1006 SHA256 12cea23c64ef880bbd02e67002ca05c33475701e489d9d0ba3e057b6c2c71c9d SHA512 268df3061749cd5940612b098565d8005de55a1ab7ef9d0f6a51ff93c0535afdcc4943231e019137282ccce0a8cacf0e0176f55926d792590cd22f37bf648c19 WHIRLPOOL a25e107731eab0f7fc5b3652387f090b78f6838f118f6807ad369b599091781f8d0258b8f9a5aa219dd5c57da7cb5661fe482a650d06683b1ab2d9850f067a92
-DIST inkscape-0.48.2.tar.bz2 19583331 SHA256 223a42ba6e3644bb2956c485ca0c210edc14e90fa882cdc57c1bb9f35b8f6783
 DIST inkscape-0.48.3.1-poppler-0.20.patch.bz2 3831 SHA256 c48c8ac90c4d5759bc96facb584db50ad7e32a29398553bf8465f1c5c81548ef SHA512 6f64eea80f19734824de4565698da53d9b033cadef6de0913c88ede5c50a34feb5f500a6c3fe3312f6c8bbaf3a7b6d54680ea0386349076c162c0ecc7b8547d9 WHIRLPOOL dabe6c089491250b3555214beb3e2f45e42bc1a915e7ea8cd89f1e34d2d622c940918808f8a8eb963013769fa218acb3bea1bbf28ce6b5f867b84ab815809aa7
 DIST inkscape-0.48.3.1.tar.bz2 19688778 SHA256 073bf585b6a708747485f2de1f5a1b77c3f45a79e6ee128bf946bae99476db88 SHA512 8b1d75daf2ea6f84d70117381b9e1674a70de5783e08f4095f0ca6f81726096951459cfbde43be3e578fbc3a0b1a02f205de8570e70e167a795296a3eca5c8c3 WHIRLPOOL 427b57006df728bba05c0e79b2c7aa6f81f63ed3475393f1bae1356e6b0af07d1bc0aaee73111902d82d28ccd1c9ce4db51ce10333e03221e60d786007738b4f
-EBUILD inkscape-0.48.2.ebuild 2576 SHA256 9f149febb55e70a844f119140a07ed63be3fb8951a3ce2457d840535b014cf0b SHA512 d79f75508b58cdb0db5804be8a0dff2c56ad1f83708ec6a5368b6327972ede808497bd0c687c47aee34092d8461a312da615c3a1647a098ae509c9f5d95060a9 WHIRLPOOL 4065c757c502b7d70fb246c5500d262cfec73a88071c8fd4fa642ad1e509c7c0d5e128e8e0d8157eb90f69ae1f247dd5f5c1afda36043cbe1996d95f8a2d5457
 EBUILD inkscape-0.48.3.1.ebuild 2632 SHA256 5af264fd9f141557e13600f5da4123391181e9e274473c25d191989ce8a8c4cf SHA512 d3a2b7de200f20d16e4d2a4498d26002767009832924ea7278f9610dedd24f4612c8c5e626b9b24a8b9deeae9771f26c40638f3acdf3fe85fc6bb089c8987c91 WHIRLPOOL 28ac8cac8c829c604805251223a21751b408dc865ca8b4e6d75cc447b8d1a98ecfcdc0ff7d286c64cc3881a3124f4737235314087fd0426397b77b3cf7f988c0
-MISC ChangeLog 26133 SHA256 c7de26d34d3912cad91cfda33e0846482f6585667f10e0f1d7effe69b4bfdfe1 SHA512 5cc5549e3e0711fdde87da063d9db397c0de67674a3b1df298f37e333550559080e72df80e01de488c31dc90b7a1f53d7e18c2885d867db038c5785306e018da WHIRLPOOL 3ed8c74f6bb9e9b201404dd794ee0ae3f0599d023b5a53d1eb89a45a2751bf81c6e54926f0b4e3dc12049b97171bdf680c0ba3889b11c4891e439247ef4a9b8b
+MISC ChangeLog 26259 SHA256 043efc0ece02f309a1f1f2d6b935d44790da95b70a5023a0e1d4793b0d4dcfe2 SHA512 761d7bcb06598c74286ecc063488d4c21d04b93c00ca71e6b61c3adfcdcad93d17f05c5d9c90ea218705f65d08ee3cae1068d958d5dc086eb4799dedd8184675 WHIRLPOOL 9ede8888a1abc762acf388897a543508724be6d9b3e096e5915ab11e4085cc9a42fc15c1f9b7fd433ce535438300775249668e6dba0d79a52217ae95654e00c7
 MISC metadata.xml 354 SHA256 705fec37c8550d17c1ef9260c24a45843351908700c9fe3eb1d652e4a601e007 SHA512 e8798a3aa2a76aed27f2b7124792d7b4972300146b7cfec3e8e86c42196e8746f63a45a64c12161d1c2b2f4bd211d43eedbb29738277cd319d899dd156089bd3 WHIRLPOOL c1d998bc9e5fdadaaf70bd0f8cf2e7b41a0495f73a1d6ff0c55d1c006b11d263a2fa1c405cf5eacd0a490e6300578a126303ce47dcbc844a362b7e07ee506608
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQX+gfAAoJEEqz6FtPBkyjDhUIALPOBPuEzPNMjdMnEWWFxQKV
-gyA0uRlSWV3MY8fGEnXdPGtksvvMKhp9h9ygBbpCOyoc5ukznEVfw0k7QVLKai/l
-v+BHU+/71dgtZ5UmulaxgZjSgOdhUeIkyw6iUMv0TrRvvh5cJZtNfM5RXMhS6HOv
-x3HtLuIa5BgjJKzcXI2r2mXf6v+5vd7PFRm2jC87yrB5x9w1FPdbFIs6EoQ1G+ro
-RTFV9GMj0em0qArNLd0xLCPgK24IUxmz2CPejb/amyIu6fHpduUF0ZxqOAvg7v3m
-Y56mtlxURKHAjTdpluxMSvz14k0Aiwd2mmGU4J/7P5H5UKTgjU1OC7It5LB5TSs=
-=e35k
+iQEcBAEBCAAGBQJQX+iNAAoJEEqz6FtPBkyjjJ8IAI2Eg10Ambsie23BAwYyweHO
+hlw9r6sGEyPgXj6VYwB1cyihCZ0xctMM/EP6lNDfby4B1Dfmn0CQfrbzkkRLDZmn
+gMgziaTadO5YbInN/COarUg45/tMqfd9YvbSNeOYrleF5G1G3XR0AUou3pyoPhKi
+JPB++CbCMStcyHhnZYYnyx0Tz7+i9cl8Hm4nsNHftoGo/q0JmDJk7YTHIBhhvfZC
+4J/AmRJ0X/cFb6iNF7xAd5nRkp/oFK3WGWRi7J/80rqqbZlrI555gFYrACK0QesR
+Lr2s99ighu1SfEj0kX32mF2r7M9EjTcNv/JBWyiLl3n85YJv9jO4AtBxPa8xKnQ=
+=UttW
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/inkscape/files/inkscape-0.48.1-lcms.patch b/media-gfx/inkscape/files/inkscape-0.48.1-lcms.patch
deleted file mode 100644
index 0b19188cca57..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.48.1-lcms.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- inkscape-0.48.1/src/color-profile.cpp.orig
-+++ inkscape-0.48.1/src/color-profile.cpp
-@@ -31,6 +31,7 @@
- #include "inkscape.h"
- #include "document.h"
- #include "preferences.h"
-+#include "io/sys.h"
- 
- #include "dom/uri.h"
- #include "dom/util/digest.h"
-@@ -557,9 +558,6 @@
-     return (outofgamut == 255);
- }
- 
--
--#include <io/sys.h>
--
- class ProfileInfo
- {
- public:
diff --git a/media-gfx/inkscape/inkscape-0.48.2.ebuild b/media-gfx/inkscape/inkscape-0.48.2.ebuild
deleted file mode 100644
index 968ea9cf778f..000000000000
--- a/media-gfx/inkscape/inkscape-0.48.2.ebuild
+++ /dev/null
@@ -1,96 +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/inkscape/inkscape-0.48.2.ebuild,v 1.14 2012/08/08 16:31:42 dilfridge Exp $
-
-EAPI=4
-inherit eutils flag-o-matic autotools gnome2
-
-MY_P="${P/_/}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-DESCRIPTION="A SVG based generic vector-drawing program"
-HOMEPAGE="http://www.inkscape.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="dia gnome postscript inkjar lcms nls spell wmf"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=app-text/poppler-0.12.3-r3[cairo,xpdf-headers(+)]
-	dev-cpp/glibmm
-	>=dev-cpp/gtkmm-2.18.0:2.4
-	>=dev-libs/boehm-gc-6.4
-	>=dev-libs/glib-2.6.5
-	>=dev-libs/libsigc++-2.0.12
-	>=dev-libs/libxml2-2.6.20
-	>=dev-libs/libxslt-1.0.15
-	dev-libs/popt
-	dev-python/lxml
-	media-gfx/imagemagick[cxx]
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/libpng-1.2
-	app-text/libwpd:0.9
-	app-text/libwpg:0.2
-	sci-libs/gsl
-	x11-libs/libXft
-	>=x11-libs/gtk+-2.10.7:2
-	>=x11-libs/pango-1.4.0
-	|| ( dev-lang/python[xml] dev-python/pyxml )
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	lcms? ( media-libs/lcms:0 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell:2
-	)"
-
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-python/numpy
-	media-gfx/uniconvertor
-	dia? ( app-office/dia )
-	postscript? ( app-text/ghostscript-gpl )
-	wmf? ( media-libs/libwmf )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-libs/libX11
-	>=dev-util/intltool-0.29"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --without-perl"
-	G2CONF="${G2CONF} --enable-poppler-cairo"
-	G2CONF="${G2CONF} --with-xft"
-	G2CONF="${G2CONF} $(use_with gnome gnome-vfs)"
-	G2CONF="${G2CONF} $(use_with inkjar)"
-	G2CONF="${G2CONF} $(use_enable lcms)"
-	G2CONF="${G2CONF} $(use_enable nls)"
-	G2CONF="${G2CONF} $(use_with spell aspell)"
-	G2CONF="${G2CONF} $(use_with spell gtkspell)"
-	DOCS="AUTHORS ChangeLog NEWS README*"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	epatch "${FILESDIR}"/${PN}-0.48.0-spell.patch \
-		"${FILESDIR}"/${PN}-0.48.1-libpng15.patch \
-		"${FILESDIR}"/${PN}-0.48.1-lcms.patch \
-		"${FILESDIR}"/${P}-libwpg.patch
-	eautoreconf
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-	gnome2_src_configure
-}