Remove unnecessary quoting and move variables into more standard locations.

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

3 files changed, 22 insertions, 22 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index b136c651c34e..f39aee791404 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/inkscape
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.197 2013/05/01 13:33:22 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.198 2013/05/03 22:30:28 radhermit Exp $
+
+  03 May 2013; Tim Harder <radhermit@gentoo.org> inkscape-0.48.4-r1.ebuild:
+  Remove unnecessary quoting and move variables into more standard locations.
 
 *inkscape-0.48.4-r1 (01 May 2013)
 
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index e59cec86047e..a8bf354ff41d 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -10,18 +10,18 @@ AUX inkscape-0.48.4-epython.patch 441 SHA256 279c1dd278bf69c69f4ac2351d8d069f08a
 AUX inkscape-0.48.4-fix-member-decl.patch 336 SHA256 f80b2a534f0455e2b90c35f369c09c8f8d5cca21f3908e27bdf9fcb0bc4098d4 SHA512 7286c58a666396ae6c9f5664493c512985429872f3da82ea6ae6af33b97dae60e01cd8cc6d23c2ae2fcfc716b287c06cdf634c8740f4f4e6773b3f44785f88d7 WHIRLPOOL 317e8f22c21266f67c9cd56f3755edb66797f1bbf1d48e9282a774ee9294df71872a87ea76e578505d6d932c8c210ddce66ac04cfc897128c16afb40f8bd34a9
 AUX inkscape-0.48.4-python2.patch 439 SHA256 28fdc6e28f6c7bf0dab4144c4ac2ddbf5c038494906361a4656a2ad76de45f81 SHA512 065444bec9d9511a5eec34e3646bc34dd05f1d64eb4405fc28c47e9d7dc1b702d706b2b8a05593445756d3288c712692d2256fdd46e2b8f0e091253a266d8171 WHIRLPOOL 0f4f2a0c7b961928f8e55e991ef0a08d0f4fcb871ce7df31a5840f9c24d886ceff3e1c2951a186090eacb53e604a757aec9ae2a329b7e76c825475b0aaf09be1
 DIST inkscape-0.48.4.tar.bz2 19712522 SHA256 8741ad8cbb5aa5cee4f234ebc45479cff2479b16d903870693174bdede8a519d SHA512 55954925e74e2c222e7ddb86bf75e9ad17c854d991258fd3a1bf1b2aafe7014418138246a51f9ab9c4444795b03419781517910debd3448ae461f1dd1b5848be WHIRLPOOL 927dafd74c81c41ff794b22ed80fb6b6e8fcb60fc5f5b6d21ce222812cf6e34bcea9d415ee1f663d2685f64c1f89c4f62d8475da143d2763c53406d7b50f4053
-EBUILD inkscape-0.48.4-r1.ebuild 2901 SHA256 819e5d0d783adb36c498f1fa4a7de41bfbf4a925994b2abd29f537c1b0fb4d68 SHA512 0c297e655be5bf165e5eb5f68541d0ce5fe4ef94002d3ebf56e5bf685cfaae615ad6ecf0fdaa276e42f2d81bc67a3a00290c7fe1de2d450f229ce9134178a8af WHIRLPOOL c2cd65ec1adea3b518faa9ccd2d07cdd64f48c9dd074e19a172d513c0eac80f01d14b8ef322ba280e82eddc8a7509f27f5b1dd0dc90fbfe250bab22eb186320f
+EBUILD inkscape-0.48.4-r1.ebuild 2853 SHA256 0fa7373d4f7ced9948aadef8ec4f3d63f6223cdeb329d8a19b10a1174aa70f09 SHA512 4d73fdd3dfb597d9fa8d17e37a296314127a23650dc29b140f04bfcbb59e6389cc2c0f3f9fa6a1eb80ce5e2b9847cebe9e7c54968fbf2acf9ed11170cf1642c0 WHIRLPOOL 569ba776f22f4b7cec4c9932a0aa6b1248b97c9da72f0a9f35d3ca4368b1d66d50963d7103c71b687650796ede8ed502111839aa04fee5c455161eb0d69be56c
 EBUILD inkscape-0.48.4.ebuild 2579 SHA256 d2d9a8687e1d4d5df0fcb4c9bdba7323fc34ed480f3a8c7016a50fbbebd8ab81 SHA512 aeba369b32633ae8db9c68b833879ca1c0850cd2b227f7807f667c9df009d6e89b04fa97f3c934ed41ef932939341520c1bdcbbd7015ccd60ecbf48bede6877b WHIRLPOOL 8b98a96a6fd6ad8698952550e4076a889601f4405d4028b79ca27677551085b2cde45e44fd45d33ad5287a32e81f8005dfc28aedff50d65c9c90e79eb3104124
