gentoo resync : 17.10.2017

25 files changed, 254 insertions, 1459 deletions

diff --git a/app-text/apvlv/Manifest b/app-text/apvlv/Manifest
index 13cefc568b3f..2119f66e54eb 100644
--- a/app-text/apvlv/Manifest
+++ b/app-text/apvlv/Manifest
@@ -1,7 +1,7 @@
 AUX apvlv-0.1.5-cflags.patch 702 SHA256 00ddf6ecefa9eb34745e7fcb5262c5dcb574221262399897bfab58d1f7c1ca68 SHA512 de7842c8cb402f045240aa50bdf05a13c6e9a4bea099fc8c41f07329b330fbb98f6edc229f0bb78eec65b14ecfffe9240441387717024939c11b9a69cb65919f WHIRLPOOL 9a1b8efb0f11e2ac36e4a8a0f26eafe6e124582264a17d75f9549e73ff36abc64231fb3e3aa1f5cbf8a5cfb5be7ef2f2e0df3730464c60a8fd1686b7fe134553
 AUX apvlv-0.1.5-gcc6.patch 403 SHA256 69f28540aec5b287208d0c5e3755ab2eab483fc5d90316620d0ab523e51ae9f9 SHA512 f838fe6c601765e7d03ba83575aa5ffa2562d90e257832109ebe879b29d67228784c920ff7c9716010f10d2c36f4e873bc2425fc337857c437c6a19e6bd5e5f5 WHIRLPOOL 4e4f0d453f2a8a32ad5ec3b64cff844e713a69a03fd9dbbd56f96c65aeced7de3658862bd3fa5907cfccfcb69854a70a715f7cd58bc265116011fe95762ae7c5
 DIST apvlv-0.1.5.tar.gz 4254177 SHA256 dca98157e63c9fec12d6514751ea26549813dc7b87d838b0003f31a444100a8a SHA512 680b2d6e272cda34b0b9065f5fdf7b917a4e3ed4d54a6e78cb41a60cf43374c687b506d4148d6cecf87912957fbe6bc4c77e9278616fd236e49ade15774e1ccd WHIRLPOOL c254d3ca939b308dc58aadee20e33c5a6bda7495c4521d3433d2eb4a03ab4c9fd25f0589554506b08496f9024ef6d8c8648abc31b5175ad5b181272b9e6cae00
-EBUILD apvlv-0.1.5-r1.ebuild 1246 SHA256 7427829a9780a9067d976873e2e7e43f68b3a2a9b6e522415776f7dd869506c8 SHA512 3f4bd0ed51b4c6de0915398dd22c857b532c227b88c9727acbdb55abb519b07e57e618b37ab4a4ebd34858d89287e2d0df2f98cd4cbcc823fc0596566f2aff16 WHIRLPOOL 113a44916519a48e33595b8446ece40976bb923d28fa1673f831e3c13664c2a715abd7021045561644f384b3fc3f98e3d9778dc2820dfcb6583daf02d74dffd1
+EBUILD apvlv-0.1.5-r1.ebuild 1226 SHA256 b661463fcaa735324eb507671e69f9a16c60d0367372f1522d98b42b9b28ae9c SHA512 0d362abfd0e4e56ccd51e3945392081d35533913cddcfca9aa2556d57041e072b36b7225e54c5093a955e54e7203b20af5149eccb8d8cd34febcb1349d1e0491 WHIRLPOOL f1a1312cedf8bb377dad93311e2324c0fa4e75287a613e92b4ef165a31af2be7216ec4d795da7ad3e487290daef6d5e4395efe1363978c3bf11377ba3e8c0a21
 MISC ChangeLog 4266 SHA256 82ede40b4236937c41188792f2f963b711fa62d3590fd150d36950785ec6cb78 SHA512 649eadec33b956034f0d52bcd65849d0755189c2afd686fa2de270d3ae58bc641c3c2a5cf08155edb8942d20b96b1297a6dff27458d66ce29c9e481c28e28e59 WHIRLPOOL d7c7caa0e3f6652e4264a5e36702b9f852b42a52b1aea156c8c001915ab4db4b459e7b5c9ca67cd52492f81f18fff679fc5392457225b3239835cac96c4e2b18
 MISC ChangeLog-2015 4141 SHA256 10e5079bd4c589f8babea812b86aa3cacd309ec1f8059fcdde374e4dd1dc5013 SHA512 dcdae4e21b8c018fece8339d00e439fb5fd3bc608c6b319f0fd0b8ea16afc4cbd7cfe006168574eab761351f357a34954a38c36652973a26711066a2422381ff WHIRLPOOL fabf9a3f69ce1b34600e801f62fa58795db56b8ff5c7f4b5ec768b3dc6825402245806f6e55ebc38df3c1f814ac90615fef64aeceb6255f7e6f7e8cff3def2f2
 MISC metadata.xml 304 SHA256 77aa46c6213e5819aeb15f8fed88bef1943f6763ca8e565ad324bf5bded2bb07 SHA512 0d01027269ed441b2c29ae9ae560e16eca4a6aed7ed7d0e418887c538673b913988dc3f7c6414982198dfda258044ff7ef3667b8fc53cfd9d4f7773dd5d35030 WHIRLPOOL d08c93455dc2b0fd604bb3876fc58b5566b76689e5d9f8c19ea3797c820758808174c1bca10ff0170facd932e38ee2ea82edeb4f624759e59969564bd7b417b2
diff --git a/app-text/apvlv/apvlv-0.1.5-r1.ebuild b/app-text/apvlv/apvlv-0.1.5-r1.ebuild
index 94e7aec16202..2b1eafbedf1c 100644
--- a/app-text/apvlv/apvlv-0.1.5-r1.ebuild
+++ b/app-text/apvlv/apvlv-0.1.5-r1.ebuild
@@ -23,11 +23,11 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-src_prepare() {
+PATCHES=(
 	# preserve cflags
-	epatch "${FILESDIR}/${PN}-0.1.5-cflags.patch"
-	epatch "${FILESDIR}/${PN}-0.1.5-gcc6.patch"
-}
+	"${FILESDIR}/${PN}-0.1.5-cflags.patch"
+	"${FILESDIR}/${PN}-0.1.5-gcc6.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/app-text/dvipsk/Manifest b/app-text/dvipsk/Manifest
index 1238578c0955..4e2a8b11d911 100644
--- a/app-text/dvipsk/Manifest
+++ b/app-text/dvipsk/Manifest
@@ -13,7 +13,7 @@ DIST texlive-module-dvips.doc-2017.tar.xz 481464 SHA256 25584eec555ca1896798a8ef
 EBUILD dvipsk-5.992_p20120701.ebuild 2000 SHA256 64a5907fc45336683e9689822b8f83e92dd2b0ecc4f0be54c06426bf1028e322 SHA512 7edb3cf94ce4eca71ff6a9c2d8d941b98f03f669577cd734b0bc24bf396ed821c1c7d5b493a97c9fa2f262fe3520fc82061d7b5c22f7f8291cd8aedb771e2fdc WHIRLPOOL 11d65df7c5dd006d669755c1e484ce0380556920fba26a02aa1f19321c4fe5299f233d8f10bf7d9bafffc8dc3305c9b79b13785285281d308ca6a283d2e43a4d
 EBUILD dvipsk-5.995_p20150521.ebuild 1944 SHA256 dd38ac2467b632fd228362d1c5e4044dc21e5c63998f44abc70077690243d9e2 SHA512 a4d3295a5d8fc8d11b0023d37e3f1df30c836fbcede3c2b131f550704f959678238720705dad182f325fd181bce032615afe242f1bbafd9d68cfa1a29984d680 WHIRLPOOL 4ed20e52bf4ea019a6bd98a116044aedbb543b1797aa4cf61cb3d16d5ab189148b9838e5a5a77fa1b4db6be15acecc7c486131fcc8637a66f69ea4807728dfa9
 EBUILD dvipsk-5.996_p20160523.ebuild 1956 SHA256 a099ab580b30784d26741624916aee832050452b8909acc7a51a974f1529cf97 SHA512 b4d84566fb3655cf8a38c28fae357485ed3ae936d569aedd7114200cd65c19e0ba651e2c7a6f0b1410f78c1d2d3132b92b0610953763914446f0d215849f5668 WHIRLPOOL 9fd1e1b323308f1acaf4305aa961530e558bd5eefadfa7480b421d8abe93a4949b3899b62d217182e03bca45cf71c23aefeaf8971d6dd0cd4c7f57044f9ed176
-EBUILD dvipsk-5.997_p20170524.ebuild 1960 SHA256 7bd5adb9339e2e323957123774318bb4d2a78a7b55902738a28835ebe1b49833 SHA512 5aed406660d52fba0376f860bd5caa196e32fc613c3315778d425f5538ed989fbd20642e2f279a6caa98554ea78a3257c6b24f852527860cd677e4e2f5271101 WHIRLPOOL 15b5cf290cd3d2783104338f42c5ff09373e4deefc73e7ca3c67250d9d42ae37ccb71dbc9cc587cb1cc260ff6b08a1f4dbb2fcb8b671925100e3d4937245dc2f
+EBUILD dvipsk-5.997_p20170524.ebuild 1958 SHA256 4a6ed29ff010a34436ce264d67d6eada7c5b4d46a2d50c58d83cf7bd1dcd15c8 SHA512 a12b900957cc16cb9435a83f4464b0d0f1b3dbb26295aa99a1a3fcd63f8b25803a24f68b2b9f2b4738c953f68b98fd2b3663a68bf92af591a442adf9b46f94f4 WHIRLPOOL 37b6296c5cbf62b2e9359f75a0f050cf10cceab484c24315f9f1ca0c12d2643dbfcad36b55cb4bc88106144d7b2d1793f547837ae55693d360c9b1ce3c281eb6
 MISC ChangeLog 3234 SHA256 04501522575352701a56d84e9fbb8f20ba49cf7ca6ca92029853993163128928 SHA512 3c96326697ab1d719f1a2378d67ea99b33f972b2c2951c6bd31a80139daa258e2bbe0ba745dab4aa5e6ff98096d87d1807bcdb0ea00d577b54abf9f38d2206b1 WHIRLPOOL eb77dc386fef29a3ff3cf68eeae69b60d9da8746f21aad414dc56313189ef92381cc3a9b1f5499f9aa02b67d2494756e0fc579cba6cfcc807293a6b35df0d0cb
 MISC ChangeLog-2015 6307 SHA256 5376440432823651cb4d7f7e87d94d8641adaa319354f5ca446a03bb9a5d352d SHA512 f5624f1415c0aeb5a9d9d98b67e7798463314703c88562de52b30d03c88e855ff1c1fc455e24b30766950f0db53624b2efd7e24b21ef2a61876c27a769f7241a WHIRLPOOL 96a31af014bfd267d0754cdca20b197e401ef47b7f61326341094c36a5a465ec099a0e6acbed2fcc2718deadbf991593b32e914c0d66259a8de6d48a764814fa
 MISC metadata.xml 358 SHA256 ff0b9f8887c6df4e625e131a06e1612e53f7d09cb75a12ebe3a4a1fbced282a4 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818 WHIRLPOOL f8f5c4ccbb3bab42abda823707c2e968328aa3422b1ace474a584c170450e7c1e297c637d4a442613639d17e10c665f186d48dcedb37c8ab4e1b0a556257d8b0
diff --git a/app-text/dvipsk/dvipsk-5.997_p20170524.ebuild b/app-text/dvipsk/dvipsk-5.997_p20170524.ebuild
index 92d31990c2d4..188ffedd489a 100644
--- a/app-text/dvipsk/dvipsk-5.997_p20170524.ebuild
+++ b/app-text/dvipsk/dvipsk-5.997_p20170524.ebuild
@@ -28,7 +28,7 @@ SRC_URI="${SRC_URI} ) "
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 DEPEND=">=dev-libs/kpathsea-6.2.1"
diff --git a/app-text/ebook-tools/Manifest b/app-text/ebook-tools/Manifest
index 68c229d2028e..5156739eaa1a 100644
--- a/app-text/ebook-tools/Manifest
+++ b/app-text/ebook-tools/Manifest
@@ -1,5 +1,5 @@
 DIST ebook-tools-0.2.2.tar.gz 46889 SHA256 cbc35996e911144fa62925366ad6a6212d6af2588f1e39075954973bbee627ae SHA512 b4518249835ed7cc672392bf2f8b1c62bc218e41c53663bb26ab34c9e43a99b6b7ae794babdb4bd775e467bb17918703a66ee57c8cf94cb7afc4ba2a7f74816a WHIRLPOOL c9c3a5bd48d1821f2e823538f33ba8cd90ff56ad4d1b6c73a7592b086ef86c617ac64a707b270b5483734a16217640afba4591095bf445ec0e4ef77b8f3e5c8d
-EBUILD ebook-tools-0.2.2-r1.ebuild 687 SHA256 e3ecf06f072feaddcb3d0631a435188638fd5ee4b05929a3ccd47a562856f7fb SHA512 c6b7e37fa21b92a61e5af028efea54f748bc87089a8741eead3ad43845fcb0646efe99cbb74e8e683c30d37d689efb3c899d2674667b4377e08652d177033e65 WHIRLPOOL 16cffe2636ee51471fdcd6ae7d04974c18aa0cb07ad20cd8dd6d3fc8a390f52ac72e6e8b0e184a2f38ace694be9389b565f507434ddcd6a9ed78624a06143f1c
+EBUILD ebook-tools-0.2.2-r1.ebuild 664 SHA256 2437583bac909cf62ef9cb7259acadb629b088f23dfe47e2acdbfa96ce96994a SHA512 01fb340e3630a8ca9fef435155866513c9b025ce80aebb39b0f21bac11153982ec07e18ec80366e3e54bccc0512a300b8a116decb0aacd43c85cc5abe61d1667 WHIRLPOOL a503637fcaee3a89a006d302bdbe8f1e8871f61db3d485e95931b97767cd57976475cce01f8c4324953a0369575161dbf11bc628c444efbe4a78779736373fda
 MISC ChangeLog 3205 SHA256 2afc5416b54c4de13ea604bc888bcb90ebaac54a4353949a9e382ec48ed92b89 SHA512 f2f7cf038847825e5b9e91cd5b48aad3691fd4ded502804ec2f15e8dfb71367b76998b8a35657420d7e066c26d6a6b8238f32a8d6465afbd09e2c3f1d3ef3984 WHIRLPOOL c42d5ab0eae417aa64a92efbc71a127307ec2621f0ff6268f56929432503e9dcea4b28718e192c6bf249291f9ceb67a0ebc34784992c1ed9d1576451cf9a93d1
 MISC ChangeLog-2015 3654 SHA256 4f2573756da7f7bc39cc66593ae90c0440003145cbee3976b44b8d52368d4d46 SHA512 42a8dcd24848db21c6e365ddbb911808f4cd70cb5495d1543b04374c58cc058f1319a710fbdfdcb2b53e1dbde3f4507a10ffaac6f979ff06ac4993789dc059bd WHIRLPOOL 0c3381db6edcd3531618abadc7820118154148078607b8ca4a3fd57ebecba2c300eaf257d19455125b998b5ed66ef23feab9a36187d03d6231aa59890b828034
 MISC metadata.xml 400 SHA256 e8d8e1df0afc4e3af6f0db4c752391f1a21f0c8bc26c2e0842d9eb5ec327d90d SHA512 2ab30e14742c63fc54cc75068b57d1c9fa178d6f57fb03b8b15c5649d4bdf35c5068a132c6ee50fe855a2037af67b5c2fd2229cc97b4f3e89f4eecde6d21885b WHIRLPOOL 959a84a2efade4719d9c6eef91748779c7d8d3cf2fba2fedf51b179dd773c277c697238d5641a67793885b6f41b9bdb53cf6564633c59174832ee47f3437d5cc
diff --git a/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild b/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild
index 0ac6824df5d9..5c913b002dc0 100644
--- a/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild
+++ b/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils multilib
+inherit cmake-utils
 
 DESCRIPTION="Tools for accessing and converting various ebook file formats"
 HOMEPAGE="https://sourceforge.net/projects/ebook-tools"
@@ -22,10 +22,8 @@ RDEPEND="${DEPEND}
 	lit2epub? ( app-text/convertlit	)
 "
 
-DOCS=( INSTALL README TODO )
-
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 
 	use lit2epub || sed -i -e '\|lit2epub|d' -- 'src/tools/CMakeLists.txt' || die
 }
