# 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
AUX inkscape-0.48.0-libwpd.patch 1444 RMD160 f5b63be882b6e6757fab8994ad6ade5a6e8e5b44 SHA1 bcf8d143f29e3b1ff3281065a374c9ae1beb276c SHA256 a364a8e302a9d9ff022333c101478755d5bfd262d7ace65619809b3210287547
AUX inkscape-0.48.0-poppler-0.16.patch 2643 RMD160 31ca9704d9df32d9534acace96889782ad4b7e13 SHA1 c3f1821740ed638d2de886a4e7825962c947ac89 SHA256 7e240c3af06daa171c42f0dbca19e5ada05877c8127c7be9129804e053a320c4
AUX inkscape-0.48.0-spell.patch 1815 RMD160 b2b0d777467da3878074734499f96c8bead465cb SHA1 5b68841610b1e7f12c61c88d3df842f679293abd SHA256 697c781a7aa378f0e65160838fd13919f70b4d886dd77b8b9bdfe7f3181f1a4f
-AUX inkscape-0.48.1-gcc-4.6.patch 734 RMD160 2e85347875c397da25797e90b8d1e191391d3545 SHA1 bc65a1ec5c6e20ba6e66a62f349e69c10ead039e SHA256 16e43c3cd10fa4d2da4d2abe698d55c24eb22444cf9bcb23427977fb7f15a4a7
AUX inkscape-0.48.1-lcms.patch 368 RMD160 d0be9057ee064cfa87c15dd13b4f4f8c6ee227ca SHA1 55f3c071825f453959d3b1610d8f7682f8a7d8be SHA256 10afc0e2c125229cd9bd7f34cd8ec743ff9188af81e2d6184298374c58102363
AUX inkscape-0.48.1-libpng15.patch 1616 RMD160 ea6f011b2cd91db106aaed4ff4d387fc20f96214 SHA1 d6512f3cb38ca8e2436dc485aa652490d17b3a52 SHA256 55e113db90267d6789cdb6a54a6c744bd0e9d755b2a7b5835a3713ea04e98c87
AUX inkscape-0.48.2-libwpg.patch 1006 RMD160 207d25adc5bbde4e660a0f0a0723df417fd3817c SHA1 b2beb2c67b8ba8f04f928f2d02cce9d032617cd4 SHA256 12cea23c64ef880bbd02e67002ca05c33475701e489d9d0ba3e057b6c2c71c9d
DIST inkscape-0.47.tar.gz 28044445 RMD160 58fe20b2a103bd8909e27811354e1a3700dcd177 SHA1 aa39d5f7306edb21be4987651041bf50c13baf75 SHA256 e5899be10183d86249516a29bc146706600ae5eafb5be5274c465a8029659b97
DIST inkscape-0.48.0.tar.gz 25870275 RMD160 0d97c17136fe69a2248bb4cf4d2f6296ce18c37f SHA1 220ade981069a91d3afab9cbff75f65c75119da2 SHA256 0812f6ca63aa7c4bb236c932a02bd4e0cb5209404bb42cff5f65ad0f84844176
-DIST inkscape-0.48.1.tar.bz2 19558565 RMD160 9e25e02258d1b1e4cce24474523e1b37e58aded6 SHA1 9727ed11cef31c2790bf2affbddf6a6ef352753f SHA256 44bda45d14374351f426afa467222093c2f24ddb586e3cfa1cf21e7468e4bb86
DIST inkscape-0.48.2.tar.bz2 19583331 RMD160 3f658d373f976a41191d48d8248b33dfb3d65238 SHA1 be30ab2d2714d04ddd69b400bd6ad30b09e83067 SHA256 223a42ba6e3644bb2956c485ca0c210edc14e90fa882cdc57c1bb9f35b8f6783
EBUILD inkscape-0.47.ebuild 2477 RMD160 1e126305c3c52353d2cc0daf2b048b64ade0e3dc SHA1 9e8b03848bd6db48e200661837d619711853c54a SHA256 3159f0fe64b1e807431cf1544706c00824d0699da7ef430bee0a94f460513bf9
EBUILD inkscape-0.48.0.ebuild 2671 RMD160 162a3c939e3be3f4c5eefa048162d60306aca295 SHA1 eadfcbd2641de066acd5422dff29d8e0647f2e0f SHA256 c0b9822e803c460feee86b7d7e2351429b443e117d6d3a3521cfcb0e24f12f34
-EBUILD inkscape-0.48.1-r1.ebuild 2539 RMD160 1217ff8a8c7c36b9a16c6127346d5768d3c29493 SHA1 620f30509fe1480a67aa4f12288db358481d6371 SHA256 e0bf129b6e80a1b934b310062e28d1236cb725b86457a6533d886fc307464c38
-EBUILD inkscape-0.48.1.ebuild 2433 RMD160 6467f24e28ac89082c05b6aa5b778fd679821b9b SHA1 9d6c176bae43cb004bf4a552ce5ca5dc71872bcb SHA256 bce1de1e68eee6c4cdfb4664d6b877b7676e11629ab140d339aa4b25e7722245
EBUILD inkscape-0.48.2.ebuild 2554 RMD160 3eddf02ff19107993b4b640b1311e43844f7bc13 SHA1 73dacb532dcdd7b8fe83b3bff964301996cee616 SHA256 e2377c173acee3ce500d6ca0cce8cd5de117ce85d872f0a6e33aa0072e45b3fe
-MISC ChangeLog 23266 RMD160 0b18db41ab6bdbe9bfae2a1a1a8c0fdcb65eeb72 SHA1 ae8507d1512110da21cbac73b34bc28753d11098 SHA256 ce420f72648c0dc8f3ed8f57a7e1ca6b1b9b2bd39a396b84484806c9d9a5afd2
+MISC ChangeLog 23420 RMD160 2b3633013031f0d03327c31ae858528d35a4dc52 SHA1 647a28504e420de5ba0a32581bd014700627eaa1 SHA256 46e340a960901f1448bbd506006dfca802d711eb3a296f917b362bdf1aff009d
MISC metadata.xml 438 RMD160 255e104540381e2eda4bee5e06d13a3e5f9cd978 SHA1 8364d93a2a793fea4d5ace199ac7c25c67e896ab SHA256 d033e82cb1e2d7055baf12ffa4c1a21cfc79d3d45373c122ebf39d4c856437f3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQEcBAEBAgAGBQJOmdA+AAoJEEdUh39IaPFN08gIAIq8C7Ez4Ibj9Q48R5vKJ1CT
-0+Tn/zIbHXrds0yAZAoeil+VaHfus2p4J5V+8YQvsy00rnef2d8MBrqPZtZ74C1e
-Iti0k8tnL8sTo3wI1YHZ7FlgLiekzYwwD2rqfvlRXbp3CSZBWT8uTFxsJ+gMmf3L
-dPh6ztrI1Ni9ekV7VxCp2HoKW9X2b5lb9Z9qMU328LfkL4IZ1b8XBI6hr2nSJ2FW
-Q8s58mQX/pFSWwVLe/IdGnI732cISF/wfuXvBWYyRbNuc1gRCvrWbwzlK2upPLqS
-U3CbbbkIMmQu4pmLfjClX8COjUMUjSHNkG2CSyJ8+LYes/fcR9uyLr6h5m4V1yo=
-=4aZV
+iQEcBAEBAgAGBQJOmdDyAAoJEEdUh39IaPFNWPkH/0LSknKaVFck5Gl+ldU5Z4hC
+EcDEFpX7fxRd1MEQvqbzutCw+irk/r6HuLgf6hXKHN5RUDiQhDBOsjKJbfi/zpjH
+wCIUe0BiXue01lRwJMafJrpMpzkx/6J9Es39kC494Smg4CMSMMo2VWW3/2r5wbbL
+xard1jw5uhL/+kvXQIxejGHiZX/fYvaN100sV5kxpj80fJcD2wtfAT8PLdaVe6bm
+HXSyMeBv5rpYPbEre/sLVgiKL2rkht9wv3oki9ukKaeRnMjVzhSBw+3Qe9ljtv4Z
+6F2c8g5cVbWFesUuv45POzurMi0MuURYs0IWQbDhLmHSQQGn94mVkWu2CzMFozk=
+=zZCq
-----END PGP SIGNATURE-----
+++ /dev/null
---- 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)
+++ /dev/null
-# 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
-}
+++ /dev/null
-# 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
-}