gentoo resync : 17.12.2017

16 files changed, 81 insertions, 110 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index b2b2356f4426..aa75e79934a2 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/dia2code/Manifest b/app-office/dia2code/Manifest
index 34dd6840d137..a9e28889fdc6 100644
--- a/app-office/dia2code/Manifest
+++ b/app-office/dia2code/Manifest
@@ -1,5 +1,5 @@
 DIST dia2code-0.8.8.tar.gz 480548 BLAKE2B 9e257c21f5dfb6afdf38024a1a002745fc83bc4e2396d0d048f086d95e8c1ce52f2805f5d83a88db16d15bc3a458706b5725c5385eb50d3b9e587d654fd23a21 SHA512 15dfbad66fc7855f0ccc31cfd32488de13380653dcd72a7a47cfcec60727aea265373da3b829f2bb62c4aade5cb06b0cb884fa29b197545a5268b03c75e717a2
 DIST dia2code-1.0.0.tar.gz 946967 BLAKE2B 48e6c29e9178032d17816726fe2b60c7a87518b898c22f0caec94b31d8cb10e50da4c093f178cad62f8c107bc55c3bbddef692e8608bbb73aed3afb156a2f2be SHA512 6669352e624fddc94aaaa36a30263ad591494d473ca09e662a9de90902e4b4a7a7eb6d3de9b28cf162c63ebeea36f86b33822d510ac87ce97c5f196c761bac85
 EBUILD dia2code-0.8.8.ebuild 486 BLAKE2B b37a255b31523bb1ed07764699a6202c71784962fd1d6886a2cc7b708cc4b4a9aae01d2adee6d35030405bc4a170d4e870b8f39e253601155a9f0b73e7de486c SHA512 20c38596850599b0223b339ffb48ed0071ce0891fe456b705981225c7afc70c77eb5e111be722511656e9f1cf121fb95949a8a43aaa7c2918684a5e54ea1c4a9
-EBUILD dia2code-1.0.0.ebuild 657 BLAKE2B fe4e9ce2b9fc9bb8d924e6656bde544b1b7e81279768515a5fbbf356e6c34a327241c306249254c7e946ba5e759d249f5cbc174037ab9c4775f07aab1e13cc07 SHA512 5eba7af867588c3c401d41a052909d12ca45aa8d4457b504d7a3047aed1ed05697ab37065f0e1e4f1da46ca60b785dad811a55fec16d225b3922071f585b5af1
+EBUILD dia2code-1.0.0.ebuild 656 BLAKE2B e2f459226730660dab6fd836112aa07965723f4c962cd8ca2401138ff87b1f3340f4d02ea6bab5bd8560a36eb43c13875a01d0ed51ef9e5aa6298fb12ad68879 SHA512 aa7744fed71591296d35c86375a4821174aab248afb3b75925332ac0de6a1cf2f7b00262b2e4aefcb64cdbcd4b31e1fe07ba465d9b703e0d5571185fcfbe0314
 MISC metadata.xml 331 BLAKE2B 3ccf3e94cd80861d83db33fb82e6d02be76beea936164b5f132f1904eb43965278b266da1145cdb32b059919dd01f808c8353338651a8d64823de794655cbfe9 SHA512 3c08e8ed607a264bed5a4c299bb433f0b4fb930d3a3272740c300e7e0a5f8d852a7d0fa80ef7f1e7bd1dc44c1b9e85814141d8b8cc31b403a95971b8c5b27494