diff --git a/app-text/mpage/Manifest b/app-text/mpage/Manifest
index cf3fd962ab65..090908cd087b 100644
--- a/app-text/mpage/Manifest
+++ b/app-text/mpage/Manifest
@@ -1,9 +1,6 @@
-AUX 01_previous_changes.patch 21005 SHA256 ccba0b10a967c562cc5335477404994471aba2f4559870a689c93f776196504e SHA512 6c59dbc87380f938ca0ee0956d17c00a6d9284414bffd69e457e4ccefd481ab9e3a382ec12adab2e4871b083b2de8ca6045c698a85130d8115e10ba0e61a0e48 WHIRLPOOL 4e48d9d9f734d74f4d63a1641da3aa4987f39d49379bc0c838df1c15d5080526d0bb929c3c9d392562093493531aba3c929ffcba46a0ebde10a123b1d07250af
-AUX 10_bts354935_fix_fontdefs.patch 2348 SHA256 63a780d61e840493f1bb12f62437dd8747d34522a65ce805ba0b6dc1c1453150 SHA512 4d41ba2278e7be9c279b9525de4f72a5f0132fb2830fb2e14c999218d04ced22b388363a340dfc333aa6cf1ec50baf16841f6be9d4f532f46a0fc318b6eac039 WHIRLPOOL 4ace1e22d74c40aec9c8964ad6ea5cf1b8b62c2b16f49bcb99922ffcc1fd5a0fc117f1f4a91e3c74f0ca8b67a648597916686e8846afac91189345aba06c9e99
-AUX 20_bts416573_manpage_fixes.patch 17151 SHA256 07b7b0429e63164b276b5b9b10f8a46f0f460d63183d4151e727e61eea2f4067 SHA512 11be64f9a200b2ec8ce547960da320677e19b8b0c30627b989b879e0369886fe72e75004286aad0def759603239539052478549299ad57fe5f3eb6a40356b7c9 WHIRLPOOL 691c267ba9b7b42e6efc02f14139fbc82b598e589137cd77533fbad468a81fe999f625bed8d122ac4761e8dcadc5b4b7c221687bee7d45fcab3165965b8f85d2
-AUX 30_bts443280_libdir_manpage.patch 741 SHA256 59db3c5e0188ae45ed5b3ecc6c548e4088abdc60267158b4dd37f25e40b15e38 SHA512 2c5efe3bf0e26ffa08085a230b44aaddc7256a8a946c151b7fefde2ccde0b410221d878b5d543c7fc878bc7ccf7c7dcc567d8f9b2de5ed728257951505d66bba WHIRLPOOL 000ea81d8ceef7bd3162706c071c5fe24ea89b30237bada911dc45cd99a604ef5d41e812b9dc5b16104bc90f0cc2625bb3d76abe0167602f8ccf43c1d6be0c89
+DIST mpage-2.5.6-gentoo-patchset.tar.bz2 12853 SHA256 87757a0a0b385b053b4c5a29e907bbe6687e347d5fcf920bc168d3b2ddf46422 SHA512 2bfbe4689e02fb76af58a6db3415227df38e71b45fcc3d563a12f505fab8ea78de0415c9ac6d7c9b873f23a9f65e1c8f708f902965ab10e18b2a217b67cc5f0d WHIRLPOOL f921a780c0abe5f38a7a3773de6167c23e0359a50a5da458a0c826491b47c6990ee3866369b82a59b293ad292ba0306def05618985f376751f34924cacd93813
 DIST mpage-2.5.6.tgz 86748 SHA256 4fe66dfc27f7c4bfbca60ef617f968aa2e6ee877e8921aa968c16a03aa4edc04 SHA512 79a51d0fa08848b22f758e8bc3f57680d33492d261a0061c6cce002c3cb5f129a78221d2af1749c79d4e46385136d9996294499531e60e8fc501f9fd61f8077d WHIRLPOOL 9d7abfd66ba0faf53a18f9dc59d1566d22364f9a7b0593a149cae1d2e781f4c104dfcd984da63081b9276811f9832829d8feab1ad41040070ca8c7378e96f7cf
-EBUILD mpage-2.5.6-r1.ebuild 884 SHA256 36ce34e3e923e7860d4fecf317ba2dc3c6c915c07c8d7f8fffb61ff5ea5672b6 SHA512 6c82b323a350126f1a5aa656053dc143850cf531e52778e5facdfca517516483e781445bbe975705db403380e542527f23d6e7e083ee7593d910986f99971c9c WHIRLPOOL 36135b7f79624a8b84d8226ef46d18129b47fc7884948125e4bd631dddb3e9aa5eb86fca982f06c6faf5f2f53093b815c9735465ed79cdbca3dfcc08bdeab72e
+EBUILD mpage-2.5.6-r1.ebuild 970 SHA256 2ad028bf7f5db589efee389e0aa9f1590041410f4fe277abddc6636b0948f6a9 SHA512 312066f12c7fbfbcf68ec5c3b595a4ce5fa41cb7328be95291aadfa58a0a13e555cb727bc800192be9457ba46bbb55130533b41dadfa0253856ad604aa22f4da WHIRLPOOL 6fb033be116d6b09ed26722c644181eb9bdf050315b836ecd67b9a58fabec42c06930716e5b7f2e64f38ebeb92cd345e5e801be93b6b7c2c23acc7ae6c4467f0
 MISC ChangeLog 2685 SHA256 c88e0c620fcff40cd2be0cae4181c362205093496dc67275b8f02664fe780282 SHA512 904315a52f9abbe7927fb1ff90308d0a9105ce64df924e02c518320aac41c4e461f99857eb2ce3ba197c13b24e153e4902f1a4444ffa98f35d665e0cae61756b WHIRLPOOL f0c37cad102d146c61b927534f2433b0d5d209f218d68b2c7eeae4ae9eaa9e34788aefcdab47a9350e74918881394bd5ab777d55048914ca32f24d5f42810d7b
 MISC ChangeLog-2015 3923 SHA256 927f48d0c50fc74ab9d085b7a54e9428607dec2643b89be01e962339d13bd06f SHA512 66aec295988fbb68d1dc72d279d4e1fca98f7da63b652881305324c3ddea96655daf3430875efb99f481cca21aff7900553c1e46583faf78649373fde2008606 WHIRLPOOL 3f87c61cba58aad7f278a23affaa934aeebb877f12736b4b64f67d748c803aefc015578998168994c3031e6f98eda75aaeafa575160191b80446fc001c69d989
 MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-text/mpage/files/01_previous_changes.patch b/app-text/mpage/files/01_previous_changes.patch
