old

(Portage version: 2.2.0_alpha64/cvs/Linux x86_64)

4 files changed, 5 insertions, 223 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index 26fd3b5ca3b9..3b69c88a9721 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/inkscape
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.165 2011/10/15 18:26:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.166 2011/10/15 18:29:12 ssuominen Exp $
+
+  15 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -inkscape-0.48.1.ebuild,
+  -inkscape-0.48.1-r1.ebuild, -files/inkscape-0.48.1-gcc-4.6.patch:
+  old
 
   15 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> inkscape-0.48.2.ebuild:
   amd64 stable wrt #387199
diff --git a/media-gfx/inkscape/files/inkscape-0.48.1-gcc-4.6.patch b/media-gfx/inkscape/files/inkscape-0.48.1-gcc-4.6.patch
deleted file mode 100644
index feff68b6b67e..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.48.1-gcc-4.6.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- inkscape-0.48.1/src/2geom/utils.h
-+++ inkscape-0.48.1-r1/src/2geom/utils.h
-@@ -35,6 +35,7 @@
- 
- #include <cmath>
- #include <vector>
-+#include <cstddef>
- 
- namespace Geom {
- 
---- inkscape-0.48.1/src/libavoid/geomtypes.h
-+++ inkscape-0.48.1-r1/src/libavoid/geomtypes.h
-@@ -31,6 +31,7 @@
- 
- #include <vector>
- #include <utility>
-+#include <cstddef>
- 
- 
- namespace Avoid
---- inkscape-0.48.1/src/Makefile.am
-+++ inkscape-0.48.1-r1/src/Makefile.am
-@@ -205,7 +205,7 @@
- 
- inkscape_SOURCES += main.cpp $(win32_sources)
- inkscape_LDADD = $(all_libs)
--inkscape_LDFLAGS = --export-dynamic $(kdeldflags) $(mwindows)
-+inkscape_LDFLAGS = $(kdeldflags) $(mwindows)
- 
- inkview_SOURCES += inkview.cpp $(win32_sources)
- inkview_LDADD = $(all_libs)
diff --git a/media-gfx/inkscape/inkscape-0.48.1-r1.ebuild b/media-gfx/inkscape/inkscape-0.48.1-r1.ebuild
deleted file mode 100644
index 1afceaed1b93..000000000000
--- a/media-gfx/inkscape/inkscape-0.48.1-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.1-r1.ebuild,v 1.2 2011/08/04 16:27:36 scarabeus Exp $
-
-EAPI=2
-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 ~x86"
-IUSE="dia gnome gs 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
-	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
-	)"
-
-# 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 )
-	gs? ( app-text/ghostscript-gpl )
-	wmf? ( media-libs/libwmf )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	sys-devel/gettext
-	dev-util/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
-	epatch "${FILESDIR}"/${PN}-0.48.0-libwpd.patch
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-	epatch "${FILESDIR}"/${P}-lcms.patch
-	epatch "${FILESDIR}"/${P}-gcc-4.6.patch
-	eautoreconf
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-	gnome2_src_configure
-}
diff --git a/media-gfx/inkscape/inkscape-0.48.1.ebuild b/media-gfx/inkscape/inkscape-0.48.1.ebuild
deleted file mode 100644
index e6d049c0d045..000000000000
--- a/media-gfx/inkscape/inkscape-0.48.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.1.ebuild,v 1.5 2011/08/04 16:27:36 scarabeus Exp $
-
-EAPI=2
-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 ~x86"
-IUSE="dia gnome gs 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
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/libpng-1.2
-	>=app-text/libwpg-0.1
-	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
-	)"
-
-# 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 )
-	gs? ( app-text/ghostscript-gpl )
-	wmf? ( media-libs/libwmf )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	sys-devel/gettext
-	dev-util/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
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-	epatch "${FILESDIR}"/${P}-lcms.patch
-	eautoreconf
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-	gnome2_src_configure
-}