7 files changed, 18 insertions, 29 deletions
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index b8d11f62563e..283027381014 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/geany-themes/Manifest b/x11-themes/geany-themes/Manifest
index 02a44a1954f3..caef0933bf9d 100644
--- a/x11-themes/geany-themes/Manifest
+++ b/x11-themes/geany-themes/Manifest
@@ -1,4 +1,3 @@
 DIST geany-themes-1.22.2.tar.bz2 14694 BLAKE2B 2cac3e3170bdeb04d727574f5285da89c8a915a681e0fcebbd8217d2314c00d681b3113fa5ed8e00f0454c99725688a92350ecc9b2a7859d029914f940fb4eb3 SHA512 3759c687a06a7f933e40fde5c52dc10c36eebeb799a5c471c5ee31598f8c32496b1a3f326342494e33ae209bed66420147f85ebdbce771af2f27b0151dca9c84
-EBUILD geany-themes-1.22.2-r1.ebuild 472 BLAKE2B 0e2a33decf3f68b30f2ca5716a549faa9fe2781cc0637f2232a86973dfcadc18fe0662e85057d3e44f4393e6cf3a37c59abe544e1e925a1b2dbdb8be31e23469 SHA512 2dc4534cf6c6c63b6fb2d462295ab63b18e276125c77f14d27bb25ccc0958fa1302c872579d2e4caf18582e3a6fde9f03c2d51e57c876d4826ccef879ef49b2b
-EBUILD geany-themes-1.22.2.ebuild 497 BLAKE2B 13330855d770b3c041b67452d9d2142f1ac69f979d63f697f032ab0181bb4a103701dccb4f66ed93c6f47316c650bbcde6bcd8fffebd0a6a7110e1e29c43ad0e SHA512 4759c400257081e8cc83c29c20bd55f5f040e209e69736e8e0b3d7b5a959e52f917389f31a5de7d57d1323df59496f2a4fbdedd58ec13a522e8db66a301e1074
+EBUILD geany-themes-1.22.2-r1.ebuild 470 BLAKE2B 87fede5ac4aa5e4b79c5a49a2bf9164c206c3f51306804ab03cda8883bd147a8202d4bdf3f6b8ba108ee55fdef5c4d0a94aeeb7dadd72a0f8cdde7a793492072 SHA512 d2b57665cee47cfb4cb25ef3ba1f5fd53d3baa960114f337dca12e776d38f1bc705b1d4dcd4a46169917082c39d49442124dd46734d96888db00b7bb011eb02e
 MISC metadata.xml 255 BLAKE2B 505d4b3cff4a1131376f1166c7d6c3494c68efa29f3b13d9aba351ad1847318c95883ad8dfb7baba0ed214ee8e5d394cbcefb11e0118c3c9c651b7a182bb117c SHA512 894c428e9ba202b7e0b66de02973b8e6df3efe93fe3446aa5ea342284ff8b247b5668c2e91c822b0792ff2fbda1a3e8a88159d7cfe25e437239ae5071514d89c
diff --git a/x11-themes/geany-themes/geany-themes-1.22.2-r1.ebuild b/x11-themes/geany-themes/geany-themes-1.22.2-r1.ebuild
index fe01b005b086..dd3095f40dbf 100644
--- a/x11-themes/geany-themes/geany-themes-1.22.2-r1.ebuild
+++ b/x11-themes/geany-themes/geany-themes-1.22.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://github/codebrainz/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-2.1 BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-util/geany-${PV:0:4}"
diff --git a/x11-themes/geany-themes/geany-themes-1.22.2.ebuild b/x11-themes/geany-themes/geany-themes-1.22.2.ebuild
deleted file mode 100644
index 9990f5a1d7cd..000000000000
--- a/x11-themes/geany-themes/geany-themes-1.22.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A collection of colour schemes for Geany"
-HOMEPAGE="https://github.com/codebrainz/geany-themes"
-SRC_URI="mirror://github/codebrainz/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-2.1 BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-util/geany-${PV:0:4}"
-
-src_install() {
-	insinto /usr/share/geany
-	doins -r colorschemes
-
-	dodoc AUTHORS ChangeLog README.md
-}
diff --git a/x11-themes/terminology-themes/Manifest b/x11-themes/terminology-themes/Manifest
index fa9d63b415de..c450e77d49ed 100644
--- a/x11-themes/terminology-themes/Manifest
+++ b/x11-themes/terminology-themes/Manifest
@@ -1,4 +1,4 @@
 DIST terminology-themes-0_p20180106.tgz 220129 BLAKE2B 7a3318f0e869f96c5d022edc479385e5f4602fe65ee9868a139d0c89e1968a803efca915c9335b1f9d9253f278bba31c47f2699e53327d3ec1e9e3729082b79e SHA512 c6c4d756d84ca8575f1d97f05cd1dd9c579b1125107fd1a374cfb99741eb1c7178edaede9be3a6175973b0c83104e425977b2cf7b5d5e990fa717750c40f9e02