deleted file mode 100644
index 9b3682547e8c..000000000000
--- a/app-text/mpage/files/01_previous_changes.patch
+++ /dev/null
@@ -1,740 +0,0 @@
-Index: mpage-2.5.6/file.c
-===================================================================
---- mpage-2.5.6.orig/file.c	2008-08-11 23:14:20.500638502 +0200
-+++ mpage-2.5.6/file.c	2008-08-11 23:28:25.560795737 +0200
-@@ -363,7 +363,7 @@
-         Debug(DB_STDIN, "%%iswanted: opt_first[i]: %d\n", opt_first[i]);
-         Debug(DB_STDIN, "%%iswanted: opt_alt[i]: %d\n", opt_alt[i]);
-         Debug(DB_STDIN, "%%iswanted: opt_last[i]: %d\n", opt_last[i]);
--        if ((sn >= opt_first[i] && (opt_alt[i] <= 1 || (sn - opt_first[i]) % opt_alt[i] == 0) ) &&
-+        if ((sn >= opt_first[i]) && ((sn - opt_first[i]) % opt_alt[i] == 0) &&
-             (sn <= opt_last[i])) {
-             Debug(DB_STDIN, "%%iswanted: wanted page %d\n", sn);
-             ps_outpages++;
-Index: mpage-2.5.6/mpage.1.in
-===================================================================
---- mpage-2.5.6.orig/mpage.1.in	2008-08-11 23:17:10.154306512 +0200
-+++ mpage-2.5.6/mpage.1.in	2008-08-11 23:27:23.605265090 +0200
-@@ -1,4 +1,4 @@
--.TH MPAGE Local 2008/01/14
-+.TH MPAGE 1 2008/01/14
- 
- .SH NAME
- mpage \- print multiple pages per sheet on PostScript printer
-@@ -417,17 +417,33 @@
- .TP
- .B -t
- Toggle printing on both sides of the paper.
--This will toggle duplex mode of the printer.
-++This option has 3 states: nop, yes, no, which mean:
-+.BR  NOP :
-+ dont do anything on PostScript, so printer default will be used;
-+.BR  YES :
-+ force printer to do duplex;
-+.BR  NO  :
-+force printer not to do it.
-+If there is no -t, then the duplex is NOP. If you put some -t on
-+the command line, the state toggles as "yes,no,yes,no...".
-+So, if your printer is set to print, by default, in duplex mode,
-+you will use "-t -t" on command line to force it to print in non-duplex mode.
- Use this option only if your printer is capable of printing in duplex mode. 
- .RI ( default
--off).
-+NOP).
- 
- .TP
- .B -T
--Toggle tumble of every second pages when printing in duplex mode.
--Use this option only if your printer is capable of printing in duplex mode
--and together with
--.BR -t . 
-+Toggle tumble of every second pages.
-+This option has 3 states: nop, yes, no (with behaviour similar to -t).
-+So, if your printer is set to print, by default, in duplex mode,
-+with tumble on,
-+you will use "-T -T" on command line to print in nontumble mode.
-+Use this option only if your printer is capable of printing in duplex mode.
-+With this version of mpage,
-+you may use this option even if you do not use -t.
-+.RI ( default
-+NOP.)
- 
- .TP
- .B -u
-@@ -546,7 +562,7 @@
- environment variables.
- 
- .SH FILES
--/usr/tmp/mpageXXXXXX
-+/tmp/mpageXXXXXX
- .br
- PREFIX/share/mpage
- 
-Index: mpage-2.5.6/mpage.c
-===================================================================
---- mpage-2.5.6.orig/mpage.c	2008-08-11 23:31:51.044505584 +0200
-+++ mpage-2.5.6/mpage.c	2008-08-11 23:39:12.205645922 +0200
-@@ -44,9 +44,21 @@
-     struct sheet *thesheet;
-     char outcommand[LINESIZE]; /* the command which is the output filter */
- 
-+    char * paper;
-+
-     current_locale = setlocale(LC_ALL,"");
- 
--   
-+#ifdef LIBPAPER
-+    paperinit();
-+    paper = systempapername();
-+    if (!paper)
-+    {
-+      fprintf(stderr,"systempapername() returned NULL! exiting\n");
-+      exit(1);
-+    }
-+    strncpy(opt_page,paper,31);
-+#endif
-+
- #ifdef __EMX__
-     /*
-      * wildcard expansion from emx package (used by OS/2)
-@@ -235,10 +247,10 @@
-     fprintf(outfd, "/mp_stm usertime def\n");
-     fprintf(outfd, "/mp_pgc statusdict begin pagecount end def\n");
-     fprintf(outfd, "statusdict begin /jobname (%s) def end\n", name);
--    if (opt_duplex) {
-+    if (opt_duplex && opt_duplex != 4 ) {
-        fprintf(outfd, "statusdict /setduplexmode known");
-        fprintf(outfd, " { statusdict begin true setduplexmode end } if\n");
--       if (opt_tumble) {
-+       if (opt_tumble && opt_tumble != 4 ) {
-            fprintf(outfd, "statusdict /settumble known ");
-            fprintf(outfd, "{ statusdict begin true settumble end } if\n"); 
-        }
-Index: mpage-2.5.6/mpage.h
-===================================================================
---- mpage-2.5.6.orig/mpage.h	2008-08-11 23:39:40.279245746 +0200
-+++ mpage-2.5.6/mpage.h	2008-08-11 23:45:02.565611800 +0200
-@@ -31,6 +31,10 @@
- #include <limits.h>
- #include <string.h>
- 
-+#ifdef LIBPAPER
-+#include <paper.h>
-+#endif
-+
- #define	VERSION		"2.5.6 Januari 2008"
- 
- #define	TRUE		1
-@@ -125,10 +129,11 @@
- /*
-  * set default page size
-  */
-+#ifndef LIBPAPER
- #if !defined(PAGE_DEF)
- # define PAGE_DEF	"A4"
- #endif
--
-+#endif
- /*
-  * define print spooler types
-  */
-@@ -221,9 +226,6 @@
- extern int ps_height;	/* number of points in the Y direction (11 inches) */
- extern char * media;	/* name of output page media */
- 
--
--extern struct page_desc paper[];
--
- /* array of sheets where pages are ordered for coli ??? */
- extern struct sheet coli[];
- 
-@@ -280,7 +282,11 @@
- extern int opt_width;		/* number of columns to fit on reduced page */
- extern int opt_mp_header;	/* let mpage create a header */
- extern int opt_sheetheader;     /* let mpage create sheetheaders */
-+#ifndef LIBPAPER
- extern char * opt_page;		/* sheets size: a4 or us letter */
-+#else
-+extern char opt_page[];                /* sheets size: a4 or us letter */
-+#endif
- extern int opt_fold;		/* fold long lines */
- extern int opt_outline;		/* print a nice outline around pages */
- extern int opt_verbose;		/* print a count of pages sent to printer */
-Index: mpage-2.5.6/page.c
-===================================================================
---- mpage-2.5.6.orig/page.c	2008-08-11 23:48:28.317336922 +0200
-+++ mpage-2.5.6/page.c	2008-08-11 23:55:46.090284181 +0200
-@@ -21,6 +21,8 @@
- #include "mpage.h"
- #include "string.h"
- 
-+extern struct page_desc paper[];
-+
- #define PAPERSIZE_FILE  "/etc/papersize"
- void
- check_papersize()
-@@ -59,12 +61,24 @@
- void
- set_page()
- {
-+#ifndef LIBPAPER
-     int i = select_pagetype(opt_page);
-  
-     media = paper[i].media;
-     ps_width = paper[i].width;
-     ps_height = paper[i].height;
--
-+#else
-+    struct paper * ps;
-+    ps=paperinfo(opt_page);
-+    if (!ps) {
-+      fprintf(stderr,"%s: unknown page format: %s\n",
-+              MPAGE, opt_page);
-+      exit(1);
-+    }
-+    media = papername(ps);
-+    ps_width = paperpswidth(ps);
-+    ps_height = paperpsheight(ps);
-+#endif
-     return;
- 
- } /* set_page */
-@@ -76,11 +90,21 @@
- {
-     int i = 0;
- 
-+#ifndef LIBPAPER
-     while (paper[i].media && strcasecmp(pt, paper[i].media))
-         i++;
-     if (paper[i].media)
-         opt_page = paper[i].media;
-     else
-+#else
-+    struct paper * ps;
-+
-+    strncpy(opt_page,pt,31);
-+    opt_page[31]='\0';
-+
-+    ps=paperinfo(opt_page);
-+    if (!ps)
-+#endif
-         fprintf(stderr, "%s: ignoring unknown paper type: %s\n",
-                                 MPAGE, pt);
-     return i;
-Index: mpage-2.5.6/FAQ
-===================================================================
---- mpage-2.5.6.orig/FAQ	2008-08-11 23:54:21.317453255 +0200
-+++ mpage-2.5.6/FAQ	2008-08-11 23:55:38.833870662 +0200
-@@ -27,3 +27,14 @@
- 
-     This information is buried in the dvips manual somewhere, but is not easy
-     to find!
-+
-+Using mpage with magicfilter
-+============================
-+Andreas Jellinghaus <aj@debian.org> writes:
-+
-+I'm using mpage with lprng and magicfilter. My local magic filter setup
-+is /usr/sbin/ljet4l-filter, and this line passes all ASCII files to mpage :
-+default                 pipe    /usr/bin/mpage -A -2
-+
-+I don't want to waste paper with ASCII texts. MPage also works for
-+postscript files.
-Index: mpage-2.5.6/README
-===================================================================
---- mpage-2.5.6.orig/README	2008-08-11 23:56:29.352749569 +0200
-+++ mpage-2.5.6/README	2008-08-11 23:07:25.849008850 +0200
-@@ -1,28 +1,3 @@
--
--COPYRIGHT:
--
--Mpage and all the files distributed with mpage are covered by copyright:
--
-- Copyright (c) 1994-2004 Marcel J.E. Mol, The Netherlands
-- Copyright (c) 1988 Mark P. Hahn, Herndon, Virginia
--  
--     Permission is granted to anyone to make or distribute verbatim
--     copies of this document as received, in any medium, provided
--     that this copyright notice is preserved, and that the
--     distributor grants the recipient permission for further
--     redistribution as permitted by this notice.
--
--   marcel@mesa.nl
--   MESA Consulting  B.V.
--   Nootdorp
--   The Netherlands
--   Phone: +31-15-3105252
--   Mobile:+31-6-54724868
--   Fax:   +31-15-3105253
--   email: info@mesa.nl		http://www.mesa.nl   ftp://ftp.mesa.nl
--   
--
--=================================================================
- DESCRIPTION:
- 
- Mpage is a program to reduce and print multiple pages of text per
-@@ -30,54 +5,21 @@
- It also has limited functionality to do the same directly with postscript
- files.
- 
--The following are the files you should have for mpage.
--
--     README                 Notes and descriptions, this file
--     README.OS2             OS/2 port description
--     Copyright              Copyright notice
--     CHANGES                Change history
--     Makefile               The Makefile
--     TODO                   Wish List for changes
--     FAQ                    Useful tips and hints
--     NEWS                   Global changes, User visible changes
--     Mpage.lsm              LSM file for mpage
--     args.c                 Command line and options processing
--     encoding.h             Definition of internal default character encoding
--     encoding.h.CP850       Popular for renaming to encoding.h
--     file.c                 Generic file handling
--     glob.c                 Global variable setup
--     mpage.h                Definitions
--     mpage.c                Main Control
--     page.c                 Page layout routines
--     post.c                 PostScript file processing
--     sample.c               Prints sample page layout pages 
--     text.c                 Text file processing
--     util.c                 Misc utility functions
--     mpage.1                Manual page
-+The following are some of the files you should receive in the Debian
-+package:
- 
-      All.chars              Test file containing all ASCII characters
-      Encodings              Directory with character encoding library files
-      Characters             List of Postscript character encoding names
-      Encoding.format        Description on how to create character encoding
-                             library files
--     gencodes.c             Util program to build All.chars file
--     Test                   Directory with test pages
--
--     OS2                    Directory with simulated lpr for OS/2
-      Contrib                Directory with contributions by others
-      Contrib/mfix           Fix to mpage that makes it work with ArborText
- 
--
--INSTRUCTIONS:
--
--All you should need to do is run make. Actually it is probably better
--to have a look at the Makefile and to check settings like for example PAGESIZE
--to set the default page size (e.g A4 or Letter ...).
--This will create the programs mpage and msample.  Mpage is
--the program to print n-up pages.  Msample prints a sample outline.  I
--used it for debugging the placement of the layout.  It is also handy
--for other layout purposes.  It accepts all the arguments that mpage
--does, but does not print files.
-+Msample prints a sample outline.  I used it for debugging the
-+placement of the layout.  It is also handy for other layout purposes.
-+It accepts all the arguments that mpage does, but does not print
-+files.
- 
- As a quick sample try:
- 
-@@ -87,9 +29,16 @@
- or
- 	"groff  -man mpage.1 | mpage -2"
- 
-+USING ENCODINGS:
- 
--The manual page, mpage.1, formats with UCB or ATT manual macros.
-+Example supplied by Vassilis Virvilis.  To print Greek characters, use
-+the Greek fonts from http://www.csd.uch.gr/~lourakis/genscript/.  Both
-+enscript and a2ps embed the fonts in the generated postscript
-+document. mpage utilizes the printer fonts. Therefore you will have to
-+actually install the font for ghostscript.  To print the Greek
-+characters, use the following command:
- 
-+   mpage -FCourier-ISOLatinGreek -CISO-8859.7 test.txt  > test.ps
- 
- 
- USING MPAGE:
-Index: mpage-2.5.6/args.c
-===================================================================
---- mpage-2.5.6.orig/args.c	2008-08-11 23:57:11.963177801 +0200
-+++ mpage-2.5.6/args.c	2008-08-11 23:07:25.817007026 +0200
-@@ -91,7 +91,11 @@
-                                      UPDOWN : LEFTRIGHT;
-                         break;
-                 case 'A':    /* A4 sized, european paper */
-+#ifndef LIBPAPER
-                         opt_page = "A4"; /* deprecated */
-+#else
-+	       		strcpy(opt_page,"a4");
-+#endif
-                         break;
-                 case 'b':     /* base paper type */
-                         OPTARG();
-@@ -386,17 +390,25 @@
-                 case 'S':
-                         opt_square = 0;
-                         break;
-+// opt_duplex and opt_tumble have 3 possible values:
-+// 4 : do not do anything
-+// 0 : force printer to do it
-+// !0 : force printer not to do it
-                 case 't':
--                        opt_duplex = 1 - opt_duplex;
-+                        opt_duplex = ! opt_duplex;
-                         break;
-                 case 'T':
--                        opt_tumble = 1 - opt_tumble;
-+                        opt_tumble = ! opt_tumble;
-                         break;
-                 case 'u':
-                         check_utf8 = 1 - check_utf8;
-                         break;
-                 case 'U':    /* Letter sized, US paper */
-+#ifndef LIBPAPER
-                         opt_page = "Letter"; /* deprecated */
-+#else
-+	       		strcpy(opt_page,"letter");
-+#endif
-                         break;
-                 case 'v':    /* verbose (print page count) */
-                         opt_verbose = 1 - opt_verbose;
-Index: mpage-2.5.6/glob.c
-===================================================================
---- mpage-2.5.6.orig/glob.c	2008-08-11 23:58:11.934595375 +0200
-+++ mpage-2.5.6/glob.c	2008-08-11 23:07:25.829007710 +0200
-@@ -327,7 +327,11 @@
- int opt_lines         = 0;		/* lines to fit on reduced page */
- int opt_killtrail     = 1;		/* Quit reading input on %%TRailer */
- int opt_width         = 0;	        /* columns to fit on reduced page */
-+#ifndef LIBPAPER
- char * opt_page       = PAGE_DEF;       /* default paper size */
-+#else
-+char opt_page [32]; /* default paper size */
-+#endif
- /* boolean's: set default to 0 or 1 */
- int opt_pr            = 0;		/* if true use pr(1) to format output */
- int opt_mp_header     = 0;              /* let mpage create headers */
-@@ -342,8 +346,12 @@
- int opt_last[MAXJARG];         	  /* print as many as supplied per -j */
- int opt_alt[MAXJARG];             /* by default print all sheets, odd+even per -j*/
- int opt_file          = 1;        /* should each file appera on a new sheet */
--int opt_duplex        = DEFAULT_DUPLEX;  /* duplex mode flag */
--int opt_tumble        = 0;        /* tumble overy second pages */
-+// opt_duplex and opt_tumble have 3 possible values:
-+// 4 , aka NOP : dont do anything on PostScript,so printer default will be used
-+// 0 , aka yes : force printer to do it
-+// !0, aka no  : force printer not to do it
-+int opt_duplex        = 4;        /* duplex mode flag */
-+int opt_tumble        = 4;        /* tumble overy second pages */
- int opt_textbox       = 0;        /* don't normally draw box around text */
- int opt_input         = IN_AUTO;  /* select input file format */
- int opt_encoding      = DEFAULT_ENCODING; /* use default encoding or not */
-@@ -420,10 +428,15 @@
-  -j Print specified sheets: first[-last][%%interval]\n\
-     -j 1-10 does first 10 sheets, -j 1%%2 prints odd ones, -j 2%%2 even ones.\n\
-  -J Set the start of the sheet page count\n\
-- -t Toggle printing both sides of the paper (Duplex mode, %s)\n\
-- -T Toggle tumble of every second pages when printing in duplex mode (off)\n",
--    fontname, opt_tabstop, PAGE_DEF, printprog, printarg,
--    opt_duplex ? "on" : "off"
-++ -t Toggle printing both sides of the paper (NOP,on,off,on...)\n\
-++ -T Toggle tumble of every second pages  (NOP,on,off,on...)\n",
-+    fontname, opt_tabstop,
-+#ifndef LIBPAPER
-+    PAGE_DEF,
-+#else
-+    opt_page,
-+#endif
-+    PAGE_DEF, printprog, printarg
-     );
-     fprintf(stderr, "\n(c) 1993-2005 Marcel Mol, marcel@mesa.nl (MESA Consulting)\n");
- 
-Index: mpage-2.5.6/Contrib/psprint
-===================================================================
---- mpage-2.5.6.orig/Contrib/psprint	2008-08-12 00:01:13.312931539 +0200
-+++ mpage-2.5.6/Contrib/psprint	2008-08-11 23:07:25.825007484 +0200
-@@ -1,10 +1,9 @@
--#!/bin/ksh -
-+#!/bin/sh -
- 
- STDIN_TMP_FILE=/tmp/psprint.$$
- 
- GS=/usr/local/bin/gs
- GSLIB=/usr/local/lib/ghostscript/3.53
--RM=/bin/rm
- #
- # define print command (SYSV or BSD ish)
- # PRINT="lp -or -s"
-@@ -20,7 +19,7 @@
-     ${GSLIB}/quit.ps
- done
- 
--${RM} -f "${STDIN_TMP_FILE}"
-+rm -f "${STDIN_TMP_FILE}"
- 
- exit 0
- 
-Index: mpage-2.5.6/Encodings/ISO-8859.7
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ mpage-2.5.6/Encodings/ISO-8859.7	2008-08-11 23:07:25.853009079 +0200
-@@ -0,0 +1,231 @@
-+%%%% ISO-8859.7 character encoding (I think...)
-+27 255  % first and last encoding
-+027 /florin
-+028 /dagger
-+029 /daggerdbl
-+030 /perthousand
-+031 /trademark
-+032 /space
-+033 /exclam
-+034 /quotedbl
-+035 /numbersign
-+036 /dollar
-+037 /percent
-+038 /ampersand
-+039 /quoteright
-+040 /parenleft
-+041 /parenright
-+042 /asterisk
-+043 /plus
-+044 /comma
-+045 /hyphen
-+046 /period
-+047 /slash
-+048 /zero
-+049 /one
-+050 /two
-+051 /three
-+052 /four
-+053 /five
-+054 /six
-+055 /seven
-+056 /eight
-+057 /nine
-+058 /colon
-+059 /semicolon
-+060 /less
-+061 /equal
-+062 /greater
-+063 /question
-+064 /at
-+065 /A
-+066 /B
-+067 /C
-+068 /D
-+069 /E
-+070 /F
-+071 /G
-+072 /H
-+073 /I
-+074 /J
-+075 /K
-+076 /L
-+077 /M
-+078 /N
-+079 /O
-+080 /P
-+081 /Q
-+082 /R
-+083 /S
-+084 /T
-+085 /U
-+086 /V
-+087 /W
-+088 /X
-+089 /Y
-+090 /Z
-+091 /bracketleft
-+092 /backslash
-+093 /bracketright
-+094 /asciicircum
-+095 /underscore
-+096 /quoteleft
-+097 /a
-+098 /b
-+099 /c
-+100 /d
-+101 /e
-+102 /f
-+103 /g
-+104 /h
-+105 /i
-+106 /j
-+107 /k
-+108 /l
-+109 /m
-+110 /n
-+111 /o
-+112 /p
-+113 /q
-+114 /r
-+115 /s
-+116 /t
-+117 /u
-+118 /v
-+119 /w
-+120 /x
-+121 /y
-+122 /z
-+123 /braceleft
-+124 /bar
-+125 /braceright
-+126 /asciitilde
-+127 /.notdef
-+128 /.notdef
-+129 /.notdef
-+130 /.notdef
-+131 /.notdef
-+132 /.notdef
-+133 /.notdef
-+134 /.notdef
-+135 /.notdef
-+136 /.notdef
-+137 /.notdef
-+138 /.notdef
-+139 /.notdef
-+140 /.notdef
-+141 /.notdef
-+142 /.notdef
-+143 /.notdef
-+144 /.notdef
-+145 /.notdef
-+146 /.notdef
-+147 /.notdef
-+148 /.notdef
-+149 /.notdef
-+150 /.notdef
-+151 /.notdef
-+152 /.notdef
-+153 /.notdef
-+154 /.notdef
-+155 /.notdef      	
-+156 /.notdef
-+157 /.notdef
-+158 /.notdef
-+159 /.notdef      	
-+160 /space
-+161 /quoteleft
-+162 /quoteright
-+163 /sterling     	
-+164 /.notdef
-+165 /.notdef
-+166 /brokenbar
-+167 /section      	
-+168 /dieresis
-+169 /copyright
-+170 /.notdef
-+171 /guillemotleft	
-+172 /logicalnot
-+173 /hyphen
-+174 /.notdef
-+175 /endash       	
-+176 /degree
-+177 /plusminus
-+178 /twosuperior
-+179 /threesuperior	
-+180 /acute
-+181 /dieresisacute
-+182 /afii9936
-+183 /periodcentered	
-+184 /afii9937
-+185 /afii9938
-+186 /afii9939
-+187 /guillemotright	
-+188 /afii9940
-+189 /onehalf
-+190 /afii9941
-+191 /afii9942     	
-+192 /afii9977
-+193 /afii9793
-+194 /afii9794
-+195 /afii9796     	
-+196 /afii9797
-+197 /afii9798
-+198 /afii9801
-+199 /afii9802     	
-+200 /afii9803
-+201 /afii9804
-+202 /afii9805
-+203 /afii9806     	
-+204 /afii9807
-+205 /afii9808
-+206 /afii9809
-+207 /afii9810     	
-+208 /afii9811
-+209 /afii9813
-+210 /.notdef
-+211 /afii9814     	
-+212 /afii9816
-+213 /afii9817
-+214 /afii9818
-+215 /afii9819     	
-+216 /afii9820
-+217 /afii9821
-+218 /afii9943
-+219 /afii9944     	
-+220 /afii9968
-+221 /afii9969
-+222 /afii9970
-+223 /afii9971     	
-+224 /afii9978
-+225 /afii9825
-+226 /afii9826
-+227 /afii9828
-+228 /afii9829
-+229 /afii9830
-+230 /afii9833
-+231 /afii9834
-+232 /afii9835
-+233 /afii9836
-+234 /afii9837
-+235 /afii9838
-+236 /afii9839
-+237 /afii9840
-+238 /afii9841
-+239 /afii9842
-+240 /afii9843
-+241 /afii9845
-+242 /afii9847
-+243 /afii9846
-+244 /afii9848
-+245 /afii9849
-+246 /afii9850
-+247 /afii9851
-+248 /afii9852
-+249 /afii9853
-+250 /afii9975
-+251 /afii9976
-+252 /afii9972
-+253 /afii9973
-+254 /afii9974
-+255 /.notdef
-Index: mpage-2.5.6/Contrib/mfix/mfix.c
-===================================================================
---- mpage-2.5.6.orig/Contrib/mfix/mfix.c	2008-08-12 00:02:40.797917022 +0200
-+++ mpage-2.5.6/Contrib/mfix/mfix.c	2008-08-11 23:07:25.829007710 +0200
-@@ -1,7 +1,7 @@
- #include <stdio.h>
- 
--FILE *in=stdin,*out=stdout;
--char line[200]; line2[200];
-+FILE *in,*out;
-+char line[200], line2[200];
- 
- int
- strcp(st1,st2)
-@@ -15,6 +15,8 @@
- main()
- {
-   int i;
-+  in = stdin;
-+  out = stdout;
-   for(i=0; i<10; i=1)
-   {
-     if (fgets(line,200,in)==NULL) { close(in); close(out); exit(1); }
-@@ -41,4 +43,4 @@
-     fprintf(out,"%s",line);
-   }
- }
--    
-\ No newline at end of file
-+    
diff --git a/app-text/mpage/files/10_bts354935_fix_fontdefs.patch b/app-text/mpage/files/10_bts354935_fix_fontdefs.patch
deleted file mode 100644
index 3749ec5984cf..000000000000
--- a/app-text/mpage/files/10_bts354935_fix_fontdefs.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: mpage-2.5.6/mpage.c
-===================================================================
---- mpage-2.5.6.orig/mpage.c	2008-08-12 00:26:43.344123046 +0200
-+++ mpage-2.5.6/mpage.c	2008-08-12 00:29:55.663082680 +0200
-@@ -345,25 +345,25 @@
-       if (!strncmp (current_locale, "ja_JP", 5)){
- #ifdef KANJI
- #ifdef GOTHIC
--	fprintf(outfd, "/kanj /GothicBBB-Medium-H findfont %d scalefont def\n", fsize - 1);
--	fprintf(outfd, "/han /GothicBBB-Medium.Hankaku findfont %d scalefont def\n", fsize - 1);
-+        fprintf(outfd, "/kanj { /GothicBBB-Medium-H findfont %d scalefont } def\n", fsize - 1);
-+        fprintf(outfd, "/han { /GothicBBB-Medium.Hankaku findfont %d scalefont } def\n", fsize - 1);
- #else
--	fprintf(outfd, "/kanj /Ryumin-Light-H findfont %d scalefont def\n", fsize - 1);
--	fprintf(outfd, "/han /Ryumin-Light.Hankaku findfont %d scalefont def\n", fsize - 1);
-+        fprintf(outfd, "/kanj { /Ryumin-Light-H findfont %d scalefont } def\n", fsize - 1);
-+        fprintf(outfd, "/han { /Ryumin-Light.Hankaku findfont %d scalefont } def\n", fsize - 1);
- #endif
- #endif
- #ifdef GOTHIC
--	fprintf(outfd, "/unijis /GothicBBB-Medium-UniJIS-UTF8-H findfont %d scalefont def\n", fsize - 1);
-+        fprintf(outfd, "/unijis { /GothicBBB-Medium-UniJIS-UTF8-H findfont %d scalefont } def\n", fsize - 1);
- #else
--	fprintf(outfd, "/unijis /Ryumin-Light-UniJIS-UTF8-H findfont %d scalefont def\n", fsize - 1);
-+        fprintf(outfd, "/unijis { /Ryumin-Light-UniJIS-UTF8-H findfont %d scalefont } def\n", fsize - 1);
- #endif
-       }
-       else if (!strncmp (current_locale, "ko_KR", 5))
--	fprintf(outfd, "/uniks /Baekmuk-Batang-UniKS-UTF8-H findfont %d scalefont def\n", fsize - 1);
-+        fprintf(outfd, "/uniks { /Baekmuk-Batang-UniKS-UTF8-H findfont %d scalefont } def\n", fsize - 1);
-       else if (!strncmp (current_locale, "zh_CN", 5))
--	fprintf(outfd, "/unigb /BousungEG-Light-GB-UniGB-UTF8-H findfont %d scalefont def\n", fsize - 1);
-+        fprintf(outfd, "/unigb { /BousungEG-Light-GB-UniGB-UTF8-H findfont %d scalefont } def\n", fsize - 1);
-       else if (!strncmp (current_locale, "zh_TW", 5))
--	fprintf(outfd, "/unicns /ShanHeiSun-Light-UniCNS-UTF8-H findfont %d scalefont def\n", fsize - 1);
-+        fprintf(outfd, "/unicns { /ShanHeiSun-Light-UniCNS-UTF8-H findfont %d scalefont } def\n", fsize - 1);
-     }
- 
- # ifdef DEBUG
diff --git a/app-text/mpage/files/20_bts416573_manpage_fixes.patch b/app-text/mpage/files/20_bts416573_manpage_fixes.patch
deleted file mode 100644
index 3a4df84e4ee6..000000000000
--- a/app-text/mpage/files/20_bts416573_manpage_fixes.patch
+++ /dev/null
@@ -1,628 +0,0 @@
-Index: mpage-2.5.6/mpage.1.in
-===================================================================
---- mpage-2.5.6.orig/mpage.1.in	2008-08-12 19:12:42.274087056 +0200
-+++ mpage-2.5.6/mpage.1.in	2008-08-12 19:14:15.003371396 +0200
-@@ -54,7 +54,7 @@
- 
- 
- .SH DESCRIPTION
--.I mpage
-+.B mpage
- reads plain text files or PostScript documents and prints them on a
- PostScript printer with the text reduced in size so that several
- pages appear on one sheet of paper.
-@@ -63,14 +63,18 @@
- 
- .PP
- The following options are recognized (note that arguments to options may be
--separated from the option by spaces, except for 
-+separated from the option by spaces, except for
- .BR -B ,
- .BR -m ,
- .BR -M ,
- .B -p
- and
- .BR -P ):
--Also when mpage encounters -- as option it will stop parsing arguments
-+Also when
-+.B mpage
-+encounters
-+.B --
-+as option it will stop parsing arguments
- and the remaining arguments are interpreted as filenames.
- 
- .TP
-@@ -84,7 +88,7 @@
- .TP
- .B -4
- Print 4 normal pages per sheet
--.IR (default) .
-+.RI ( default ).
- 
- .TP
- .B -8
-@@ -95,25 +99,29 @@
- Toggle layout of the pages on the sheet so that successively numbered
- pages run down the sheet, as opposed to left to right.
- .RI ( default
--updown) .
-+updown).
- 
- .TP
- .B -A
--This option is deprecated, see \fB-b\fP.
--Prepare output for A4 sized paper.
--For default see 'mpage -x'.
-+This option is deprecated, use
-+.B -bA4
-+instead.
- 
- .TP
--.BI -b papertype
--Prepare output for selected paper type.
-+.BI -b papersize
-+Prepare output for the selected paper type.
- .I Papersize
--can be \fIA3\fP for European A3,
--\fIA4\fP for European A4,
--\fILetter\fP for US Letter or \fILegal\fP for Legal
--sized paper.
--For default see 'mpage -x'.
--To see the list of currently available types, just give the 'mpage -bl'
--or 'mpage -b?' command (Note: mpage exits after finding such option use.)
-+can be \fBA3\fP for European A3,
-+\fBA4\fP for European A4,
-+\fBLetter\fP for US Letter, or \fBLegal\fP for Legal
-+sized paper.  For available types, see option \fB-bl\fP.
-+For the default, see 'mpage \-x'.  This default is taken from the
-+system; see \fBpapersize\fP(5).  If it isn't found, mpage exits
-+with an error.
-+
-+.TP
-+.BR -bl ,\  -b?
-+List the currently available paper types, then exit.
- 
- .TP
- .BR -B [\fI<num>\fR[\fBlrtb\fR]*]
-@@ -121,19 +129,19 @@
- Specify text box margins and line thickness.
- The default is 0 columns (lines) for both left and right (top and bottom)
- margins and 0 line thickness.
--Specifying 
--.B -B 
--solely toggles printing of the box. 
-+Specifying
-+.B -B
-+solely toggles printing of the box.
- .IR l ,
- .IR r ,
- .I t
- or
- .I b
--set the left, right, top or bottom margin respectively to 
-+set the left, right, top or bottom margin respectively to
- .I <num>
- columns (lines).
--Not specifying any of the sides, will set the line thickness when 
--.I <num> 
-+Not specifying any of the sides, will set the line thickness when
-+.I <num>
- is given.
- For example
- .BI -B 1
-@@ -142,7 +150,7 @@
- 
- .TP
- .B -c
--Toggle concatenation off pages from different files on single sheets
-+Toggle concatenation of pages from different files on single sheets
- .RI ( default
- off).
- 
-@@ -166,27 +174,26 @@
- 
- .TP
- .BI -D dateformat
--Set the date format as in 
-+Set the date format as in
- .IR strftime (3)
- to be used in date/time representations (e.g. in headers).
--(Note: to be useful you probably need the \fB-H\fP option.)
-+(Note: to make this useful you probably need the \fB-H\fP option.)
- 
- .TP
- .B -e
--Print 2 normal pages per sheet in duplex mode. Every first 
--and fourth page or on one side and every second and third
-+Print 2 normal pages per sheet in duplex mode: every first
-+and fourth page on one side and every second and third
- on the other side. This is more or less a combination of
--the \fR-O\fP and \fR-E\fP option but then in one pass.
-+the \fR-O\fP and \fR-E\fP options but in one pass.
- 
- .TP
- .B -E
--Print 2 normal pages per sheet. However, this option will print
--every second and third page of every set of four pages.
--This option will ignore
-+Print 2 normal pages per sheet, namely: print only the second and
-+third page of every set of four pages. See also \fB-O\fP. These
-+options override
- .B -a
- and
- .BR -l .
--See also the \fR-O\fP option.
- Using these options double sided prints can be created without
- a duplex printer.
- 
-@@ -194,11 +201,11 @@
- .B -f
- Toggles folding lines longer than page width
- .RI ( default
--off) .
-+off).
- 
- .TP
- .BI -F fontname
--Specify font. 
-+Specify font.
- .RI ( default
- Courier). Check your printer for supported fonts. Note: this has
- almost nothing to do with the fonts used for your X-windows/KDE/Gnome
-@@ -206,13 +213,13 @@
- 
- .TP
- .BI -h header
--This is used only when the 
-+This is used only when the
- .B -p
- or
- .B -H
- switch is used and is passed as the "\fB-h\fI\ header\fR" option to
--.BR pr ( 1 )
--or as the header for 
-+.BR pr (1)
-+or as the header for
- .BR -H .
- 
- .TP
-@@ -220,26 +227,26 @@
- Create header line for each logical page separated from page text by a
- horizontal line. Unless
- .B -h
--is given, the header consist of last file modification time,
-+is given, the header consists of last file modification time,
- filename and page number, all in bold and slightly larger font.
- This option only applies to non-postscript files.
- 
- .TP
- .BI -I indent
--Indent text by 
-+Indent text by
- .I indent
- characters.
- 
- .TP
--.BI -j first\fR[\fI-last\fR][\fI%interval\fR]
-+.BI -j first\fR[ - last\fR][ % interval\fR]
- Print just the selected sheets, specified by a number, starting at 1.
--Here 
-+Here
- .I last
- defaults to the end of data, \fIinterval\fP to 1.
--Several \fB-j\fR options can be given (upto MAXJARGS, default 100)
-+Several \fB-j\fR options can be given (up to MAXJARGS, default 100)
- to create a complex selection of pages.
--Thus \fB-j\fI1\-10\fR selects the first 10 sheets, while
--\fB-j\fI 1%2\fR prints just the odd-numbered sheets and \fB-j\fI 2%2\fR
-+Thus \fB-j1\-10\fR selects the first 10 sheets, while
-+\fB-j\ 1%2\fR prints just the odd-numbered sheets and \fB-j\ 2%2\fR
- prints just the even ones.
- .sp
- You can do double-sided printing, in two passes, as follows.
-@@ -249,7 +256,7 @@
- Print the odd-numbered sheets with
- .IP
- .ti +5
--mpage ... -j 1%2 ...
-+mpage ... \-j 1%2 ...
- .IP
- Note the number of pages it reports.  (Only half this many will really
- be printed).  When printing finishes, if mpage reported an
-@@ -262,7 +269,7 @@
- Now print the even-numbered sheets in reverse order with
- .IP
- .ti +5
--mpage ... -r -j 2%2 ...
-+mpage ... \-r \-j 2%2 ...
- .IP
- hoping no one else reaches the printer before you do.
- 
-@@ -274,70 +281,71 @@
- 
- .TP
- .B -k
--When mpage finds a %%TRailer or %%PSTrailer in the postscript input file
-+When mpage finds a %%Trailer or %%PSTrailer in the postscript input file
- it normally assumes this is the end of the postscript file and stops reading
- the input file. But when the PS file includes EPS files, %%Trailers might
--be anywhere. Using this option ignores the %%TRailer and %%PSTRailer lines.
-+be anywhere. Using this option ignores the %%Trailer and %%PSTrailer lines.
-+
- .TP
- .B -l
--Toggle printing landscape or portrait mode.
--Landscape pages are 55 lines long by 132 characters wide by default. 
--Portrait pages are 66 lines long by 80 characters wide by default.
-+Toggle printing landscape or portrait mode
- .RI ( default
--portrait.) 
-+portrait).
-+Landscape pages are 55 lines long by 132 characters wide by default.
-+Portrait pages are 66 lines long by 80 characters wide by default.
- 
- .TP
- .BI -L lines
- Adjust the page reduction parameters so that
- .I lines
- lines will fit in the space of one page.
--This overrides the default values normally supplied.  (See 
-+This overrides the default values normally supplied.  (See
- .BR -l .)
--If used in conjunction with 
-+If used in conjunction with
- .B -p
- then this value is passed to the
- .BR pr (1)
- as well.
- As a side effect this changes the font size as well (as will the \fB-W\fR
--option.) So while there is an option to change font family, there is no 
-+option.) So while there is an option to change font family, there is no
- explicit option to change font size!
- 
- .TP
- .BR -m [\fI<num>\fR[\fBlrtb\fR]*]
- Specify sheet margin. The default margin is 20 points.
--Only specifying 
--.B -m 
--sets left margin to 40 points. 
-+Only specifying
-+.B -m
-+sets left margin to 40 points.
- .IR l ,
- .IR r ,
- .I t
- or
- .I b
--set left, right, top or bottom margin respectively to 
-+set left, right, top or bottom margin respectively to
- .I <num>
- points.
--Not specifying any of the sides will set all sides when 
--.I <num> 
-+Not specifying any of the sides will set all sides when
-+.I <num>
- is given.
- .I <num>
- defaults to 40 points. For example
- .BI -m 10
- sets all margins to 10 points.
- .BI -m l50tb
--sets left margin to default 40 and top and bottom margin to 50 points.
-+sets left margin to default 40 and top and bottom margins to 50 points.
- .BI -m 50l25bt30r
--set bottom and top margin to 25, left margin to 50 and
-+sets bottom and top margin to 25, left margin to 50 and
- right margin to 30 points.
- Margins can have negative numbers.
- 
- .TP
- .BR -M [\fI<num>\fR[\fBlrtb\fR]*]
--Specify logical page margins. For syntax, see 
-+Specify logical page margins. For syntax, see
- .B -m
- option.
--Defaults are 4 for 
--.B -M 
--solely, and 8 for 
-+Defaults are 4 for
-+.B -M
-+solely, and 8 for
- .IR <num> .
- Margins can be negative.
- This way large white borders
-@@ -351,20 +359,18 @@
- 
- .TP
- .B -O
--Print 2 normal pages per sheet.
--However, this option will print every first and fourth page of every
--set of four pages.
--This option will ignore 
-+Print 2 normal pages per sheet, namely: print only the first and
-+fourth page of every set of four pages. See also \fB-E\fP. These
-+options override
- .B -a
- and
- .BR -l .
--See also the \fR-E\fP option.
- Using these options double sided prints can be created without
- a duplex printer.
- 
- .TP
- .BR -p [\fIprprog\fR]
--Pipe input through 
-+Pipe input through
- .I prprog
- command (including specified options) before printing
- (assumes the input is a text file).
-@@ -373,14 +379,16 @@
- 
- .TP
- .BR -P [\fIprinter\fR]
--Specify the printer to which the PostScript output will be sent
--(e.g.lpr -P\fIprinter\fP). Using
-+Specify the printer to which the PostScript output is sent
-+(e.g. lpr \-P\fIprinter\fP). Using
- .B -P
--with no printer specified will send the PostScript to the default printer
--queue (e.g. lpr). Using -P- will return output to stdout, useful in
--combination with MPAGE environment variable. Without
-+with no printer specified sends the PostScript to the default printer
-+queue (e.g. lpr). Using \fB-P-\fP returns output to stdout, useful in
-+combination with the
-+.B MPAGE
-+environment variable. Without
- .B -P
--output will be send to standard output.
-+output is sent to standard output.
- 
- .TP
- .B -r
-@@ -392,58 +400,65 @@
- .B -R
- Switch to left to right mode, starting first page on left bottom corner.
- This might be useful for landscape postscript files.
--(Note: using 
-+(Note: using
- .B -l
- after
- .B -R
- undoes
- .BR -R ,
--and switches to normal landscape mode.
-+and switches to normal landscape mode.)
- 
- .TP
- .BI -s tabstop
- Set tabstop width (\fIdefault\fP 8 characters).
--Should by >= 2.
-+Should be >= 2.
- 
- .TP
- .B -S
- Accept non-square page reduction.
- By default, pages are shrunk equally in X and Y, even if this wastes some
- space on the sheet.
--With \fB\-S\fP, 
--reduced pages are larger but slightly distorted. (only used when printing
-+With \fB\-S\fP,
-+reduced pages are larger but slightly distorted. (Only used when printing
- postscript files.)
- 
- .TP
- .B -t
- Toggle printing on both sides of the paper.
--+This option has 3 states: nop, yes, no, which mean:
--.BR  NOP :
-- dont do anything on PostScript, so printer default will be used;
--.BR  YES :
-- force printer to do duplex;
--.BR  NO  :
-+This option has 3 states: nop, yes, no, which mean:
-+.RS
-+.TP
-+.BR NOP :
-+don't do anything in PostScript, use the printer default;
-+.TP
-+.BR YES :
-+force printer to do duplex;
-+.TP
-+.BR NO :
- force printer not to do it.
--If there is no -t, then the duplex is NOP. If you put some -t on
-+.HP 0
-+If there is no \fB\-t\fP, then the duplex is NOP. If you put some \-t on
- the command line, the state toggles as "yes,no,yes,no...".
- So, if your printer is set to print, by default, in duplex mode,
--you will use "-t -t" on command line to force it to print in non-duplex mode.
--Use this option only if your printer is capable of printing in duplex mode. 
-+you will use "\-t \-t" on the command line to force it to print in
-+non-duplex mode. Use this option only if your printer is capable of
-+printing in duplex mode.
- .RI ( default
- NOP).
-+.RE
- 
- .TP
- .B -T
- Toggle tumble of every second pages.
--This option has 3 states: nop, yes, no (with behaviour similar to -t).
-+This option has 3 states: nop, yes, no (with behaviour similar to \-t).
- So, if your printer is set to print, by default, in duplex mode,
- with tumble on,
--you will use "-T -T" on command line to print in nontumble mode.
-+you will use "\-T \-T" on command line to print in nontumble mode.
- Use this option only if your printer is capable of printing in duplex mode.
- With this version of mpage,
--you may use this option even if you do not use -t.
-+you may use this option even if you do not use \-t.
- .RI ( default
--NOP.)
-+NOP).
- 
- .TP
- .B -u
-@@ -451,15 +466,15 @@
- 
- .TP
- .B -U
--This option is deprecated, see \fB-b\fP.
--Prepare output for US Letter sized paper.
--For default see 'mpage -x'.
-+This option is deprecated, use
-+.B -bLetter
-+instead.
- 
- .TP
- .B -v
- Toggle printing a count of the number of sheets produced for printing
- .RI ( default
--off.)
-+off).
- 
- .TP
- .B -V
-@@ -467,27 +482,27 @@
- 
- .TP
- .BI -W width
--Adjust the page reduction parameters so that a line with
-+Adjust the page reduction parameters so that a line
- .I width
- characters long will fit in the space of one page.
--This overrides the default values normally supplied.  (See 
-+This overrides the default values normally supplied.  (See
- .BR -l .)
- If used in conjunction with
- .B -p
--then this value is passed to the s
-+then this value is passed to the
- .BR pr (1)
- program as well.
- See also the \fB-L\fP\ option on font sizes.
- 
- .TP
- .B -x
--Force usage display, which also shows current defaults.
-+Print usage information (including current defaults), then exit.
- 
- .TP
--.B -X [header]
-+.BR -X [\fIheader\fR]
- Print header on the left and the page number on the right
- of each physical page (sheet).
--If no header is given, the default is the current filename (note 
-+If no header is given, the default is the current filename (note
- influence of
- .BR -c ),
- the filename of the first file on the page is used.
-@@ -495,12 +510,12 @@
- .TP
- .BI -z printcommand
- Specify command to use to send output to.
--Default is 
--.B lpr 
--(1) for BSD style spooler,
--.B lp
--(1) for SYSV style spooler.
--You can specify command line options, but note 
-+Default is
-+.BR lpr (1)
-+for BSD style spooler,
-+.BR lp (1)
-+for SYSV style spooler.
-+You can specify command line options, but note
- .BR -Z .
- For example \fB-zlp\fR for system V Unix.
- 
-@@ -508,7 +523,7 @@
- .BI -Z printprog_queuename_arg
- Specify what option to use for the "\fB-z\fI\ printcommand\fR" to specify
- a printqueue.
--For example \fB-zlp -Z-d\fR for system V Unix.
-+For example \fB\-zlp \-Z\-d\fR for system V Unix.
- Default is
- .B -P
- for BSD style spooler,
-@@ -518,10 +533,10 @@
- .PP
- 
- .SH ENVIRONMENT
--.I mpage
-+.B mpage
- examines the
- .B PRINTER
--(or 
-+(or
- .B LPDEST
- for SYSV style spooler)
- environment variable to override its default printer.
-@@ -529,18 +544,20 @@
- .PP
- The
- .B MPAGE_LIB
--environment variable can be used to control where the character 
-+environment variable can be used to control where the character
- encoding files (\fB-C\fR) can be found.
- 
- .PP
--.I mpage
-+.B mpage
- also examines the
- .B MPAGE
- environment variable for default option settings.
- Any option or combination of options can be specified in the
- .B MPAGE
- environment variable.
--For example, if MPAGE is set to the string:
-+For example, if
-+.B MPAGE
-+is set to the string:
- .IP
- .B -2oPqms -L60
- .PP
-@@ -550,14 +567,14 @@
- .B "qms"
- (overriding the
- .B PRINTER\fR/\fBLPDEST
--environment variable, if it exists.)
-+environment variable, if it exists).
- In the environment variable, white space is used as an option delimiter,
- and no quoting is recognized.
- 
- .PP
- Any command line options will override both the
- .B PRINTER
--and 
-+and
- .B MPAGE
- environment variables.
- 
-@@ -571,7 +588,7 @@
- Suffers under the burden of far too many switches.
- (But
- .B you
--wanted the choices!) 
-+wanted the choices!)
- .PP
- NULL characters in a postscript input file will cause mpage to crash!
- .PP
-@@ -580,7 +597,7 @@
- Mpage is year 2000 compliant, as long as the underlying operating system is!!!
- 
- .SH VERSION
--Version 2.5.6, Released Januari 2008.
-+Version 2.5.6, Released January 2008.
- .br
- Location:
- .IP
-@@ -588,6 +605,6 @@
- .br
- ftp://ftp.mesa.nl/pub/mpage
- .SH AUTHORS
--Marcel Mol <marcel@mesa.nl> (current maintainer). 
-+Marcel Mol <marcel@mesa.nl> (current maintainer).
- .PP
--Mark P. Hahn (Original author) 
-+Mark P. Hahn (Original author)
diff --git a/app-text/mpage/files/30_bts443280_libdir_manpage.patch b/app-text/mpage/files/30_bts443280_libdir_manpage.patch
deleted file mode 100644
index 9e2e630500e6..000000000000
--- a/app-text/mpage/files/30_bts443280_libdir_manpage.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: mpage-2.5.6/mpage.1.in
-===================================================================
---- mpage-2.5.6.orig/mpage.1.in	2008-08-12 19:40:49.390230323 +0200
-+++ mpage-2.5.6/mpage.1.in	2008-08-12 19:41:08.143299000 +0200
-@@ -157,7 +157,7 @@
- .TP
- .BR -C [\fIencodingfile\fR]
- Specify the character encoding file.
--The file should be in the mpage library directory (\fIPREFIX/share/mpage\fR).
-+The file should be in the mpage library directory (\fIPREFIX/lib/mpage\fR).
- .I Mpage
- has an internal default encoding based on Latin-1 or IBM codepage 850.
- Depending on compile time option this encoding definition is on or not.
-@@ -581,7 +581,7 @@
- .SH FILES
- /tmp/mpageXXXXXX
- .br
--PREFIX/share/mpage
-+PREFIX/lib/mpage
- 
- .SH BUGS
- .PP
diff --git a/app-text/mpage/mpage-2.5.6-r1.ebuild b/app-text/mpage/mpage-2.5.6-r1.ebuild
index 612cf81ab708..0b6a0146109e 100644
--- a/app-text/mpage/mpage-2.5.6-r1.ebuild
+++ b/app-text/mpage/mpage-2.5.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -6,7 +6,8 @@ inherit eutils toolchain-funcs
 
 DESCRIPTION="Many to one page printing utility"
 HOMEPAGE="http://www.mesa.nl/"
-SRC_URI="http://www.mesa.nl/pub/${PN}/${P}.tgz"
+SRC_URI="http://www.mesa.nl/pub/${PN}/${P}.tgz
+	https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
 
 KEYWORDS="amd64 ppc x86"
 LICENSE="freedist"
@@ -18,7 +19,7 @@ src_prepare() {
 		-e '/^CFLAGS/s|=.*| += $(DEFS)|g' \
 		-e 's|$(CFLAGS) -o|$(LDFLAGS) &|g' \
 		|| die "sed Makefile"
-	EPATCH_SOURCE="${FILESDIR}" epatch \
+	EPATCH_SOURCE="${WORKDIR}/${P}-gentoo-patchset" epatch \
 		01_previous_changes.patch 10_bts354935_fix_fontdefs.patch \
 		20_bts416573_manpage_fixes.patch 30_bts443280_libdir_manpage.patch
 }
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index 8a7892e57e64..1458f48afb5f 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -1,7 +1,8 @@
+AUX podofo-0.9.6_pre20170629-openssl-1.1.patch 3527 SHA256 ddbf668ae31baf29993ad107ddb53bb65ffd3d78d3896f150aa84afd4eced472 SHA512 c30e0a8b40e2e93a66d0d100549c567ae0868766aeffe4c9ec97b9755b062f8c9b96725c9692a605eaa8abfed06dec18432289798161ad949de20d45337509ad WHIRLPOOL faa43500fa988f24caa1279951341be0c3f763c6cb5aacf52c52429603a873cd6f246be697c60339b1eb793209506348808b1c5208b2cf68a23d796dc61d1bd8
 DIST podofo-0.9.6_pre20170508.tar.xz 919876 SHA256 6a35e08aa22105eeb6b00078b74791da2d4dc0d86189f795315808428efacd17 SHA512 37d8e844ba5763d06d467e316871436e1a63795d66675677d9775cd1bd311f43b241d58e82213a0342ab69a0f5cd80261aad48c4af29c82f7bcc0c14bd242f10 WHIRLPOOL c0ad8baca1f912929d1b2dd2e783340aeeb50965136dcf2699407cb70ca058e20748ee8024739b913a1e2ddb317c72f5aed6074862c4360d339365764ac9c67a
 DIST podofo-0.9.6_pre20170629.tar.xz 919076 SHA256 439c0bffed19275315075d5b0a2728453e7a8bee4480e1f23bca2ee4b02462d0 SHA512 29b0e28131ca9cadf19e5ec43df1c39e146ad8d35ad9f0bfa2dff1138e3448c3be95c6130ef8a19b7ad927b8e0c5a7890485f120d7f7da85e2b434e4a417d9bc WHIRLPOOL b8ecab404679f48ff611e543d375829a636f4026232a83ff2fe3f3ca42f1a5c2a589641d4c09b92b7b078026a6b4d95b172a764089729086f7001d3a4850b272
-EBUILD podofo-0.9.6_pre20170508-r1.ebuild 4568 SHA256 6448aa71687a02888a1899668eda1c7ad25241002c541a1249b0d3fda6adeddb SHA512 0eadda6a9b55c3ae59c97c05913a16e72ffa8a92a9fd493af559fb2ad6ec47f4a63a38b6234262914ad592c3f0c1638baa500f26d0417efa5f7220238e150cf9 WHIRLPOOL 22b58c5d7ec43342fe196c1a83cc29df91fde63192c6ab1ba66f881bf0eeab99742b56eb29b555074219ad9e8df67a5aaaf1c471889628e38a538cfaeecd639e
-EBUILD podofo-0.9.6_pre20170629.ebuild 4572 SHA256 e7017feda1ec4a493cade2a16c47896c6c315fe44bdf0096baf938df3e8fb6fa SHA512 9674acb8f7c2083d016be5d1a2b13b37260fb1f3af01df35b7348f39b75a521e7e268719ba18045265cc7972152576d3dd964631122c7120bc707ed181c34aea WHIRLPOOL 1d3e37b1fdd14c15f4e0a2dc79ba0d2c65e0bac581afd549584c6db0f7e720a3d2b62e5e1b845ca410b1fc889870194d4fc34dc4686c21fb863f8fd906404b0a
+EBUILD podofo-0.9.6_pre20170508-r1.ebuild 4581 SHA256 02d2c5fb96cdf74592c670203c096dcb61b42dbd68df30690a867e55cc52a0c6 SHA512 abc3b61b00606184996b904475ad9d41d61bbf6e9c301216df47a8c93b8c42f1f03fcd8c200c06e2c9c630105c39546097dc02df153f825aeecc4638a0ae65f3 WHIRLPOOL 8fd37902ee697f806838228815cab9ae3123792da738d71d4d110b0c46e34652ec47c4ebcbc5081644d07e067b1562c2ec59c9ad442f1d3c2bf90cfbca1c483a
+EBUILD podofo-0.9.6_pre20170629.ebuild 4634 SHA256 79f15d586b2de60d65d6082871fd4241528addad6d8f52dd475699dc81bf829d SHA512 6d54f49efac182f9fae94ad4d22b8f10b1b4ac447af4bbf7d7f3a04eb2f951aa4e14623b9b64dd27bf38e65fa0cfd3869b0c6bc6dee896a615a2479c626da657 WHIRLPOOL 7f90b686fc82d70ae9f0f122fd4f982e4976d9e4e435d2d6217709b13803fdcb35b36c14aa5d044700e8091762b784d58e8893cf24bf2950b9fce7d928b4080b
 MISC ChangeLog 2797 SHA256 2bbdfd21d3a55ef07a70dc8cd12541154ae04fbf8730517da21521f516a2cd84 SHA512 65aafc3ae675642aa2fbdeace471764dd39a0f9652fd7d11b7323014442663747c335f0fd69e465b53a10d828df80b9e00cdd96c16d0c3bdd6d907a467e36f19 WHIRLPOOL 58fe360d9c9a798c757b8daaa8e159b2959a94730a0a50b16912585b352290dcc83361848fafc6bffe6bf568a9be42a9cf6a06d86e207f3a557873effb46758b
 MISC ChangeLog-2015 6318 SHA256 5889ccb41f137263065fb570314a65cd47716f1e19ca4b33fa0991376e257b16 SHA512 0e2b938cc3a3890f5e6703db04e0de4e9472ef198dd92c48bff69761f7f9455f91b528c1d5aac0384ed6eb69e0a5c5932b3ec30f3a8c926160a4f26fd2045a89 WHIRLPOOL ced1b9d5d0d16cfafde24523293cc56bbeb8646b1cca1555a2d5d410b80ce41b5c692128d04a212ae9c90e0d102984deaac3006bb453a7b4870e72527bf5c08a
 MISC metadata.xml 509 SHA256 5f3cae4a9d1bc05fdb61e1cdf376a8b21575a5745d04b5ea15d49156dfd0cfdc SHA512 ad2bbc4598d80be1fcd4fdbfe0a08bec65795f23e768762dc02be766d82cf1549b6861bd8e96bd72b468674ab1e36ebbead3464dc647378b72a8679fcf422236 WHIRLPOOL 035d533eece1c3c373dbb817c202b8a7e069d7e96046f0d4d945ca79faaf1d3d61b21cb30f40ce7b6d33acfe3f40cb1233cd32e6144f2b36f6202a5d3a995318
diff --git a/app-text/podofo/files/podofo-0.9.6_pre20170629-openssl-1.1.patch b/app-text/podofo/files/podofo-0.9.6_pre20170629-openssl-1.1.patch
new file mode 100644
index 000000000000..22b1e419312c
--- /dev/null
+++ b/app-text/podofo/files/podofo-0.9.6_pre20170629-openssl-1.1.patch
@@ -0,0 +1,114 @@
+From f5da3b4d9e35a2df272f2f4056c3647454eaea95 Mon Sep 17 00:00:00 2001
+From: Zac Medico <zmedico@gmail.com>
+Date: Sun, 15 Oct 2017 23:04:57 -0700
+Subject: [PATCH] podofosign: fix compile errors with openssl-1.1.0f
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+https://sourceforge.net/p/podofo/mailman/message/36077904/
+
+This fixes the following compile errors with openssl-1.1.0f:
+
+tools/podofosign/podofosign.cpp:877:32: error: ‘OpenSSL_add_all_algorithms’ was not declared in this scope
+     OpenSSL_add_all_algorithms();
+                                ^
+tools/podofosign/podofosign.cpp:878:29: error: ‘ERR_load_crypto_strings’ was not declared in this scope
+     ERR_load_crypto_strings();
+                             ^
+tools/podofosign/podofosign.cpp:1085:22: error: ‘ERR_free_strings’ was not declared in this scope
+     ERR_free_strings();
+                      ^
+
+This patch has been tested on Linux with openssl-1.0.2l and
+openssl-1.1.0f.
+
+Bug: https://bugs.gentoo.org/614756
+---
+ CMakeLists.txt                  | 12 ++++++++++--
+ tools/podofosign/podofosign.cpp |  7 +++++++
+ 2 files changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0c9a2ce..b4f7b3c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -325,6 +325,14 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ FIND_PACKAGE(ZLIB REQUIRED)
+ MESSAGE("Found zlib headers in ${ZLIB_INCLUDE_DIR}, library at ${ZLIB_LIBRARIES}")
+ 
++FIND_PACKAGE(OpenSSL)
++if(OpenSSL_FOUND)
++  SET(PODOFO_HAVE_OPENSSL TRUE)
++  INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIRS})
++  LINK_DIRECTORIES(${OPENSSL_LIBRARIES})
++  MESSAGE(STATUS "Using OpenSSL ${OPENSSL_VERSION}")
++  MESSAGE("Found OpenSSL ${OPENSSL_VERSION} headers in ${OPENSSL_INCLUDE_DIRS}, library at ${OPENSSL_LIBRARIES}")
++ELSE(OpenSSL_FOUND)
+ FIND_PACKAGE(LIBCRYPTO)
+ 
+ IF(LIBCRYPTO_FOUND)
+@@ -334,6 +342,7 @@ IF(LIBCRYPTO_FOUND)
+ ELSE(LIBCRYPTO_FOUND)
+ 	MESSAGE("OpenSSL's libCrypto not found. Encryption support will be disabled")
+ ENDIF(LIBCRYPTO_FOUND)
++ENDIF(OpenSSL_FOUND)
+ 
+ FIND_PACKAGE(LIBIDN)
+ 
+@@ -393,8 +402,6 @@ ENDIF(CppUnit_FOUND)
+ 
+ ENDIF(NOT PODOFO_BUILD_LIB_ONLY)
+ 
+-FIND_PACKAGE(OpenSSL)
+-
+ FIND_PACKAGE(FREETYPE REQUIRED)
+ MESSAGE("Found freetype library at ${FREETYPE_LIBRARIES}, headers ${FREETYPE_INCLUDE_DIR}")
+ 
+@@ -499,6 +506,7 @@ SET(PODOFO_LIB_DEPENDS
+   ${LIBCRYPTO_LDFLAGS}
+   ${LIBCRYPTO_LIBRARIES}
+   ${LIBJPEG_LIBRARIES}
++  ${OPENSSL_LIBRARIES}
+   ${PLATFORM_SYSTEM_LIBRARIES}
+   ${stlport_libraries_if_use_stlport}
+   ${FREETYPE_LIBRARIES}
+diff --git a/tools/podofosign/podofosign.cpp b/tools/podofosign/podofosign.cpp
+index b8f5f61..a7be1e5 100644
+--- a/tools/podofosign/podofosign.cpp
++++ b/tools/podofosign/podofosign.cpp
+@@ -27,6 +27,7 @@
+ #include <openssl/evp.h>
+ #include <openssl/err.h>
+ #include <openssl/pem.h>
++#include <openssl/ssl.h>
+ #include <openssl/x509.h>
+ 
+ #if defined(_WIN64)
+@@ -874,11 +875,15 @@ int main( int argc, char* argv[] )
+         outputfile = NULL;
+     }
+ 
++#ifdef PODOFO_HAVE_OPENSSL_1_1
++    OPENSSL_init_ssl(0, NULL);
++#else
+     OpenSSL_add_all_algorithms();
+     ERR_load_crypto_strings();
+     ERR_load_PEM_strings();
+     ERR_load_ASN1_strings();
+     ERR_load_EVP_strings();
++#endif
+ 
+     X509* cert = NULL;
+     EVP_PKEY* pkey = NULL;
+@@ -1082,7 +1087,9 @@ int main( int argc, char* argv[] )
+         result = e.GetError();
+     }
+ 
++#ifndef PODOFO_HAVE_OPENSSL_1_1
+     ERR_free_strings();
++#endif
+ 
+     if( pSignField )
+         delete pSignField;
+-- 
diff --git a/app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild b/app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild
index 5c1264949294..a75c43638425 100644
--- a/app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild
+++ b/app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild
@@ -113,7 +113,8 @@ src_prepare() {
 			tools/podofocolor/luaconverter.cpp \
 			tools/podofoimpose/planreader_lua.cpp || die
 	fi
-	eapply_user
+
+	cmake-utils_src_prepare
 }
 
 src_configure() {
diff --git a/app-text/podofo/podofo-0.9.6_pre20170629.ebuild b/app-text/podofo/podofo-0.9.6_pre20170629.ebuild
index fad0b2864e29..186555f81920 100644
--- a/app-text/podofo/podofo-0.9.6_pre20170629.ebuild
+++ b/app-text/podofo/podofo-0.9.6_pre20170629.ebuild
@@ -30,8 +30,12 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )"
 
 DOCS="AUTHORS ChangeLog TODO"
