Fix building xed, gedit, gedit-plugins with libpeas-1.20.0-r1

6 files changed, 10 insertions, 12 deletions

diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index 21aeb9d..8075eb2 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST gedit-plugins-3.10.1.tar.xz 1253800 SHA256 b30e30d5a0efb9a711c6583748b37c1ed3e45222505e08f920b78c6de0bc4a9d SHA512 bb63986c1a2c431443191bf1855a54125c9c1b500a4764bf13f597cb8ea09e588ee101d2856938ee229bc9bbba9bd107c60c643fb09f001afa26f0ef90baa2fa WHIRLPOOL d148f654c0b4de0caab3b26ae8334d2ed9344a3b08eed4b45b8458a1f3efd9c909edd8dbf015c951aadaaa0953abe81365324077c81e5d18d1b7c412d148cd46
-EBUILD gedit-plugins-3.10.1.ebuild 2138 SHA256 dc61c63d143cd9b5581e354c17ee1c833eb347addc9c15724db3695ef99b009c SHA512 8de901e8f99dc8338015de590e07f8b0b63a001ad0be0abea17df45b71e1374eee57eef80995efc3ad1f185f8ed51823b1b0766a09d8ce6689df45209c2c5aac WHIRLPOOL 59e922868b0c82b335ccac5ed355a34f3b4b729a414c0f8e5b4b2994906f861f5e342f68cd40aa0553a3612e7084dc4ed336200e37f1e43444758a8b492eba7f
+EBUILD gedit-plugins-3.10.1.ebuild 2149 SHA256 f5541e301c49451649cfd6681e2d01b052b1536848571cbb8e1e16dab854c687 SHA512 b7bfc2b10650a6fedc8cf6a15dab4cb97803a6a0652a74f681d25184ee5730a465710a3e1e7f4a614949f53d4618740a98182bf051de9e998b6948b1910ee01c WHIRLPOOL b15108589e0d699b41c54d4eaaa297ba4631e7187ebb171c2d195da8eebd0fc4016f1922770a28856e77258e563ead4d051c226f07ea7383b3bbb15748fbf3af
 MISC metadata.xml 542 SHA256 212804662230f5cff0ee4a76a2edb9206df1f30365320eb21dc0c2b5d50cf141 SHA512 293f3de34d5c3307e018cb01312502574eb78c7d18de7c711422bb1398a2b73187e47d500c11b777655f57486eecb9dba3be1e055979b18fa77d6f23655d2d5f WHIRLPOOL e0fe67fd8297488a65275976ec47cd7e58bb4d5c2edb4afe7e367440956f69fe06d64d2d3bc0c298e0d167d7023a7795a62bf7b531961655a9c8b52394ce4bfa
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.10.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.10.1.ebuild
index dd60e52..950d3fe 100644
--- a/app-editors/gedit-plugins/gedit-plugins-3.10.1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.10.1.ebuild
@@ -5,10 +5,10 @@
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_4 )
+PYTHON_COMPAT=( python3_{4,5} )
 PYTHON_REQ_USE="xml"
 
-inherit eutils gnome2 multilib python-r1
+inherit eutils gnome2 multilib python-single-r1
 
 DESCRIPTION="Official plugins for gedit"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 4a559f8..06d22e1 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,3 +1,3 @@
 DIST gedit-3.10.4.tar.xz 3086320 SHA256 40dc10b6e26fd8523087e7321a20a063f4c1e586dffd7ce8ee78eead11359f9e SHA512 36fe1a309594338e6b0f8285eb8789386724e0a9c9f5f3ff898d138c0949c04ce693896f4e4766666e3afe795dea46caf0403ff82570dfd60e6dc5ccb99642d4 WHIRLPOOL 73c40ae9c73fd31a8dd5468924a338c4e8055c021a9f8800555f781e5bf9d71cfbb9c57666127e52ed3311933a7d0402ca3844b1d8bac439274cf88889c5953d
-EBUILD gedit-3.10.4.ebuild 2385 SHA256 e7e7a0ffdaf4f528a0be571b0ab1a8bf7bff9b911b0ecbd7491677eae5a1530e SHA512 cbfd8fdfe6cd8cc03286dc4c9e44b1439e18dd217a7d7e61ca88a1341c6de90109fca805d603f7f3769f0bd146f3074d2fe9852977b4aa470f052983b6cefa68 WHIRLPOOL ae7ad702bd2ba9198b3ef6bf64bd619fe290d9f08f0f4f58a2da0a17f2f3c3b0a0e140ccb85bec404fb95d9eb34ba3eebff8b6db6b73be49cc40650cb4fce6af
+EBUILD gedit-3.10.4.ebuild 2392 SHA256 4ec936ad26929d88bca8c846edc8502bfad2e37100b657c37e6898e46ee99c1f SHA512 417c486343f8572c3d519fcfb94285f67cfdcaab67211b2812b8e3433c23c46b03549ab65f6d6bb01822cd0312ba6401d35ffe5594c1c81aae1ad155301fa3df WHIRLPOOL 3ebb8a7ff4b91ba0632ae31b60e3e51ac6b2c65f76d0dec4086838e8b14bc360f9f7f3850cf84ffffb9e9874f458ca2c06137718bde7fb358ea2a59aa050d77c
 MISC metadata.xml 276 SHA256 8dec58657a80b4973306f2f6d5da03a819b949c3f8e93b3065eafda55f1f8465 SHA512 9c1f48389dedc905b448e4085b9fec8f37ef777aacf14e18541e39680ccf83a968c7ee8fea8b9ede61704ac174380c7cc56858182fb6f59a589ab1d70b8eea7d WHIRLPOOL 902de8d338629274e1ec7a7a6b13316e88f09847d5158a92fdc3337e33c26dcda79ff8bf425dc0de42657ba14769478335249d13cba2342f8adb247a1f40e905