-EBUILD terminology-themes-0_p20180106.ebuild 583 BLAKE2B 11b348948d622f2062e5f94c8dda779c4f2ad107ac35912769960ad459747c152669ec24a65d1899939e10b33325d32489e6201a4d1061286988d276d77e87bf SHA512 18bbb4e9a8be909066833cb11b6ce6f198c850563c90cdbf452dd75d1889cb344b8ebb65c6c83cd66b93971714046edab7c6bd04b97a8bd7a50dce37f89768f3
-EBUILD terminology-themes-9999.ebuild 461 BLAKE2B afe2cb73eba1350711f10bcc5f52a39d6f394ebd7104ce08bd43bfe9c44395f46239b035bc6e2fbab40334d0bd5cd4c5ec3604d3d234971d5fc68dcd4e8049d0 SHA512 d2bfed83153afc35e91d6f49c7b6c368a05dc749dab5a1664a1fd8282feca449e3b5b2c61b53953409a856a1cb3aaebb55cb5c0377619273ac80386b0398512c
+EBUILD terminology-themes-0_p20180106.ebuild 653 BLAKE2B fca6ab4bc6f62cfb081691be96074bcb637d2cba0ee5d14755a4f94348cda1039b31f07b53e0ebcc4f5e00f1994ed719ef296d9bba54d77c388f1f0eb781e13e SHA512 7ca9658b7723b559259caf01a6ca45ca26d0c0aaa535e4716fc9123ea4ba1aa858a12b7615830b5d6486cf0dcd3c35fd6d7aa748f684e583800989c73b20f845
+EBUILD terminology-themes-9999.ebuild 522 BLAKE2B dd042b39d508a91e3edea516581b7e77777370f17aab69c25b8a3cd1fa5303dd9662b64daa2461765818b30fdbd7d658077245a676b6822fca21aba427f6a92e SHA512 69f623fd9a5d1a37ca259394a249c0214fbe24a4c6bb2ee5283f33f7ed2b90eda1d52ae41bd2e32ff9b66d5506d947eed3f992185cba52028b296f1fc38f5b9c
 MISC metadata.xml 372 BLAKE2B 1294a06b056de7ef2c862fcd7840fe23d7a4b4f54e3b69ed280320225a8ebd0929431e570f7e89fc60bb9914a6e93a68083d8b2f5b63a232b02564667918a22b SHA512 15fc2773b40c9744fd5d21e584e83e342da79be0eda12f7e1eea4b1eaacac35c8132850ca8768d3132b7e6ba2e7a015735b89d0736ea6e5055b378c82485c550
diff --git a/x11-themes/terminology-themes/terminology-themes-0_p20180106.ebuild b/x11-themes/terminology-themes/terminology-themes-0_p20180106.ebuild
index 442d1b115785..bfae9f6cb9f1 100644
--- a/x11-themes/terminology-themes/terminology-themes-0_p20180106.ebuild
+++ b/x11-themes/terminology-themes/terminology-themes-0_p20180106.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit xdg-utils
+
 EGIT_COMMIT_HASH="ba7b71ffd290cbce4bf87d47276fa516c6563345"
 
 DESCRIPTION="Color schemes for the Terminology terminal emulator"
@@ -19,6 +21,11 @@ RDEPEND="x11-terms/terminology"
 
 S="${WORKDIR}/${PN}-${EGIT_COMMIT_HASH}"
 
+src_prepare() {
+	default
+	xdg_environment_reset
+}
+
 src_compile() {
 	emake -j1
 }
diff --git a/x11-themes/terminology-themes/terminology-themes-9999.ebuild b/x11-themes/terminology-themes/terminology-themes-9999.ebuild
index 7641fd7f72a7..316ef7845b87 100644
--- a/x11-themes/terminology-themes/terminology-themes-9999.ebuild
+++ b/x11-themes/terminology-themes/terminology-themes-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit git-r3
+inherit git-r3 xdg-utils
 
 DESCRIPTION="Color schemes for the Terminology terminal emulator"
 HOMEPAGE="https://charlesmilette.net/terminology-themes/"
@@ -19,6 +19,11 @@ IUSE=""
 DEPEND="dev-libs/efl"
 RDEPEND="x11-terms/terminology"
 
+src_prepare() {
+	default
+	xdg_environment_reset
+}
+
 src_compile() {
 	emake -j1
 }