+PATCHES=(
+	"${FILESDIR}/${P}-openssl-1.1.patch"
+)
 
 src_prepare() {
+	cmake-utils_src_prepare
 	local x sed_args
 
 	# The 0.9.6 ABI is not necessarily stable, so make PODOFO_SOVERSION
@@ -113,7 +117,6 @@ src_prepare() {
 			tools/podofocolor/luaconverter.cpp \
 			tools/podofoimpose/planreader_lua.cpp || die
 	fi
-	eapply_user
 }
 
 src_configure() {
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 2a5789c56e95..f2eb7f86686b 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -18,7 +18,7 @@ DIST poppler-0.58.0.tar.xz 1710412 SHA256 0e42e46419ae54b02d9f2b527c6475b6011d15
 DIST poppler-0.59.0.tar.xz 1712004 SHA256 a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641 SHA512 23777922dc95feee2a4459281081b37e124a39fc25cd00c2c3fc206f5484c13eb9ac5317f674fbbcb51e384f9a53e38b4cacbf1426c68d2bae21a7cefbc48a0e WHIRLPOOL 82ec203c17e2b2544cc0ac12d0b22bb051abf776114d17e1548f47d5e38ff289dee2e9c4b27dc16e3953b6f5b5ff0e0eeecfba73561dbc396ee0db7c5a4847e2
 DIST poppler-0.60.1.tar.xz 1432712 SHA256 19f185e05c3b59b4a1de2cec8ef39f5446035493d17bbed41d02fb9a77c8a93c SHA512 db73524b7413dddee38d5a049f3926338ee123b8fc4893d80ee9cf5aaae47c8c7b75b112293b156cd375894e548ec68e5fbf4af305e77b43bc3868ad1c966cdc WHIRLPOOL fe1fe7a3f0c0bac57c7503ad183fe2e8e2f0378c4dedc0dadbc6dcfaeaf8044bf387256742a970af5ed9e2704e42c35e996957e765eeff1aca4bedcc427ae6a7
 EBUILD poppler-0.45.0.ebuild 4108 SHA256 fb29a6d15775c6029bcd3d2796bb43eac7120e3ac7304ac815714b24c758c903 SHA512 d0baeb8e0db1b7e0faf183b4913457d77a742981814a06cd1f75644b7238cf9f06fceccb9cf1c40f1e56a79a215dc2aab80da099f89fd300106ed383c877253f WHIRLPOOL c82e97dc8ea77ea41d9a224d734abb2a8b1137a6a49f860a8f782c9108bb7c7257338c60734c908009ce1b9b7e64ece124307b3766a67741330e5cdafc96c2eb
-EBUILD poppler-0.57.0.ebuild 3860 SHA256 b8f3c78392de5cbf6e992eca3b12fda183563aba3865f22208d0aa94a73815dc SHA512 41b0f7e8d15f0b6c73f94511eaefc8f40095c999b5b85424abb1d76390c886c4b29d212bde9e87038977be43c63344c38a486d78d7c9ece9ddad9da12f38febd WHIRLPOOL b68a29c70a5eaf6dd7955a983943a05597ed6e38387dc0c6abf84260bff8b547574e47c18b3c918380b654ce4cab42ffaca7db358f13a7a7edeadc709b3b2523
+EBUILD poppler-0.57.0.ebuild 3859 SHA256 5de3a27563f487f02d5afa311d8b5e3e06e28792bd3493a254f846804ad2625c SHA512 2ea74b06f47370358281b76ab2327b5ed09c1b63927d37317c2dbdc23492c53e2a110efd4833f1c0ab6a35948723c73b73be1f0574a4f455b7081e01e4950b01 WHIRLPOOL a93840b496b669a62e92f9bd982e37120f8e433251801e2335bc23320294b29c231a78f338185de992f2ec25b27fe73edd84bbbf86a71b22336a512d69daba44
 EBUILD poppler-0.58.0.ebuild 3866 SHA256 15b2567ab3f0406649403383c4ed72f8efa4a56a12fa8953dfc2881202782d2a SHA512 bc922423d817ad927ec5c25ec8504c187fd88a634fe03cf7b92d9c75342db7c92f65a1d37dbb134876d73b3f5a6261adc87b31639f642bf634682472b2a85218 WHIRLPOOL cb2c8b25c56519c3f8491084950d5f62205756078fc810e9e920bfe5f884e9abb15e4d0d1eee204699dd3701c8db3021ace8d6ddc21c2a42930d6a990056e59d
 EBUILD poppler-0.59.0.ebuild 3866 SHA256 025009ab5401a66987c0212a6db8e217ad30e0dbc71ef3a428bcee0fde6daaf7 SHA512 c888b97b35099c864d93f34cadec29db3d705648ecb36ec0d21622dbc58e2851eb59a0e32edf86f695b167ec9d89e008aaf4cc2ddfa1e5d702b79f635d667a70 WHIRLPOOL e4cebc30bd49442c22bd83a9c83da6911a9c6923ff42cb0b990831392ed29c33212d17ab8aabaf3a07e4458c0d1b31c9d223a0c99b75186f58a31d634255536f
 EBUILD poppler-0.60.1.ebuild 3861 SHA256 a1c0de6efb508cad5181ddf6fff049677198ec917c8d609b8cfe0ab8d554f651 SHA512 973c61d28678966e7e3282121d0edf27a94680710fafbe3eae8c8a20a2edad72621a4b1ed8831f22fb3c527d85b6f800edb9ec17847b252abdda6e33b88585bb WHIRLPOOL da25c7257a4538fbed96fc656fbae8cd1663ceacac243cb8b8974ccca625598349bcab3bf05583c57d0b01297cb12ece6128eef94d9e8cfe8ae10da6b8f71dcb
diff --git a/app-text/poppler/poppler-0.57.0.ebuild b/app-text/poppler/poppler-0.57.0.ebuild
index 468914589979..5af4d3454381 100644
--- a/app-text/poppler/poppler-0.57.0.ebuild
+++ b/app-text/poppler/poppler-0.57.0.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/68"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/ps2pkm/Manifest b/app-text/ps2pkm/Manifest
index cbd7f27092ca..dfca52602b27 100644
--- a/app-text/ps2pkm/Manifest
+++ b/app-text/ps2pkm/Manifest
@@ -5,7 +5,7 @@ DIST texlive-20170524-source.tar.xz 63483372 SHA256 0161695304e941334dc0b3b5dabc
 EBUILD ps2pkm-1.5_p20120701.ebuild 811 SHA256 a9a38edf3da260c968d7159de6147560b0f7eaa8648c00f598ffd700538881f5 SHA512 0eacc17e678b0ed8d9ba77a5c8e0bc91fa134317cb5dc8393eb91d1ba5653668ec60bfd19a1f5bcf0cb9912f9a1428494c5d5244d9930d13d308a1c288d7c263 WHIRLPOOL de8756e4086391811d6eb51dcab15353bb9c29bfdf420fd4b8104764138b1d6a92c8116fe1fb9493d506c71dd0e2ce6e6b57c4ebc8bda385ac426338b0631320
 EBUILD ps2pkm-1.7_p20150521.ebuild 836 SHA256 b9f0c5401c6578b1d5e4e451c24c287e288726979297a6ca7a7fa79cba9239f8 SHA512 5007f586c9941ae159cbfdc49ebbd0da23f11b81731f5954ff79dcdff700764d15c555173c17b9d4bcfe82727eada7a0d07c98e19a62ce3e2933707c8557cb24 WHIRLPOOL 5fbec21aced12e290b70bbc06019ede429dd9950ece912aa40c35489b4a90e99c6ac3261f061c21d7dd06613c4f6e85adf7b998eb87ccc8fc80f30487238175f
 EBUILD ps2pkm-1.8_p20160523.ebuild 848 SHA256 6b4ce0326314e8c45429b9de84500f6838209b22ea863230047ec56ebf22ed09 SHA512 829b0fa2979bc26a1198bc265b8e5977ccbf6edc2b9834f60ef504318d54c288bc54621f646e5f01313d12fbeee9d4223e9d8d7aae75635e24e3069f422a7659 WHIRLPOOL 443520383546248ca22d57d34c8813e19966170411020211eed40c1db9f22351adabad15b10f6cbbf929124e2150f55690875e06a7eababfa6b47910d33c0431
-EBUILD ps2pkm-1.8_p20170524.ebuild 852 SHA256 9708f1edf6f2f949f8b8cf4aae520d9710c4c6caa8b0ff591005e304b74b3a26 SHA512 07933a28ec584e12a5eaf1581439f7da372f36e014bcf4de0ea4de982feedb1954f23ce83ded7ec3170696aaff7ee8a6bdca445d990e4b981ac6bb01069dce19 WHIRLPOOL b2c885f4fc384f8e6c09933d2dd2cd78ebf2b81e75224bfe1b6db88443ffe9a32b350d3a035603de4c1aa4e5c5ec2004cbc9d4c3a69034c853771b38731e1f76
+EBUILD ps2pkm-1.8_p20170524.ebuild 851 SHA256 ebfdc8f881d8ac9ebfe9def9f75b2115acbdee0217869ddc84ed79b09837dbba SHA512 a0a25e472179a180c4c10078a20a3ba9f09dc4a431e5dc083f29f1fdcca74f26f347e1a75ea2ae09eef4ffecbe16d0c73a8b6a6ea78031579e7aabbc2b204d18 WHIRLPOOL ace3a3090038720e96e30aa6b4c5e875a496af44e9024ac722acb88306c81b80a8de878316a85c88621c4737637994323d43def1140f587996a15c9b45838398
 MISC ChangeLog 3214 SHA256 00bc72f2b1236be16f5b9e896234a7306a9e8cdf10bcd3ad5a178dac8192b45f SHA512 f0e8ad3f90f6fb1ae79239e9a41274df1ed35b6fe2c94e747120c6a6b0b4058ec1ab3419106cb7fc5b9afd5266da97b689469561507d1f253ffd6eddbd3d872b WHIRLPOOL 056d75722aa375c5ed3a5959c274b67d3c590d43f6ec92e35248434d098eed4ac4b476a4ed5a3c27b62eae9704f81e707f72bb2193fd569a5006bb4a28abfa00
 MISC ChangeLog-2015 5705 SHA256 396445523cb61727b5e7916f7484b2e980c24c9117249f6e4d27ee58d36feaf8 SHA512 345fad29bcc1ac94c07234d08c1c78dcb621d929f268b0554ac163e0c9360c5fb0fc8727e0946f826d8bf76aacaf20330bd936f6f22282e28d74e2bd95681d17 WHIRLPOOL a205ef93cf8701175e0cb7543cb51ee489b2ab4d9fad9c33e8462da456b175c4b2e3e098aa70a6884f5b42cf81f147a7ce4ea7ba2671313d380955491c5b3cca
 MISC metadata.xml 358 SHA256 ff0b9f8887c6df4e625e131a06e1612e53f7d09cb75a12ebe3a4a1fbced282a4 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818 WHIRLPOOL f8f5c4ccbb3bab42abda823707c2e968328aa3422b1ace474a584c170450e7c1e297c637d4a442613639d17e10c665f186d48dcedb37c8ab4e1b0a556257d8b0
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20170524.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20170524.ebuild
index 754ea421214e..a928569c1271 100644
--- a/app-text/ps2pkm/ps2pkm-1.8_p20170524.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20170524.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-libs/kpathsea-6.2.1"
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 4591ee64ee9a..66ec38490721 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,10 +1,13 @@
 AUX sigil-0.9.4-proper-gumbo-install.patch 1582 SHA256 fab824cd6ce418ebbfe1fcbdc1b180e5e2071ec63b4a3076401b69272fd83221 SHA512 880a34ffddee86e5e66fe6d0ca12798e29af0a3e554fcde69872f9c6cd9e731e8cc02e6a88acafd0e3d418883c6e9346cefcfd7e0c7aae6f05758b2a667fccb6 WHIRLPOOL 4598f4a6303b1be803d19f9166bf7243cb160cb59528d622c43649b1b43e8e535cec5abd62f6cde82630d0c1ee829db83dbd6c712ac6d0963063eb092d3ef052
+AUX sigil-0.9.8-proper-gumbo-install.patch 1351 SHA256 9ea0e9b53997481595daa3873ed11d4131eccddf4aeef783e1906dabf95a4926 SHA512 743250a34b257ca7619b53f4373efed48867f9a059db378ee3d8192e4cc73861ba8eb490b7a72a96ee923b034922eb0224a0ef963d455bdbc1cf6f4425881f89 WHIRLPOOL a9e321582c939e32500d32e187b0b56de20b87cf2d023f883b139feecd0e88f12d88e0526df1721f52cfc2724672bc44a4c82a8ee0aaf61beb62c3595dc19d7a
 DIST Sigil-0.9.5-Code.zip 19224845 SHA256 fd9963c4e5b9013bd95ed0659dbc5e67c9848982800f2ec99bf96bbdfb708ff1 SHA512 f2e151f716ce57f9bb94d621ae8e5281c6a0cce12e58b49abe959d1f602fbdb8d28f16d5dc418dca871b100efba2fe13f7f2a66c6704346b5a40755a68e8f625 WHIRLPOOL 8ec15cb19175097b4bd0613139366d58a5fd0c01259e3cfb9203d585e009f1207ba3e9b68cd5213793c8309f9e18720ac9eec674d820947833a90dbcc6dcc3d5
 DIST Sigil-0.9.6-Code.zip 19307454 SHA256 7856ad20116ef13fc3f79fa01c1d65c8b15ce1047f1e88b0723c2658cd8f18fd SHA512 8ae5ce89baf199a10b940d25b3bb3cb97a03dab993e318c5a2b5e6fcba7d4741cbc865f3408d36bd5ad784c35833e4ab3d7b3e282047560d57cd7790c6709417 WHIRLPOOL d74290b59247ced4977bf575adb93c7a76a8045f464b649854e49f6028cb2a9fb28c50fc36d00d3ab106768a85c514b5df5252e5172597a6120913a051b9cca7
+DIST Sigil-0.9.8-Code.zip 19807795 SHA256 78f9f200c86da326984543bd86cbb8eab91308a5a4d7f8cfcc88eb9b0779749a SHA512 18cd137ead965bc97626499ec73dddb8db82b4d538c30f70e62546bd1eeb6e2e76ce7587d572354d973363a07e93ec33b60024bbef7914a22cbfc28a76af2a00 WHIRLPOOL 16a3b3ce3f3c67236b95aba91a5d5a2fce88a4d72364fbef7c6c69dcabb6a53849d74334d2684b58a64cf35b6ba43494b3d260909d6d0e9b06f99ec3593069cf
 DIST sigil-0.8.7.tar.gz 19394061 SHA256 0352cc46714ebb5067a0fbdbbc76dded8f10ea0f4f43374c7dbcac6eba49e104 SHA512 24b74c835ae1f8fb887c9d2c59b3ccc6720ce1fe8d19a6b0056754ab5ea6e63c34c4b229f4e4b3a880e722876d288e58385f5a0ad15b295f147b77b1acf28652 WHIRLPOOL 2cb7a8a928069a2f005396faa9bdacde1f77f3cca3a3ba2458b8562e48298a127b9de9d7ecea5f106ad68865d5074b13fff5a234497b2b6655ac1a3c3edef827
 EBUILD sigil-0.8.7-r1.ebuild 1276 SHA256 11ace9e20eb41c98ea4a2807836a619f35d77b234f8618ef902d2a732ffe4e58 SHA512 99f64144328eb0e7566646a5705bc533df127da56f633c38ba85f432e63cda949f54f322419b7934ed80263fb275f897d8513d721d7b6807ce4ac1cabf0d2456 WHIRLPOOL 0ea210a1b0c9ef6b4ce968020df451de94dc6115969717ddd53bf4a8bd6436ebc38c59dba5965c17a221b7ed4134f402e2a3dea1b687e429aa7f9d60cabfae7e
 EBUILD sigil-0.9.5-r2.ebuild 2242 SHA256 47fa5d6143fd8bcb492fcbaf36be3642ab7553be797fc4da62718fad8a58abca SHA512 c72a5bb74e93c6722710f411b59bbaa1ea11ec67fab47c6e21c041c4c81d1f5e868f572b2f1eb1a1e251a15052a25ced0cd5f72020e6d9240a61f6a913438d04 WHIRLPOOL 0d82691655eb657c6feb57275dad2bae7032caf24bcaf9d99b0e281da094db1a578e90340e118a618f6d178d38c99da48d2a60c456922c4b530a55c6fffb318f
 EBUILD sigil-0.9.6.ebuild 2242 SHA256 47fa5d6143fd8bcb492fcbaf36be3642ab7553be797fc4da62718fad8a58abca SHA512 c72a5bb74e93c6722710f411b59bbaa1ea11ec67fab47c6e21c041c4c81d1f5e868f572b2f1eb1a1e251a15052a25ced0cd5f72020e6d9240a61f6a913438d04 WHIRLPOOL 0d82691655eb657c6feb57275dad2bae7032caf24bcaf9d99b0e281da094db1a578e90340e118a618f6d178d38c99da48d2a60c456922c4b530a55c6fffb318f
+EBUILD sigil-0.9.8.ebuild 2242 SHA256 02d18dff5d24c82012094a81ca221956f88ca14978d8d97bbdcf6dd5d58dbe11 SHA512 633c3eb675dcd67890af8f46e1f9143952162b6ff3ae63228c1936f58e7bbb1d70255b73e0fc5ca2858693f6d3e61b62d0b39fc998ffa4967aa184ba220aa7fd WHIRLPOOL 6b440f27b30814e7e526ef3e9babd6200619c3ea548086b7f816307ed6f6d5bcfcb7dc3559b241fce86509c11f69e51db13c103d93eaf71583e22963eaf962e0
 MISC ChangeLog 7635 SHA256 607c351b0c32280e50848c2454d95ba3a1fa500abe99759889edf80477cde5cc SHA512 1436d601f1aeab5fcd8fc7e8eadf793e257922154bdb9217e74cc3dc64bb6e1c1e27fffb10ccc0ff021e5a2a06e9da1c8e77e0007e69adcdce42e87690549825 WHIRLPOOL 019c929d678af0db3e4e4d5662e15bf392ca7272bee98b82786d4a882aa5fa004d6037d107de156abfe3e3a720f564776ac2e8b4d16f2d7a84043f097aabf97a
 MISC ChangeLog-2015 2643 SHA256 d4a27d050f4fb657eef3ad487c632eb8f9afca6e7760b4d89e628a16295e7c2f SHA512 15270b02a9bcbcf23225a53efff1d0fac71a1eea3fd51c20aeed1804553a9703a29341dca9ad772d08f467612f5cae089d55d4a051c84fa06390ad7310b28d66 WHIRLPOOL 90e0e673221edeaae669ad2167a6679cdc00b6fd36ebb34e5bcdf95c5601de220c5da03a455555176abb89d0020bef45144785324a9511a6b3d533edf888df5a
 MISC metadata.xml 636 SHA256 2e9262d0707ae9ba14e8906f138a408ecf7835c715a42e857cfe082aa0ed0f4d SHA512 66546079856b255a0c5c46a2eb3df314a08b510456e971f74422748cd689517b248f01f9500f3c7a76698d5f9271540be52ba4e1ab457f55c25f75c3cf5da488 WHIRLPOOL 88ab73db404348de3170d5b2f2c3577261bd5af2fa564bfa25d70ac3ddbe888f0592dab50b6ed632da46037308bafc8e5964a5bc8513cd0b7d1999755c9be0fa
diff --git a/app-text/sigil/files/sigil-0.9.8-proper-gumbo-install.patch b/app-text/sigil/files/sigil-0.9.8-proper-gumbo-install.patch
new file mode 100644
index 000000000000..375f2e0ab6ca
--- /dev/null
+++ b/app-text/sigil/files/sigil-0.9.8-proper-gumbo-install.patch
@@ -0,0 +1,24 @@
+--- a/src/CMakeLists.txt	2017-10-17 14:22:57.780297490 +0200
++++ b/src/CMakeLists.txt	2017-10-17 14:24:21.754150453 +0200
+@@ -962,12 +962,8 @@
+     endif()
+ 
+     # Standard Linux 'make install'
+-    install( TARGETS sigil DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
++    install( TARGETS sigil DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBDIR}/sigil/ )
+     install( PROGRAMS ${LINUX_LAUNCH_INSTALL_SCRIPT_CONFIGURED} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ RENAME ${PROJECT_NAME} )
+-    if( NOT USE_SYSTEM_LIBS OR NOT HUNSPELL_FOUND )
+-        install( PROGRAMS ${HUNSPELL_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
+-    endif()
+-    install( PROGRAMS ${GUMBO_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
+     if( BUILD_PATCHED_LIBXML2 )
+         install( PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libsigilxml2.so.2.9.4 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
+         install( FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libxml2.so.2 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
+--- a/internal/gumbo/CMakeLists.txt	2017-10-17 14:25:02.539107666 +0200
++++ b/internal/gumbo/CMakeLists.txt	2017-10-17 14:25:27.985457056 +0200
+@@ -40,4 +40,5 @@
+ 
+ if( UNIX AND NOT APPLE )
+ 	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99" )
++	install( TARGETS sigilgumbo DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBDIR}/sigil/ )
+ endif()
diff --git a/app-text/sigil/sigil-0.9.8.ebuild b/app-text/sigil/sigil-0.9.8.ebuild
new file mode 100644
index 000000000000..0bdd33c470ee
--- /dev/null
+++ b/app-text/sigil/sigil-0.9.8.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit cmake-utils python-single-r1
+
+my_pn="Sigil"
+
+DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
+HOMEPAGE="http://sigil-ebook.com/"
+SRC_URI="https://github.com/Sigil-Ebook/${my_pn}/releases/download/${PV}/${my_pn}-${PV}-Code.zip"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-text/hunspell
+	dev-libs/boost[threads]
+	dev-libs/libpcre[pcre16]
+	dev-libs/xerces-c[icu]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/cssutils[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-qt/qtconcurrent-5.4:5
+	>=dev-qt/qtcore-5.4:5
+	>=dev-qt/qtgui-5.4:5
+	>=dev-qt/qtprintsupport-5.4:5
+	>=dev-qt/qtwebkit-5.4:5
+	>=dev-qt/qtwidgets-5.4:5
+	>=dev-qt/qtxmlpatterns-5.4:5
+	sys-libs/zlib[minizip]
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/gcc-4.8
+	virtual/pkgconfig
+	>=dev-qt/linguist-tools-5.4:5
+	app-arch/unzip
+"
+
+S="${WORKDIR}"
+
+PATCHES=(
+	# sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
+	"${FILESDIR}"/${PN}-0.9.8-proper-gumbo-install.patch
+)
+DOCS=( ChangeLog.txt README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_SYSTEM_LIBS=1
+		-DSYSTEM_LIBS_REQUIRED=1
+		-DLIBDIR="$(get_libdir)"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	elog "From Sigil's release notes:"
+	elog "When you fire up Sigil for the very first time:"
+	elog "navigate to the new General Preferences and select the default"
+	elog "epub version you plan to work with (epub 2 or epub3) so that new"
+	elog "empty ebooks start with the correct code."
+	elog "if you plan to work with epub3 epubs, you should change your"
+	elog "PreserveEntities setting to use ONLY NUMERIC entities."
+	elog ""
+	elog "For example use & # 1 6 0 ; for non-breaking spaces and etc."
+	elog ""
+	elog "We strongly recommend enabling Mend On Open in your settings"
+	elog "for best performance with Sigil."
+}
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 101aeea39d50..33dc36f93952 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -5,7 +5,7 @@ DIST xapian-omega-1.4.4.tar.xz 501712 SHA256 14dd790b94b828b457120439886bb5de59c
 EBUILD xapian-omega-1.2.22.ebuild 756 SHA256 c88a2ea6a669b735cba2d7ab584bb490c06c48b3d1cbb91b0dc1a5e6a47fdc0a SHA512 413a7b72ce7e4f05b84e4c8e798dde421decb286bb3dcb5ccd9b7f37596160cb41b8c35f7cd330971f0223b05aec9308950125d078be0810f2fb09bc77ee2406 WHIRLPOOL 5d34c10dceb36624463a3fc479fa6e631d899c24e72f45434a640169e938a01ac22db466081b664783da3e8aa150a516a9ae8e6fcb2e41dc6fa2da5a426ea88a
 EBUILD xapian-omega-1.2.24.ebuild 1268 SHA256 345ebaab05f6ff817324f3ad6df2b32acb8df0a60dd0d5ba1d6a908ee35f7044 SHA512 4d74b0bbb965db51bebbb241852024dd8ae720ac2d7cac8b52b888e0a4dadb400030be2e1a74f570cfa1ee1ca5ce8c4f0acae783e1c8ef1cb95a2988bfa49eee WHIRLPOOL 554983c4663c0056969fc2e40dad9715cc6a98334163ecb9bcf070c68afd5c7e2b3ca47e7f4f3843bfbf3902bfd4e6c42c14820bf9450793658d18e9b29b3b76
 EBUILD xapian-omega-1.2.25.ebuild 1276 SHA256 79cea03850a7a9e5f9fc7fd8aa9031964ac3957b993bfb2aa4b4f6170cf048ab SHA512 54d65e4d09a752db726595f652e07d3907f24c8b94ad47dc38890cff459a1861bd22f13263575b73295b3d21de1d60ce53ffb3b334e61ba3fe238a2c2c7fd0d4 WHIRLPOOL 97c975cc4c146bbea4b2e9930b5f3f2fb8ce3f6d31a6946d42ac5b6e9c1dd6ad8297fcb8ef48e96e7641ddde2b8f6419448d2f002090d699f9dc35e506dce6eb
-EBUILD xapian-omega-1.4.4.ebuild 1150 SHA256 8d3cbde8714ee77531f5fbdb8ab958fb8e4470c60eafc2b721b9ce46690bf476 SHA512 d3ad9e099aba9d7ecf9b1e3642a7dd3067ac86e36ff20f443ddc84aeb39ba95595d07843d5b7ffb1298c26e3eb4e802cbd11bc4c2c7e8780b9eb6fd924455c24 WHIRLPOOL 5978034385e6f82aaca524716f79c91a282432431e0cd952d44c70143c37853b21aba87c816ded5d12da16c234c32300f8a553335e50dbc7213c74648ef20e85
+EBUILD xapian-omega-1.4.4.ebuild 1148 SHA256 5a08c39379710a04347c4df411f7acc90a2315590439fa8c84edf3c99b85271d SHA512 234a6977f7760fc1b1e5ddb6104bd22a497b7bed0a52860b381c03f6b998edbcea6a026349955502837426f75e354b4e1c8e625c10c05e38935e888bde8f0f3e WHIRLPOOL fc071b7c4221b283fbc96f6c2a976e22915f3f6d4830d8054fb6fcbb18bb46ad1b96e8ee090f351053a3f2c8ccecab295659c873adaba290c4f0f3960c147c3d
 MISC ChangeLog 9843 SHA256 898ae8f6dd1cbd09301ff9d8c3eebaaa7a8c4db1e2c72e317ed1c3d8e0f8d82a SHA512 902d8678962a5c7c050f16f46cb0de7a948b1db8f6cf7ff602018886f7964f83bac6b00d31c83b20ca842aa02917e52d0d48ed36f01afdcd325f4fa2dd821675 WHIRLPOOL f43872445af68a193b91bd3dc44e7991dd95ba217ad7c1ee623e258d1e58349938c78b272f9d6df137bed6ba74377bd5bff217567c2e9059fd66a00f34fa171c
 MISC ChangeLog-2015 8456 SHA256 2a7ccfcb36e7792d7f423883c2094b106aa3955cc6d0551d2999557193eeb834 SHA512 a53026a24f108e1d4c673736ac88b3acaca2bf1725e139c1d4f1172b44e275865ad136a0df99aa370095a20932c82919eb7ff71025a1b309e33ed99d6d308b3f WHIRLPOOL f1568db0197cf41acd5fbacc6d816efb49f1ce2ede1d1f07f9f45f018b7a1d93df07bd274a5f8a47b9b58fa6cf455184e21db4f585f388fe5f2a4e5f7d9f5855
 MISC metadata.xml 252 SHA256 a590e5133cd97a615db4f977b0e28e5c60c56cac76eb3d339109cdf379003b60 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65 WHIRLPOOL b209a730a169969b9e3c4d4612368bc5b30bfa5fae275d98d83ba96fd0ad01d308a8fed4f7d67a7c9fa417c624dfeb23ce89ab58923a8a0b5b1bd68ee73f288c
diff --git a/app-text/xapian-omega/xapian-omega-1.4.4.ebuild b/app-text/xapian-omega/xapian-omega-1.4.4.ebuild
index c50370ff2675..234099310391 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.4.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.4.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ~ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 x86"
 IUSE=""
 
 DEPEND="dev-libs/xapian:0/30