diff --git a/app-office/dia2code/dia2code-1.0.0.ebuild b/app-office/dia2code/dia2code-1.0.0.ebuild
index 627ca3ef520d..57eafca47928 100644
--- a/app-office/dia2code/dia2code-1.0.0.ebuild
+++ b/app-office/dia2code/dia2code-1.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="${DEPEND}"
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 40ae04d250fc..5c1bf7956c95 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,5 +1,5 @@
 DIST gnumeric-1.12.32.tar.xz 18748772 BLAKE2B 79a8bb74875f9f2177db17849ce380fe6b8baa234d36329b047743369e93196b3539b5487f1a6f42b36f513499d51c34fa408fc99addc44795471ba4886fa91e SHA512 5403fb57fc36a304b9b595d57d4db96579f8b48cb18c074c6d3e3dc4f477286fdb5ef11aeabdd8e495ec697029e4d5e2fce21967c4060dbc19cdabc2fde444fc
 DIST gnumeric-1.12.35.tar.xz 20019316 BLAKE2B 45e0097c37c05dc6295994434b9d181f447a1edca2080f699f5bd73112e794014449fe863890389f6d17370f834e9a79c1f3a1e094d3556de09956a712b63088 SHA512 0781c0d003342653a7cb57d2f23d1222903f18fdce15f4276250aae66239fc5f0da6472d900a59d29b511fbf55b529f7923a68f346752cd242775d52f99aba11
 EBUILD gnumeric-1.12.32.ebuild 1460 BLAKE2B 25cbf9ce0d6929098aa390c5194f8b8daca691dbd2f63ce394a61e4cf0471a3267b3292eddf997d3c1758c14d05602d8a96034dacd029e6944cf34686a27f39a SHA512 05627982d873cfd1e0222c25fb5e4cae36ce40a212ed703d23e3962156b5dde77fd7bd53cc4a038568c91e9876e7f62f665332b0c5becb042e07d4c3e2e74214
-EBUILD gnumeric-1.12.35.ebuild 1483 BLAKE2B 2ff33198fddfd066f178b03d0c23f21586e9d55c86a2c3a499e625bb2c44ff3c5560c8350addbb49832625dd089ef703c8a4227226a5f4f6a4bf5829c76cf68e SHA512 dcd425e7099f5a31816c9634277b2c897287922a185a1d287bcacda22742351a918ff14439b8f6233c91e8958d6fa1dd814c405b7d71b80547bb9fa6ffa5f526
+EBUILD gnumeric-1.12.35.ebuild 1482 BLAKE2B 097d1efaeb3472faa3f6f70a9ae8f7e53be34839cfd3fadbb981f9fb1f7b01720741694681d9f8ba8cb1c4f76646f22f73ef2908b251ee535b678f65c20b0489 SHA512 6a654401f754d4db0bf646ba1102c0995718e4e296dd4cc300c38fcacb72041cbc178909c1e5cd34091c6602eea8fedc8d8c67c9acb08df63249009fd49a6171
 MISC metadata.xml 465 BLAKE2B c246609f5d6b20c968faeb36a0c6e33df41ae8a373360ed003541fdf816ff9399f62ababfc4aea5c557bcf9dac83a71357ce9e789ca08d94e83cdeda83aaa275 SHA512 753783aee82021a573093a0ecb7807bdf56d037032fb1afa5559db44b1d06f72bdf9aedfead48cae9917d78aaa7c39d19e528946ef45b51fd6cf5357b9b020fa
diff --git a/app-office/gnumeric/gnumeric-1.12.35.ebuild b/app-office/gnumeric/gnumeric-1.12.35.ebuild
index 92460cb5f467..be0606620be3 100644
--- a/app-office/gnumeric/gnumeric-1.12.35.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.35.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnumeric.org/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 IUSE="+introspection libgda perl python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index e5f9bcf6eb41..36fc4d79afcc 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -22,6 +22,6 @@ DIST x86-debug-libreoffice-kde-5.4.2.2-r1.xd3 328224707 BLAKE2B be0e44514784a79d
 DIST x86-debug-libreoffice-kde-5.4.2.2.xd3 314850500 BLAKE2B b7b6e3b03e99f7fc44452b57d8eebf254bcc0b2d9cb40e248dd07399684dd54f821fd8b9356c0e12d650a0f9ac49c96acbcc319456764642f556770716a1c620 SHA512 218c51994cf8c27e3a20d1c88443b7cdb4501263342f01b4bcb555bad1b36cf05ec9b0def4b14e5262654819d17ce77dbbc642d4e646b46a3b2b72271b4e9dbc
 DIST x86-debug-libreoffice-kde-java-5.4.2.2-r1.xd3 532241334 BLAKE2B 50a0a344a6458d6773ee9590122ee3e0ba5debdbd1e67e73ec08e4a68969962ba9e5a42c223ed6ed3d58d4d067c80925a2e551f1accb78cb468c2e5b158a6944 SHA512 19df982e8642f068c8147bdf82b37ffc5b2b95b9070a87dd97ffab8ae054ae2c842f83961620571d0485a6455c576920af62eeec197539f6855d1b6d1613f52a
 DIST x86-debug-libreoffice-kde-java-5.4.2.2.xd3 518297724 BLAKE2B 580d482859c27ae57fcde8605561b0e1315f942853b9e3dd3b341c03099e8824be879ebd7af90432126050beb8c00d655dcec8e200a433c9064bc2f4dd3e3197 SHA512 e89c17e1cb65c28d4fe2961de12e22321b19456e3562466fdf601a20a0ff22704bf385311fda971892ea25a6d4bc74444ec93e39bc59ce7d95682b08603cd1df
