Move KEYWORDS to another line to avoid bug #399061

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x7194459F

3 files changed, 25 insertions, 21 deletions

diff --git a/sci-geosciences/merkaartor/ChangeLog b/sci-geosciences/merkaartor/ChangeLog
index 5089e7ce6966..7e952e394f7b 100644
--- a/sci-geosciences/merkaartor/ChangeLog
+++ b/sci-geosciences/merkaartor/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-geosciences/merkaartor
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.29 2013/10/23 19:17:27 hanno Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.30 2015/02/28 17:39:49 ago Exp $
+
+  28 Feb 2015; Agostino Sarubbo <ago@gentoo.org> merkaartor-9999.ebuild:
+  Move KEYWORDS to another line to avoid bug #399061
 
   23 Oct 2013; Hanno Boeck <hanno@gentoo.org> metadata.xml:
   remove myself as maintainer, now maintained by sci-geosciences herd
diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index 1a0216fc27fd..25dfec6c909e 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -7,23 +7,23 @@ DIST merkaartor-0.17.2.tar.bz2 7138991 SHA256 425f4facefbf20a3dd1a09ee61ff8a8912
 DIST merkaartor-0.18.1.tar.bz2 5579080 SHA256 3d6a96599815d5f1c8558acd255a413ea47b93ddad8414147d11775a6f21139f SHA512 d45b25ad5a7f19b32ca3e91ad514ef1a8450024bdab9e8c215f60a5ec3fc6332a5cadfcec586a32805c7727d224588b504b01d3023120d55476660a8a394cd45 WHIRLPOOL 23327a7eaa91531a95665fe9ff647712606babf96e3843ef33b94a37f6f7ca6d1cb09576b0b31197badc32e87cfc7ca275a9e3792e57f57dd58fe0509ec1b46d
 EBUILD merkaartor-0.17.2.ebuild 2047 SHA256 0341c9ec8b5100e9d58e34d9b3466c71535cb4cec13cff6d5c9616741e33cc6c SHA512 926fbaadda785b85e65410443fe76a2ac2aca9e21c757ee929c86bcfa07c426a896c87df171f4abd070782f879930eed0b09f09542e1748ccfc0a3b6300bccd3 WHIRLPOOL 48eb0dd530440f8078a0b7e0eb6e316f01acaa498726d76c7f7d8dce755ab91a72fc0a7e9670494906b6b0cac00f3c49f8b676a0a91435f1a9d050a2aef4ec3f
 EBUILD merkaartor-0.18.1.ebuild 2052 SHA256 20e0813953849f572f244e4a959eaa93d5af6996e11373fe0939704fd43534e7 SHA512 e7809b83e1d58bf7279058638c893e8131c1231317bee25d785d88cad20f20841ff5fca5de9e388c68e8e7df58b924e89deba4db4f55228faa383ebfaaad1be9 WHIRLPOOL a33b943fd8d0de714802139efa2e5e35fe36334738d5a3da5fe05e0a9481759277ddc783b993f0150b52253c149303ef77e4d6796324d6622f4901e58e8cc8a1