diff --git a/app-editors/gedit/gedit-3.10.4.ebuild b/app-editors/gedit/gedit-3.10.4.ebuild
index 3aa2ac0..2d1714a 100644
--- a/app-editors/gedit/gedit-3.10.4.ebuild
+++ b/app-editors/gedit/gedit-3.10.4.ebuild
@@ -5,9 +5,9 @@
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_{3,4} )
+PYTHON_COMPAT=( python3_{4,5} )
 
-inherit eutils gnome2 multilib python-r1 virtualx
+inherit eutils gnome2 multilib python-single-r1 virtualx
 
 DESCRIPTION="A text editor for the GNOME desktop"
 HOMEPAGE="http://live.gnome.org/Gedit"
diff --git a/app-editors/xed/Manifest b/app-editors/xed/Manifest
index 78b6cd3..a988ad2 100644
--- a/app-editors/xed/Manifest
+++ b/app-editors/xed/Manifest
@@ -1,2 +1,2 @@
 DIST xed-1.4.1.tar.gz 3947711 SHA256 f3490cb2dac8d910dfc231325b66703b2afefdb1b4a8466fed4f7e70c972f0c5 SHA512 aa1d25a54c6cc90b9251615e67433bfb6215248348efd8c704c734d8d563b12ab5ec7f9677fbf9e2527de1016c7e8017a88b30066932c2cb0f592b4c3a287714 WHIRLPOOL 2d10120807f74b1e8c085a80555a2e866a0b301e71a6f7df838d56caad125895800bd518458f28eca42deedddfe61eac2d599ce3448b86ac4bd04f3fc76ca9df
-EBUILD xed-1.4.1.ebuild 2117 SHA256 c36d5b529f734669b4538ff9c4ca52f296baab498f6708c1b15d6ca5b5b78133 SHA512 27c3a76db6af95151ffd60bda7ad61ebad8a1dfdcd3e6722b6a5accf8929518a038e578cfef9ab5335eeff7b466e5780a22931ab285c6556f87e97b775ac4d9f WHIRLPOOL 535ece002b63e98222e00545a4a3f985db2d13658f322b728a42976b97bc8f5fe8168919ce91baa4a04c8869a504782c377606b1a46afd1586dffbfed0ccd560
+EBUILD xed-1.4.1.ebuild 2115 SHA256 653cbc0f1b91cbc64228bdf32244ebea31d72c4b4959a94e24ec18ff2d1d68ea SHA512 ef2b173d4bf3ff164331fdb1c72344cca80b6697f5ad6eb69074adf9819c9688f8c30bfe39d89a67c5b3ff5e001db21f48f289432bb383dcc3ba06e11fcc86be WHIRLPOOL 7f4714006e13a25ab4831d9fae21e6ef88476f5c5ac2ad2e06f8b92e53613058f84806be61e276a214e9d328ff82572558edc5165682060696a56746ad664b47
diff --git a/app-editors/xed/xed-1.4.1.ebuild b/app-editors/xed/xed-1.4.1.ebuild
index fd12e79..688df8c 100644
--- a/app-editors/xed/xed-1.4.1.ebuild
+++ b/app-editors/xed/xed-1.4.1.ebuild
@@ -4,9 +4,9 @@
 
 EAPI="6"
 GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_4 )
+PYTHON_COMPAT=( python3_{4,5} )
 
-inherit autotools eutils gnome2 multilib python-r1 #virtualx
+inherit autotools eutils gnome2 multilib python-single-r1
 
 DESCRIPTION="X-Apps [Text] Editor (Cross-DE, backward-compatible, GTK3, traditional UI)"
 HOMEPAGE="https://github.com/linuxmint/xed"
@@ -18,9 +18,7 @@ SLOT="0"
 IUSE="+python spell test"
 # python-single-r1 would request disabling PYTHON_TARGETS on libpeas
 # we need to fix that
-REQUIRED_USE="
-	python? ( ^^ ( $(python_gen_useflags '*') ) )
-"
+REQUIRED_USE="python? ( ^^ ( $(python_gen_useflags '*') ) )"
 
 KEYWORDS="~amd64 ~x86"