-EBUILD libreoffice-bin-debug-5.4.2.2-r1.ebuild 2679 BLAKE2B 90db6420030ca8f06411b77a7af3c9704e5ee6f66b17e710f2125a199b85233ce5e281d42d76b49318230bb6d75655005cc2f48b5f3d22bc534486e6cc791ed6 SHA512 688d1c23a3aa4cc01bf054c17e0c830e48bdecd5c8c44cf611637c30fcb1f5faffb31f8747a143015a9edc1f81292f4df1d17f9bfc62961b4d54ee4240d4d81d
+EBUILD libreoffice-bin-debug-5.4.2.2-r1.ebuild 2678 BLAKE2B 1e8f25ddb594c05f9e4e496b83fe5d0aae84dc55a13d770200fd72d7be6a0edd3824bff9e651af61c9b96e4a908d7aa9a0f339af3f1cac33c3d8bbd22261cfc3 SHA512 997eb0c415491c844ec8c2028501e9fdb23cabbe4159e74b575ca4c790c8600120afe8cbbbdf96e571195f88621cdabf138b055d7dd3e3f1b0c5dcf15021560b
 EBUILD libreoffice-bin-debug-5.4.2.2.ebuild 2678 BLAKE2B 1e8f25ddb594c05f9e4e496b83fe5d0aae84dc55a13d770200fd72d7be6a0edd3824bff9e651af61c9b96e4a908d7aa9a0f339af3f1cac33c3d8bbd22261cfc3 SHA512 997eb0c415491c844ec8c2028501e9fdb23cabbe4159e74b575ca4c790c8600120afe8cbbbdf96e571195f88621cdabf138b055d7dd3e3f1b0c5dcf15021560b
 MISC metadata.xml 481 BLAKE2B 2b7085b47722f20719ca5e219b52e4334c4819db8c61dcee1446ac28e70cd90a3ac7e1713a4e95a0d3952d931ebcc34b137294b1e17f79cea9f41ec31fb3cd55 SHA512 6c5698440da103c49a6a26c99d3af9ef88f79a74542bca66cc8adad77dd5412760630e5753f163e92cbe58b53c0fd899b9115ca3ae85627bbacdc01c6dd7bb63
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.2.2-r1.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.2.2-r1.ebuild
index 44b0e63cad0d..4ba962662f42 100644
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.2.2-r1.ebuild
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.2.2-r1.ebuild
@@ -46,7 +46,7 @@ SRC_URI="
 IUSE="gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
 
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 5f0eb06cde1b..63b9231f5fa8 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -23,6 +23,6 @@ DIST x86-bin-libreoffice-kde-5.4.2.2-r1.xd3 6268866 BLAKE2B 0870aaafe5d5d205d1ab
 DIST x86-bin-libreoffice-kde-5.4.2.2.xd3 7039660 BLAKE2B 9c6bc3cac15ab322c206292c7e9cf560ef675737ad82bddf58d411069e5c657542bc7d8bbea365caf6f16960b70a4e092400783dfa1d7b50ac1b301a39b654ea SHA512 6e289355170bb7fdb9273902647332a8dff4f4b02e420416eabfcf40b1aca6986adcb7f682ad9d8a89907d90a1090ad8eff3c283f025ae688a1547b653149cdc
 DIST x86-bin-libreoffice-kde-java-5.4.2.2-r1.xd3 22630525 BLAKE2B 744267ac7c1fcc12c818a2a77bae7c2dc07009518712627103952a9e74355cbbb7c99b925340d211ae74e50df267fe8b135cfc88c66e41cbe9ca366acc09d5fe SHA512 580a19d8ac55dcd179daf3a04692d1eed397912202fd11de5003d6a9b445b8e3e2a8a93ed9406b40ef287f8b98b685b0418f72ce5c9874d3a7fba0befa34b807
 DIST x86-bin-libreoffice-kde-java-5.4.2.2.xd3 24919539 BLAKE2B 7da2fcad2eee3d35ad876d988bce486f11721cbe4506069bb782e760ef7b02372f529f4329eb290c603f0c7146a04c711f3facc431028b42b2c8ec655e25de8d SHA512 5c982b7bdd2071c57556e821e46ab58d2ceb3c34a8e45a4e9abc3719917991c5c69d3bb242639fc51654163849f3dc0668620939d082228e048d1236d6ce96fd