-MISC ChangeLog 27903 SHA256 8e0b95402b13b201c4ab172e8aa3b304aa4eebfbd6d8e985f35d1eb104aa460b SHA512 80ec4988bd3c763f050837ff254e9c194fb8e6d2e506d3128f7aa8122c835d466b78120cb955002360baf5266ba6891f8dec7c8f6b75806ef5ca65cbbbcd98e5 WHIRLPOOL 22bcb5313baa9fe49a0acc1129d99d979f2c7eee30176522248206529dfc288148e213278ef67df3819f63bc33f0fa93d797d43ecf4793b99c49939d2d1b4b3f
+MISC ChangeLog 28059 SHA256 34e1e3bd7a65610ecf24f88f503376f4c8354dcc6cca0a3bdfacd2a16b3dfc63 SHA512 be8986c21810fff96e158527e8835ea03156fe57254a012f0c2d27549bb500a83ab942f91ec726a4d56d4be0bd82746812b2ae9466e3f96322bac91ea51628bd WHIRLPOOL 8b383c1a20f0ceecd01ef695686fa4768922ee9929bd823e9fbc3d61c449b6eb0940a2d10e31bbd8f61aaaca90808f933927570de1b7323846911c00d4ff3312
 MISC metadata.xml 354 SHA256 705fec37c8550d17c1ef9260c24a45843351908700c9fe3eb1d652e4a601e007 SHA512 e8798a3aa2a76aed27f2b7124792d7b4972300146b7cfec3e8e86c42196e8746f63a45a64c12161d1c2b2f4bd211d43eedbb29738277cd319d899dd156089bd3 WHIRLPOOL c1d998bc9e5fdadaaf70bd0f8cf2e7b41a0495f73a1d6ff0c55d1c006b11d263a2fa1c405cf5eacd0a490e6300578a126303ce47dcbc844a362b7e07ee506608
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRgRvRAAoJEFpvPKfnPDWzhLsH/iAMaQhVHLFhOMpWyURpe1hf
-7rSY1Anx3A2hqQimQMesRBdkTTcBY9CKaQsz+KFvwK6Nu5kzOYGW4dPZRvErfkaa
-T29K1mU+AorNnOguyhRgF9b+ibrYlbsWdbW5C9VVPvt9XAZsb2YLEkcm7KetTK8y
-b0lWYbcz6Ydmwhii5JNc8p6ub3KLvOR18Ae/i7/X7mRU6YuT0FD1fDAR0/urz1Lz
-UrMLHaNv1nCcY8R9zJRDSNS8rP29AIJMwr2B9deXRGVMtGZhBG5OiODuUjK0vrHJ
-B6OFqngaRn0V4y1Sl6rmTmZMlDHJedfyDi5bRnxMyW9Pc7lQZSQlkmJRBaj/ixI=
-=EeUt
+iQEcBAEBCAAGBQJRhDqIAAoJEEqz6FtPBkyjFMcH/i76EdRxdF3oAU86p/ilDYu1
+HpvTHbVD+zm8ND0c5QBm1m59vhgYeb/lUGKRLGa1iZzgO+Ddhhhowxoh7ApBfZkv
+6CR1wIFHFcsDXWJ6mK8/7L3O5KenofZXKtPxuySWnbsePOArO/+mQ/A6qsmEH9rD
+yb2uE+ROaZOaIsthmRcxc2mdfSGBxk4Z8ljEPWN7A49b0AfbKsqLwe5HuryPxbDo
+H/wzGjTq24m/rRA5yM/1hezE2U+XgVJ2nfaGYmsphcGFpeSzl/sk3N1vDftyuMg1
+tlzWdj3sCQ+kA63gS0PXFJaE51LMexd1oFmOM05f2h7G1dmF4AExHvgEbusQ8Xk=
+=6Fj5
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild b/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild
index d37a0444e19c..dd8744e950fe 100644
--- a/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild
@@ -1,29 +1,25 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild,v 1.2 2013/05/01 13:42:39 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4-r1.ebuild,v 1.3 2013/05/03 22:30:28 radhermit Exp $
 
 EAPI=5
-
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="xml"
 GCONF_DEBUG=no
 
-PYTHON_COMPAT=( python2_6 python2_7 )
-PYTHON_REQ_USE="xml"
 inherit autotools eutils flag-o-matic gnome2 toolchain-funcs python-single-r1
 
-MY_P="${P/_/}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+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 ~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="
 	${PYTHON_DEPS}
 	>=app-text/poppler-0.12.3-r3[cairo,xpdf-headers(+)]
@@ -57,8 +53,7 @@ COMMON_DEPEND="
 # 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}
+RDEPEND="${COMMON_DEPEND}
 	dev-python/numpy[${PYTHON_USEDEP}]
 	media-gfx/uniconvertor
 	dia? ( app-office/dia )
@@ -71,7 +66,9 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	>=dev-util/intltool-0.29"
 
-DOCS="AUTHORS ChangeLog NEWS README*"
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="test"
 
 src_prepare() {
 	gnome2_src_prepare