Version bump (bug #514732).

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 136 insertions, 16 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index 6505411a31c5..ea80e6abdd96 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/inkscape
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.207 2014/06/14 10:09:51 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.208 2014/06/26 06:56:30 radhermit Exp $
+
+*inkscape-0.48.5 (26 Jun 2014)
+
+  26 Jun 2014; Tim Harder <radhermit@gentoo.org> +inkscape-0.48.5.ebuild:
+  Version bump (bug #514732).
 
   14 Jun 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   inkscape-0.48.4-r1.ebuild:
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 9acbb70c43b0..e35019572311 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -14,24 +14,20 @@ AUX inkscape-0.48.4-poppler26.patch 4481 SHA256 fc07d1133ce703b4fc94706e2fe2377a
 AUX inkscape-0.48.4-python2.patch 439 SHA256 28fdc6e28f6c7bf0dab4144c4ac2ddbf5c038494906361a4656a2ad76de45f81 SHA512 065444bec9d9511a5eec34e3646bc34dd05f1d64eb4405fc28c47e9d7dc1b702d706b2b8a05593445756d3288c712692d2256fdd46e2b8f0e091253a266d8171 WHIRLPOOL 0f4f2a0c7b961928f8e55e991ef0a08d0f4fcb871ce7df31a5840f9c24d886ceff3e1c2951a186090eacb53e604a757aec9ae2a329b7e76c825475b0aaf09be1
 DIST inkscape-0.48.4-freetype251.patch 355 SHA256 dfbd16faa4f27559561e3bad79b7ecbb3ea7d4824223cbfe2e2c1c2f429ce663 SHA512 4b629974954a6228586a4ddff2a1107b170348d6aa2a5886bf8422c44826ea4b6e1eea2e4fb886a6153029b371a33f56d4a62ecbbcb3c705456cca893d1986b7 WHIRLPOOL 2e419a35993dca56d6b6def94d5f58aea4b56fc100aedf52fe8e2c79a8d93ea8fbbe097197e51b962f015564b2316ce1798771ad038cf1ae48759ea2de0c4751
 DIST inkscape-0.48.4.tar.bz2 19712522 SHA256 8741ad8cbb5aa5cee4f234ebc45479cff2479b16d903870693174bdede8a519d SHA512 55954925e74e2c222e7ddb86bf75e9ad17c854d991258fd3a1bf1b2aafe7014418138246a51f9ab9c4444795b03419781517910debd3448ae461f1dd1b5848be WHIRLPOOL 927dafd74c81c41ff794b22ed80fb6b6e8fcb60fc5f5b6d21ce222812cf6e34bcea9d415ee1f663d2685f64c1f89c4f62d8475da143d2763c53406d7b50f4053
+DIST inkscape-0.48.5.tar.bz2 19719332 SHA256 2b6ce684f9f2a0691ab454656424555cbda131db78e13973360684bc833ad969 SHA512 97f08d9d31e2ad84e15b9f37be3a3039aabb5b15061919e1500a01ecf56398abb3ab06a4fe557bd379dcf7acd95166637be2f4d3ef1a17c3cc76a79a7868b418 WHIRLPOOL 8147f8328212e8951f026db92b0c6d475e293aa8bff8964b90c1a3d1e85395fab400758954a2e73501b4974d644bd44c0e572aababaec809b3c73f777a13c284
 EBUILD inkscape-0.48.4-r1.ebuild 3184 SHA256 8b4c2187500b239df01416f909d52f52d0ee08a5f3ef89b0a57d7cdf9abc480b SHA512 83d4cf1d45b6128c0ff0b42eac3bcda75fa9628da50de21a70af744fbfef1a47d7e64f806d0e646eb4e2d1b50dfcbc5789a176a60794fc250d7d58dc3dafd285 WHIRLPOOL 89813f4278a0ac6566ca00716c4a5aeab73e5750aa647ff3d1d36d5057220f98d073bb31a7b2f407d8a76cbfea6551e9b679916aecd9554758d9f50ed3d7909a
 EBUILD inkscape-0.48.4.ebuild 2626 SHA256 b7b296bdf6f7d2cb4db4e37eca4a197de03d29d06432b6629ed3145df316185c SHA512 d92b0273f29bc7323b280eedbb2fab7acc50b3a60a215b42c08ca77901dcda1452a0d21d66fc0ea8134487279d5063c2d8cf76dcb28da265ac4c82cc79fd46e4 WHIRLPOOL 30c48e6d9d253832964863117bb6f78922e19e5ae5b81988f4c0a7ec4d5dffabd217b9744cb4d933626341af630bdd6cd185405e9bf8b7242de589944a168e31
-MISC ChangeLog 29390 SHA256 86b12cdd0b5c0ca2ac2a44d8ce775b738dd109cd5bc71d81804ea7ccf1f16d59 SHA512 3f70c21c99db415c8fd5ca89bce7a72e9dd710114ef2906be9173b76b1ad9dc665da6f67fa4b5ebe8a9de4c52846b09038ad623fc442a2d99722e748b14cd227 WHIRLPOOL df4722c57fc687384dd6df6ae6c6bd1e2acc436b9890beb81a52d0527d1c19b94aed9f2f4e8214fa13355270b01bd16e2d2a12417328459d795da0ef0fc0af61
+EBUILD inkscape-0.48.5.ebuild 2894 SHA256 1b1aec3988638f3ccaa7e6edaade1d3d58527ee788af422321fb5d367e1f5ae0 SHA512 a479f96222554738787ce48bac58487ceb772087fb116393f03fba6a160f637787e397154dd10dcb2eda270900cb2543b41730aaae515e4593e41cde73d0c4a0 WHIRLPOOL c08687e218cfe22fa190ad041e0dece95d60f93c97de1e6e11b803df8319aeebaee4fc117da7a1a4dbf9858af02889b0e17f29057a5fb34cdb579f3899c557ee
+MISC ChangeLog 29526 SHA256 e7049d9a83bae2c392a4df77ddebf7efa1f9e0e3a334e41268c600b0363e8de0 SHA512 2384063e1989891443d157d8b4c3c888de230b37f794e312e1f36d200a8fa0bcc3a56330dba8aca95e20a449717fdd8c85fd1f7445260bb27d012d5b8d9805dd WHIRLPOOL d400164ed6d9b2dfe507db9f51cde78f3885206e0879f4a400dc270fb547b602e37bf4fa958bdb990f9b00af13c06c7ea10dda6bcd1ba719cf5e75c2fc1c96a5
 MISC metadata.xml 354 SHA256 705fec37c8550d17c1ef9260c24a45843351908700c9fe3eb1d652e4a601e007 SHA512 e8798a3aa2a76aed27f2b7124792d7b4972300146b7cfec3e8e86c42196e8746f63a45a64c12161d1c2b2f4bd211d43eedbb29738277cd319d899dd156089bd3 WHIRLPOOL c1d998bc9e5fdadaaf70bd0f8cf2e7b41a0495f73a1d6ff0c55d1c006b11d263a2fa1c405cf5eacd0a490e6300578a126303ce47dcbc844a362b7e07ee506608
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTnB9xAAoJEE8aJVXqcZkdYQcP/A+pM+vO4pdAGgGXfEHRKMMu
-VoLSejJmFsxzRd8Fluo/z7mExy8cBvhraSDz7Aborc8SPL+xbq6SD6aXEqwH7Afc
-aA3iKAr89QAm57Wjf1UIVmN8526VKV3uEKoQDjAayivLG7OFiRG6wDZ5NEqX2yIi
-ePRaSc9+phiQpeSNfv8FJrvsMhEoEZCrYKU4dDTfZa99eZEawaKOi+Ox/8lwfviY
-ggE7t4DcJ0LmrwXvJ8ouSkO8H3ahKm2Q5FnC0jdM89eckzY3BaxjdlX0OTd8C4uL
-/Ofaxjz52LDboVKcTAjZD5iHghi2tWedWA5od8T0ZTrY/ptTRE0DXvCSoMc8MkgN
-hmzARH49iVio/OtEUAHyn/Ayy2yPIc4ltvEtEfEbVgwNQin6tvVrEux0kyB6FKvJ
-vcHwXTnZn6GNe91NDkA1pdx5j59yGzGLveeOnqwq++ukkP38eXfZhCW1SCBmUhAz
-xsuALZ9Z5ga+vrpDMUoAF2fcxRdhfdG71384MEKsUDg8wUKIOD2v884anj1uh9DF
-UOnRRvrc94QQgsguSHI2GRnHabdRNLSeLQuNIGy/eTa4n8zjY4Edj9DIkHg2F0iu
-iU2kIB/yrl6e7JSb0Aq1OHj5EwaGNSmBjVfbyzTdRbPaalIzldtGRpxTzgPlZtN7
-kDqVCKGQ0J7YW7HtrhE7
-=GM4j
+iQEcBAEBCAAGBQJTq8QfAAoJEEqz6FtPBkyjaygIAI1KhZwGaT8flkFwqO76EHCd
+vbyqz/NmRr4GvgcPdPNveRRGw90iNMbMgDrmWN/kHx49ff1hquTzV+NjvijPFvLS
+qZhL2lCjWRarMl4s48oXacBHI3msun+eZGPsfRit+GHeUvc6CJaVbJCkV42k4uTO
+QKSy2imnRMHJw0cKVpVLbE2UjcOhJTr+mGebMhuAx8FvIQ0x18xNEimLvW7SsjtU
+FINgf6MLEItVRJVA4/bu8QZP/NVqJl/9604UNUnItfupi7mTmoxdU6xOu1DzNZoA
+bayFS+F7uR6SBMAburURE84eRrl2S2pwARZhziK6upGfzSjR81IOJfe2Qus3F/w=
+=v/w0
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/inkscape/inkscape-0.48.5.ebuild b/media-gfx/inkscape/inkscape-0.48.5.ebuild
new file mode 100644
index 000000000000..cf04c74f2eab
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-0.48.5.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.5.ebuild,v 1.1 2014/06/26 06:56:30 radhermit Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+GCONF_DEBUG=no
+
+inherit autotools eutils flag-o-matic gnome2 toolchain-funcs python-single-r1
+
+MY_P=${P/_/}
+
+DESCRIPTION="A SVG based generic vector-drawing program"
+HOMEPAGE="http://www.inkscape.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="dia gnome postscript inkjar lcms nls spell wmf"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	app-text/libwpd:0.9
+	app-text/libwpg:0.2
+	>=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[${PYTHON_USEDEP}]
+	media-gfx/imagemagick[cxx]
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0
+	sci-libs/gsl
+	x11-libs/libX11
+	>=x11-libs/gtk+-2.10.7:2
+	>=x11-libs/pango-1.4.0
+	gnome? ( >=gnome-base/gnome-vfs-2.0 )
+	lcms? ( media-libs/lcms:2 )
+	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[${PYTHON_USEDEP}]
+	media-gfx/uniconvertor
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+	wmf? ( media-libs/libwmf )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	>=dev-util/intltool-0.29
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="test"
+
+src_prepare() {
+	gnome2_src_prepare
+	epatch \
+		"${FILESDIR}"/${PN}-0.48.0-spell.patch \
+		"${FILESDIR}"/${PN}-0.48.2-libwpg.patch \
+		"${FILESDIR}"/${PN}-0.48.3.1-desktop.patch \
+		"${FILESDIR}"/${PN}-0.48.4-epython.patch \
+		"${FILESDIR}"/${PN}-0.48.4-automake-1.13.patch \
+		"${FILESDIR}"/${PN}-0.48.4-gc74-configure.patch
+
+	sed -i \
+		-e "s#@EPYTHON@#${EPYTHON}#" \
+		src/extension/implementation/script.cpp || die
+
+	eautoreconf
+
+	# bug 421111
+	python_fix_shebang share/extensions
+}
+
+src_configure() {
+	G2CONF="${G2CONF}
+		--without-perl
+		--enable-poppler-cairo
+		$(use_with gnome gnome-vfs)
+		$(use_with inkjar)
+		$(use_enable lcms)
+		$(use_enable nls)
+		$(use_with spell aspell)
+		$(use_with spell gtkspell)"
+
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+	gnome2_src_configure
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED}"/usr/share/${PN}/extensions
+}