-EBUILD libreoffice-bin-5.4.2.2-r1.ebuild 6394 BLAKE2B 2bb295438e41edf641b09ad4873c3b5762c66a46be68aaf90efb6318b2a7358b862944e8a8f91277d134fe079180fe56960405890dcbdb1c8e11983f2e69ac5d SHA512 91fcaa395f19a28fa76248b36c3ca1a306228fae92a70a9a27d47d4ffead5bdc3b411642f2f9b5662f0f9957f769322721aa04f72ff0156cfb34e39e94c5b5e6
+EBUILD libreoffice-bin-5.4.2.2-r1.ebuild 6393 BLAKE2B c5bb2ea55b0df8a91e9b906488f123bd552d946e9b1fb21447cbfa2d1b95e1cee212ed794ff189c5b5af3775435a7805cc48d2d64f72c7657dcb8b6f0d0c1830 SHA512 a54bc65f79ea2d19650eec7cb9bb15dd4f546aea928f597941904f36e286cd379fb15911d766bcf96515e11fa19d0d0fe5f3a96d8913b76a898efae86963b41a
 EBUILD libreoffice-bin-5.4.2.2.ebuild 6412 BLAKE2B 6b614e6784bb1f465803a7bf22547e0d8af203b092b882a503f03acf01e5b303bf1c27f6e609301673d3fa1ff1f6a3863e4e2cefad4be099d168c4e3335877f6 SHA512 cfe89c42af3682d6cfae9d27bc75ba93d69477a8b0ddc77f6d4511a2a9e31d7a9ee299e91627d86bd8cf0de2e7d9c40162f8482bc9547f34cef230749681fbe6
 MISC metadata.xml 510 BLAKE2B 3c08e88fbf4a981a3adde50ee62d59899f24f87b2aee7359bec6c337adde486096de536227d81b1e3eeb2a27e01c08ca1d91db6d9311e0d34211528f63aea23c SHA512 12331dfd1fe409ce5a65bcf1ce8bd2e23f2e789b7009216e987b861fde897b78b16487399338af0e94e9e40da70ba32624251d71de5aae7d5b23891f54a994f0
diff --git a/app-office/libreoffice-bin/libreoffice-bin-5.4.2.2-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-5.4.2.2-r1.ebuild
index 42f0768ecdcb..ebe843be0224 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-5.4.2.2-r1.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-5.4.2.2-r1.ebuild
@@ -54,7 +54,7 @@ SRC_URI="
 IUSE="gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 
 BIN_COMMON_DEPEND="
 	app-text/hunspell:0/1.6
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 6ad8c6f5bbd3..4ded14ee626f 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -7,7 +7,7 @@ DIST lyx-2.2.3.tar.xz 15501856 BLAKE2B 08606f0c18d9cb5891bd7d612361597e3efc7e785
 EBUILD lyx-2.0.8.1-r1.ebuild 4335 BLAKE2B 630b3fbd1d92274043b5a18dd74144f7587460f3df8b4e8e984d4288b1940f9ff2697256598f9028d817b28fd4475a7fbe90d741c25340ae97bb4730412d4b93 SHA512 824bf4865268d7e7594f7f1ec21ad8128602765bc8ae9b4d86ea7ffdb12cd5ac54cc9b61e48e5badb4e5cd388f067afe05b1cc5b5d73b380900e51a5f3339c82
 EBUILD lyx-2.1.5-r1.ebuild 4251 BLAKE2B b09acf66c169593e969fe7b432574a9fa3cd7fdec86a13451de6cbf928e7f8043e2c78bd9421f5d94d0519e2be4f89f8e332a2eb6ce0a06b84ad7b5a4dfcf262 SHA512 a46a099611d5e83fbf7ef35d27c1a2e7f16eb74af8c68a7800a13642b3c8c21365d735fa53d79c934f2233314e9da868ce3364e36d62a7a1b341f7cbe445a18e
 EBUILD lyx-2.2.2-r1.ebuild 4648 BLAKE2B ccf7457c23ae06765069fcb8da5d451c630858359a2798a9d746b412278db5bb563774d60b56c2b1f59f8a65909db97054b2348cb59aed42173118fceb006a5f SHA512 114a72c180d8ec7bb014881ca0d139f20598de34e21eaf1327cb966e4150e4ac0b44f21e502b916ec1cc9101eec4e7538acf90625f2692c1768452b0399c5be7