-EBUILD merkaartor-9999.ebuild 1921 SHA256 5fb22217f7ad2daca71a6075260c54fa227bf074d0dea4aff11d654782c2bb1d SHA512 3e6b40ce3a9e7de12cc7423edb79bb8d13946d7d83ba544be06fa7bcfca6a210a56ba94b6fbbed114ce3d67a025aa9c919955cf0725e497f4331cae059b10324 WHIRLPOOL 8acff4a69d375832d90209753ebe13dc126ae4d84660ad569c88f3ee1b9edd8ae24d3b73cd4bed520cb2d15e8c38e50b01fcfefc0f510f93942dfd393523789c
-MISC ChangeLog 4657 SHA256 c5418c3bce90a7a0c32c3f9bc57a7546e1fdfb54ed0e40edf35d49572e363cfb SHA512 4a1ced903273e87bc91266200f4f5bde4c468ee06e1d829263059eb912b3b9c2fb9075e8c0b636c762c519e281be02403ac28c069d88885efd94e01a2f69cc82 WHIRLPOOL 4c9f8819a0fcccdf2eaca6bfb1eb47ec78e4cd60954fb14db3635b28ba73817d2b7dcb6a8960f8a5a9825d5c41a970468f955593ce3573ebc5c18ce93ad34dcf
+EBUILD merkaartor-9999.ebuild 1918 SHA256 25aacd4c806b94af5506b3152e7869ea4dda23daf9879cf42e3efd7f10542a4e SHA512 92ad2a32e3f738445fd8c40cf08d1f251013d6801671558093aeb496471e028cac9c5df9198039a7b6a791f93ab26df7aa2c792f8b839e7231df438f573202c3 WHIRLPOOL 7157feb2630b362583a2c1c125e3196fa2c46cda830f7e706b49e7733734c5ccda79fd2165142b7cb6e320d8623f6e0e69b6f9b529d28e6ae128ad5704b86cdc
+MISC ChangeLog 4782 SHA256 6774373f06844324b8e607c256bee4b665d1d09d9361833ced3cca888750013a SHA512 6fa659d03803fc4da7d4d8314c680e631aa8795b8759cfaa3eb068b1dd4633269370bef3941b138a29edf2d21a487c2db160ac287111757e59ed6885301e4963 WHIRLPOOL 2e5b47dc000981b25d138348b5dccac38bef46a89bc6a68175f82244f83ca3d837b0a44be66e2628979b571166481037d870efe1a9db18c9ff4a525e85513be0
 MISC metadata.xml 399 SHA256 4931a1fe900747778c950db3daee2b91c42af78d43830edcce65ce721d919944 SHA512 219e60c681822f4a4eab54e509bc35fc325dfeb1921d905779ee6a25f65468f21ac9372c8dbdf518ce50ea03536ed29dfd0c2b7a4e5546f36ec220a059842046 WHIRLPOOL 9f193970d0d33b3e36178466dcb9cb3a6821523f68e483bd5c437f7d7940e01e0b514243639163b9bc7494e23004e7cdf012c5b9f94b1f5d4bd8adfb73e5db61
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJSaCC9AAoJEKWIAHK7tR5C7QMP/iPAk+/xNpHNgjg63kqTldx0
-PesfFRRTSOV6jb9SPEiHxMdnaaemmP93iSEue8f7IfSxm1+8QApGHmIUSJOLEMIJ
-f8Y3cYDIgkVR9pcIIgTZkxuPrdV1BdamuIs3FH1LAflPk/GwEvIrKj/xAflgQj99
-glURcRPgMM51kItYcu7CXS5mpmGl1O1TcDU7U/3mOMIt85oplGLwjU5vPCR/esgF
-3daEVbnBh9AaZR/jLfLd5wzCmW8XA9upVHXdKP70vsP98NEPNdDUQ+oH8Ah+yt8g
-QC/J/ct3ynJAWKDRFZPzV6yfxmcwdAVgI+MckIsIuM6BAtTh3C6j1L0ZvNm3IZT2
-7m5goURKbsPb/uOPjDzZYL1xBgKgrLgK6Hrv7+UNzBgNdA2tJWyP1axg+rcnzqUc
-C/pQL9CS8jkfFjX40Bi4zmI4VwIoFf9jHwNNWSyxJPsDpqxWtT5n7ZaGN51/pp7x
-4Mwq62zac+0Nrwh1pl9aHyHkdy153jpbrl79kc7hbETHIrhVVTP+RgCnX88hpp3N
-1lTipAVKBQP1HOdTp5kSPuZG+Ry0zq8F82w1bRCDskR2ly1GUZL3pVotiL+mLo8Y
-6dXAahSX+wxde+Wp/M1WkZXgQt3k9sa+H22qpSebOabpV6t07hOrv9p++5JVNa46
-L85gxf2C+UCa5p8WmZgy
-=t9lW
+iQIcBAEBCAAGBQJU8f1mAAoJELp701BxlEWfr9oQAJdnv8sT7H6q6ku1S+Mu/6Tk
++I9PqsIDNRL8SrWFzdbFsjlhi4bAxp2i6W7vYcz3xPmYlQLIYlBuYSnany+ERN5F
+ll5x6dNQhmhIzX7Qg134Ruhqc8Mk/4dOoRznDImF681dZcKRW9gB5U2nowuO2vPQ
+h2xxcSduwf2DKEO29KR8mIeqY6E6aicWqPipXD+gVOrDjKMPQXBe5jYeApZRE78/
+JkdRItgZRNltyNYufPsJ3n62LZGCmx7DqP/Qqu/xsmrBu8cLF/fL3GyH2ZzTAVDe
+ypWMnQx1ywlfXHjbTiT2NLxRVVacOLKAlVsBRl63CaPJCxHwv1SbW81/o6n1jBfS
+T3dkWM0ZR3FIOFgGU/8QJhXRiHUspSJ+yOnf3Iqq+JbR7y5nUU4U+fVdDk84rPPA
+b3b760VjKkuvmh2yuQHY6ou9OsnFdnLiVhho7mvQ3IXisN/7hEevuqWgefefetF6
+WMW/cJEZIYfUdBZ9a6hbxr+vypCGO3WyW0QvcBKFkOW8N6cMQpdxTc6GxStX6o4A
+8HWq/izy7gE3xTlfM4gMwjPyOhYyDDMbGDUxXm6R7Jzf6oF4Y6s8bg+kYnyj83Ml
+a9Lm9NFMA1WMqXhjgfEn5sbKkxaxlVHq/Xx8yV/NJUUlJy7GvYQKEJKgjxbd6a9i
+1QFW18x2W9RizFAqxpsl
+=7k+j
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index 7a4843061155..a95d298c94bf 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v 1.14 2013/03/02 23:21:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v 1.15 2015/02/28 17:39:49 ago Exp $
 
 EAPI=4
 
@@ -16,7 +16,8 @@ HOMEPAGE="http://www.merkaartor.be"
 
 LICENSE="GPL-2"
 SLOT="0"
-[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~x86"
 IUSE="debug exif gps nls libproxy webkit"
 
 QT_MINIMAL="4.7.2"