Version bump (bug #354721). Use bz2 tarball, add RDEPEND on uniconvertor (bug #345393), use slot dependencies for freetype and lcms, fix compile with libpng-1.5 (bug #355845), and remove old post-install message.

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

4 files changed, 146 insertions, 16 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index dcc7ab1ad45c..f46c436bb9fd 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,14 @@
 # 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.153 2011/02/22 11:33:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.154 2011/02/23 19:14:28 radhermit Exp $
+
+*inkscape-0.48.1 (23 Feb 2011)
+
+  23 Feb 2011; Tim Harder <radhermit@gentoo.org> +inkscape-0.48.1.ebuild,
+  +files/inkscape-0.48.1-libpng15.patch:
+  Version bump (bug #354721). Use bz2 tarball, add RDEPEND on uniconvertor (bug
+  #345393), use slot dependencies for freetype and lcms, fix compile with
+  libpng-1.5 (bug #355845), and remove old post-install message.
 
   22 Feb 2011; Tim Harder <radhermit@gentoo.org> inkscape-0.47.ebuild,
   inkscape-0.48.0.ebuild:
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index dd25ab674d36..a8d7f7322882 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,24 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX inkscape-0.47-gcc45.patch 4797 RMD160 c6f254b0b2bc1f7ae0e29a6952b9f13516385fc8 SHA1 68f66a3c152e1b472f9505dbac354f86a9059ee3 SHA256 49834c862d145c88d82ea016b0c6a274cf935c10d80bd2aefe45c4a8336d214f
 AUX inkscape-0.47-poppler.patch 3733 RMD160 6fad5479d59f1742216fe673e80dac2b420f768e SHA1 de0d3ab2b55bc0c63ef725bad90bd78258b76bc5 SHA256 43f0e3202e179599719e1a857ae319e332dad082bd8ab64c686a00979174c000
 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-libpng15.patch 1616 RMD160 ea6f011b2cd91db106aaed4ff4d387fc20f96214 SHA1 d6512f3cb38ca8e2436dc485aa652490d17b3a52 SHA256 55e113db90267d6789cdb6a54a6c744bd0e9d755b2a7b5835a3713ea04e98c87
 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
 EBUILD inkscape-0.47.ebuild 2485 RMD160 12b085ad458ce2178bb065a5458c7090e2cafa06 SHA1 2845bd68c6ead5c1d9fe34ec345012dfb8fb09e6 SHA256 054b29518c1ed513212bb4230e90382597dd312d97e94890bb04304ce202405d
 EBUILD inkscape-0.48.0.ebuild 2679 RMD160 268a394c82a4279c1bfd4ba1759347f6401d87e6 SHA1 289adf4e1db4e977bbcefe36897d930d252abc99 SHA256 afa9a9e3099652f781bd0a4ffae0c9c91931aebc872db40812df90ec1f552dcc
-MISC ChangeLog 21127 RMD160 00092ddc65039c0d1605e3cb0fc2983aafbab073 SHA1 a03abaa82f3bf501025c3eea81953695f2790522 SHA256 7a6cebd8ace7767054b9ea2bdb46f018a6f2b812d97a076df1018d566a8398d6
+EBUILD inkscape-0.48.1.ebuild 2386 RMD160 50900906a781968ff1a1e617bca9fa348177abb8 SHA1 bf27009694e3f3ac8f49f7e7311fb5235d60ef3b SHA256 8ae889bb1555ab7037daa127c185f9fc1cfd577de8b4e0a39a86849ae4d10552
+MISC ChangeLog 21494 RMD160 aa411f9db272ffb6157dce1131931b8e1f51fb6e SHA1 5282d5f00bf1e20d3646de4d81c305935262537b SHA256 e541e976969137b47f17bd756b79a1e589d41834d53937482bf5a6d68885a152
 MISC metadata.xml 438 RMD160 255e104540381e2eda4bee5e06d13a3e5f9cd978 SHA1 8364d93a2a793fea4d5ace199ac7c25c67e896ab SHA256 d033e82cb1e2d7055baf12ffa4c1a21cfc79d3d45373c122ebf39d4c856437f3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBAgAGBQJNY58FAAoJEEqz6FtPBkyjyjUIAJpoPMGBtPVVOBjJjD64F9jR
-Vb3ochq9kT8+KvdQNiNdQ4JqTMN23ppFrAOF0pw5PT7qWmkRSnINT2TwdbgfyPQP
-iEaaN9Dm2dwHSrFaJ7SM4bKY1JG5uY7C/dfga/1LxdwGDisD1H9Snt7f5l/pIm/f
-RjgaFx6xl1UbXMlEmyvYIjK+DWtID/RaJP3qNi42iXNYo4uKxRQ0tUnqcx2QXl2u
-p20GRxYCFweOnMDtbFYEefQoWDNJnda46OZByywNE6wOU3iwXTtTVKgMkoigKcDI
-m26BWhZWgZZTqzviSW7y32MWzTAApQ0+i4HhT4WEZTixIaaQkm3hAIMwG6QEmfY=
-=bjsR
------END PGP SIGNATURE-----
diff --git a/media-gfx/inkscape/files/inkscape-0.48.1-libpng15.patch b/media-gfx/inkscape/files/inkscape-0.48.1-libpng15.patch
new file mode 100644
index 000000000000..e24913ed627d
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.48.1-libpng15.patch
@@ -0,0 +1,40 @@
+--- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp
++++ inkscape-0.48.1-mod//src/extension/internal/pdfinput/svg-builder.cpp
+@@ -1443,7 +1443,7 @@
+         return NULL;
+     }
+     // Set error handler
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+         png_destroy_write_struct(&png_ptr, &info_ptr);
+         return NULL;
+     }
+--- inkscape-0.48.1/src/helper/png-write.cpp
++++ inkscape-0.48.1-mod//src/helper/png-write.cpp
+@@ -165,7 +165,7 @@
+     /* Set error handling.  REQUIRED if you aren't supplying your own
+      * error hadnling functions in the png_create_write_struct() call.
+      */
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+         /* If we get here, we had a problem reading the file */
+         fclose(fp);
+         png_destroy_write_struct(&png_ptr, &info_ptr);
+--- inkscape-0.48.1/src/sp-image.cpp
++++ inkscape-0.48.1-mod//src/sp-image.cpp
+@@ -386,9 +386,13 @@
+ 
+ #if defined(PNG_iCCP_SUPPORTED)
+                 {
+-                    char* name = 0;
++                    png_charp name = 0;
+                     int compression_type = 0;
+-                    char* profile = 0;
++#if (PNG_LIBPNG_VER < 10500)
++                    png_charp profile = 0;
++#else
++                    png_bytep profile = 0;
++#endif
+                     png_uint_32 proflen = 0;
+                     if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) {
+ //                                         g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type);
diff --git a/media-gfx/inkscape/inkscape-0.48.1.ebuild b/media-gfx/inkscape/inkscape-0.48.1.ebuild
new file mode 100644
index 000000000000..cc75c315dc6d
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-0.48.1.ebuild
@@ -0,0 +1,93 @@
+# 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.1 2011/02/23 19:14:29 radhermit 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 ~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
+	>=media-libs/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
+	eautoreconf
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+	gnome2_src_configure
+}