-EBUILD lyx-2.2.3-r1.ebuild 4551 BLAKE2B d89131d3c81c4a30d60b2381816b6d088aa78c16f49324c925736bf5903c0434917a438aff8d3e7590d3be882968e9d738f820be20cfba7238ef2601783e723e SHA512 e03db42f192dbc6971a02e5e2a0a42dfaf999add8761ecfbb8ef3ef0d8031f0d3d4a22ae039592c359f3249d3f3994bd7ff596ed49f03e87ef8b3386bc40f565
+EBUILD lyx-2.2.3-r1.ebuild 4550 BLAKE2B d5323277ebc540115a633820f38729ec28ab256179c86537b965a06a967d34da0802902da31ce797c0db73c4b6d8bd81be9ec7ded97ea6a5c718b2cf2d95a736 SHA512 e951bbdbfbd13aca1b63492f95188bc0f68ca025fef457b2ea610b571955d0678a8a95ea86c5e7449db4cfcf392c2d017bf9ea9ea6fa7952d18bb91ab56a0140
 EBUILD lyx-2.2.3-r2.ebuild 4520 BLAKE2B a2b67d675bd8e11331e1d3da9034585f475390d9125f47ae820d1caf16ffa9e0c78f985eea9089c51f248e8f6effba75e5e2de8fa009416c3b7cb23807be4c33 SHA512 217b879d325a4c7bdbdfaa581e219fd212ac356284590c2da7a663890e3108fde7f92ed94af49bc161d50b1c34da8840f4ee76c954ab0494151b1e34d5cebb1c
 EBUILD lyx-2.2.3.ebuild 4648 BLAKE2B ccf7457c23ae06765069fcb8da5d451c630858359a2798a9d746b412278db5bb563774d60b56c2b1f59f8a65909db97054b2348cb59aed42173118fceb006a5f SHA512 114a72c180d8ec7bb014881ca0d139f20598de34e21eaf1327cb966e4150e4ac0b44f21e502b916ec1cc9101eec4e7538acf90625f2692c1768452b0399c5be7
 MISC metadata.xml 1876 BLAKE2B 873befa20f6827e2938d5673b4db4bf56d8e501f98a64ce53acd1cfa55a44341fcd9660bd22494244a73e6e7b5a5efcb257916cf0130f4d40c8907aa3f6bb55c SHA512 5d76edc1d253fc60f7eb3f72548685fcc305a1bd51b12d034ef9bd32a74ef53c8b662e5938cc4353d6862f3f6f7d4a52cd4ad03c2d0d906c50e8b118b13d70f7
diff --git a/app-office/lyx/lyx-2.2.3-r1.ebuild b/app-office/lyx/lyx-2.2.3-r1.ebuild
index 65fa670ae72a..80ff95ca3942 100644
--- a/app-office/lyx/lyx-2.2.3-r1.ebuild
+++ b/app-office/lyx/lyx-2.2.3-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${MY_P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x86-macos"
 IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls +qt5 rcs rtf subversion svg"
 
 LANGS="ar ca cs da de el en es eu fi fr gl he hu ia id it ja nb nn pl pt_BR pt_PT ro ru sk sr sv tr uk zh_CN zh_TW"
diff --git a/app-office/pybliographer/Manifest b/app-office/pybliographer/Manifest
index 951e64455562..f941b6f24d96 100644
--- a/app-office/pybliographer/Manifest
+++ b/app-office/pybliographer/Manifest
@@ -1,3 +1,5 @@
 DIST pybliographer-1.2.15.tar.gz 1859977 BLAKE2B e658f76e7f766beec598d0397f10e7613b8a529d7f1eeccda6364bc93bfb33bb5b9e121b9edcd4bc62dd414bca0ffb4684792baf36228522c9d509c59b0f8833 SHA512 f4b3478f60f042ebc7538f044a8c4014fda5202576e3f894b31c79430400e834c59f859f895efa187a89016f4e2625ee6be20751f31843e179fbdfb54ba65330
+DIST pybliographer-1.2.18.tar.gz 2174899 BLAKE2B 4723a01d386a1da6f1de6b730e4e38ef1dedfeb7a72310f40fd7475710fd92236bdb484e102bf93340c8b826ddda0353e143cc741cd6b57acbedd82e40e4181b SHA512 b4a97d7e0aec3b4d7c68169d4d8799911b4da0591e819a67429c45d2b451be6be129214631770cf26f2083a935b55575d35c4f3b11ea74a9b39e55feea376204
 EBUILD pybliographer-1.2.15-r1.ebuild 1760 BLAKE2B 9d16a553f03bd625d09fccafbd2a455d9fa03246c9c6dc9720f876dbb1aff6965dbca9ff747f312c61e994e6117ccdc2a74591b122ea1807517682ac8ca3f7d6 SHA512 9dab7c720e87b3e53a578b996ba5aeb80dcf0801d890ffb3c57d878f8349d603cb7bf9871c0f7642d278b7d0ef89ef4aaa4bc291542c049554c05471972a9b1c
+EBUILD pybliographer-1.2.18.ebuild 1785 BLAKE2B 847e8a96a1504084ef11da467c834be14db9ea92c90eb574c3019222401296b3471ab74fcf08045bb0b16bfefaba0539b032ed2c55771b3f7553edec7397cfe3 SHA512 1b24b5c5fc46d575436dfc644329220a79e798e81fadcca5977336a0d55d02cf73d3a5391093dd47cac7e00e85b99dccd0021b09a35ad04d0b40db7cbe1cb5b3
 MISC metadata.xml 798 BLAKE2B 186a835eadc561bbb17ce369742b5c4d27ce31b3de5ee5d3e2d4ec8c81dee3e96c8c3c86c50fc3d77136738551f74f9346825a754ab4401d6c212057ebd73a76 SHA512 9719f3d541a00da1445210482b9b4f6cfc104b59629b472e50ca2869bdaed6f3a3cf7ff1e28b06806407db368c6c998d46c1e22919f4e4c6cafa9dca1808c2b1
diff --git a/app-office/pybliographer/pybliographer-1.2.18.ebuild b/app-office/pybliographer/pybliographer-1.2.18.ebuild
new file mode 100644
index 000000000000..db2f51439e8d
--- /dev/null
+++ b/app-office/pybliographer/pybliographer-1.2.18.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Pybliographer is a tool for working with bibliographic databases"
+HOMEPAGE="http://pybliographer.org/"
+SRC_URI="mirror://sourceforge/pybliographer/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-text/recode-3.6-r1
+	app-text/rarian
+	dev-libs/glib:2
+	dev-python/gconf-python:2[${PYTHON_USEDEP}]
+	dev-python/gnome-vfs-python:2[${PYTHON_USEDEP}]
+	dev-python/libgnome-python:2[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	>=dev-python/python-bibtex-1.2.5[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+"
+
+src_prepare() {
+	# Workaround for bug 487204.
+	sed -i \
+		-e 's:\$(srcdir)/::g' \
+		tests/Makefile.am || die "sed failed"
+
+	# Install Python modules into site-packages directories.
+	find -name Makefile.am | xargs sed -i \
+		-e "/^pybdir[[:space:]]*=[[:space:]]*/s:\$(datadir):$(python_get_sitedir):" || die "sed failed"
+	sed -i \
+		-e "s:\${datadir}/@PACKAGE@:$(python_get_sitedir)/@PACKAGE@:" \
+		etc/installer.in || die "sed failed"
+	sed -i \
+		-e "s:gladedir = \$(datadir):gladedir = $(python_get_sitedir):" \
+		Pyblio/GnomeUI/glade/Makefile.am || die "sed failed"
+
+	# Fix shebang manually as otherwise python_fix_shebang gets confused
+	sed -i -e 's: @python_path@:/usr/bin/python2:' pybliographer.py || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-depchecks \
+		--disable-update-desktop-database
+}
+
+src_install() {
+	gnome2_src_install
+	python_fix_shebang "${D}"
+}
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index b8e4395700c8..e5c2c42853fe 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,5 +1,3 @@
 DIST skrooge-2.10.5.tar.xz 19309980 BLAKE2B 388e4c4b13acfd1b5f981dc88a9763bc2eb23f7cf8d7cd3f018746964639557768b3654b9161a1b79e1752aaa1335264607bc4475148a755fa5a4b282a36d60d SHA512 02fdee00b430ffba8c05222b87da31f5d2390634e816e141806fc4e3cceab83134ccda9619ff944f70eb704af4d2ee08338bf196ad7dcea8221a05d13e1b4c8e
-DIST skrooge-2.9.0.tar.xz 19310412 BLAKE2B 018db4cfd2a02803e53e484d8add79391bd095115f5e50291cb7c6f8d49c6541651c42b9a0cf2604b5edbba6585da7a85f28a754313b89e2477c504d2d04c62c SHA512 cbcd1e9c00509d6aa387f83f3a245b20c856e936095d8bb16ec7ab6898131a24edda8a4e9ee20323c7d04ab56194b8d4720a77b8d10699e64e8dbacbe9bb868c
-EBUILD skrooge-2.10.5.ebuild 2339 BLAKE2B a41494d9bf2b5d2394dd22fdc3abd306964e74810df5e268c92e60058d34a12467984c4420378b1f071131df5f83bf30cd94b88349d1e649f2cd6b52fef77e2b SHA512 2ab11c195b33ed6420d5598ec62a1b9acd4f9442cfb9409d7530439ed16b0ad6fec195f6d1fbfd4234ce23d8c2c6717308896b704378b045752b5b9e903aaaf4
-EBUILD skrooge-2.9.0.ebuild 2356 BLAKE2B c0cc6d71e62ee3f08759ae4a8ee4aeb81c04dbc0ab0ff5b898da27220c6df06e33c4da313f7ce27d3ec43daa26babd2d803667921cb12856defcc836ee89c7ae SHA512 419bc8eb3f35b8c6e1aedcd0e6c6dbec9359caecc7ec36602204f3d4163909120beee5ca691ae60f215154c17944c92da6177ee4d68752e43618deb168856f00
+EBUILD skrooge-2.10.5.ebuild 2337 BLAKE2B 3cb33aa4cb282d327abbaa59c72dd3cdbac9226e966637d0abc26cbfe0af63c51cbea897283537b2903da5cd061789840de1171326bffa4bc27e4f203b790fe0 SHA512 59f5a8fe2e2c9e6381d5d4b87f298d858e6b9baf3da723592f667e4ea2845c79330537b59159971ad838178a5f3151e85c1dc903dbee89334c253fd15daa39c1
 MISC metadata.xml 400 BLAKE2B b0f7a87e2c2fda05271f731d2c3a6d9a490cf94dd7a742ed60e21aa44964a50bad1218c6ebd9ad16d87a8814f34b70792f7d80bd1e03d80845bd9f1c9292a95c SHA512 50120cec8f5798f6b104c6e1fd05b831f2f280e2f3bab8aa66667a3da1bb351a955b671d16cf4e30b44b0738625424fe4a32bb8a677947d147031964e108dcb0
diff --git a/app-office/skrooge/skrooge-2.10.5.ebuild b/app-office/skrooge/skrooge-2.10.5.ebuild
index 8c3f56006c8e..0d4f231f831c 100644
--- a/app-office/skrooge/skrooge-2.10.5.ebuild
+++ b/app-office/skrooge/skrooge-2.10.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://skrooge.org/"
 [[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="activities designer kde ofx"
 
 COMMON_DEPEND="
diff --git a/app-office/skrooge/skrooge-2.9.0.ebuild b/app-office/skrooge/skrooge-2.9.0.ebuild
deleted file mode 100644
index 816df0558d4c..000000000000
--- a/app-office/skrooge/skrooge-2.9.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
-QT_MINIMAL="5.7.1"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
-HOMEPAGE="https://skrooge.org/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="activities designer kde ofx"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5]
-	dev-db/sqlcipher
-	dev-libs/grantlee:5
-	activities? ( $(add_frameworks_dep kactivities) )
-	kde? ( $(add_frameworks_dep krunner) )
-	ofx? ( dev-libs/libofx )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwindowsystem)
-	dev-libs/libxslt
-	virtual/pkgconfig
-	x11-misc/shared-mime-info
-	designer? (
-		$(add_frameworks_dep kdesignerplugin)
-		$(add_qt_dep designer)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/skrooge:4
-"
-
-REQUIRED_USE="test? ( designer )"
-
-# hangs + installs files
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=$(usex test)
-		-DSKG_DESIGNER=$(usex designer)
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package kde KF5Runner)
-		$(cmake-utils_use_find_package ofx LibOfx)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=ON
-	)
-	kde5_src_test
-}