diff --git a/dev-python/python-axolotl-curve25519/Manifest b/dev-python/python-axolotl-curve25519/Manifest
deleted file mode 100644
index 6e3573a..0000000
--- a/dev-python/python-axolotl-curve25519/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-axolotl-curve25519-e4a9c4de0eae27223200579c58d1f8f6d20637e2.zip 114545 BLAKE2B e0bd643eb1276140a6611485cf4cdf0379892f0bf4c6f7081ab7a1258c42f0c9f149597e021e338e652336abb7d2e211ec404e8bc2d2458c8ba82d51a41f2ca5 SHA512 2a49768438a8f588520f2b6ad930408bebd18648430fb13a5ae3f13f6eb24bfd658f59c3a5ea91435dcc78820bd0bff7b6a94ff9ac5a0c01cb71ae2f55852563
-EBUILD python-axolotl-curve25519-0.4.1.ebuild 686 BLAKE2B ddbabce6d6392dff995065560f75b19b9e66a47d69e489283f57e3cd4dec59d427217b17fad201d1c7f4afa10a5ea4d8bfc3bba769284ee18ed09a9a4bff1980 SHA512 39be8b0eb783960b9d5b92ab887f848e1a4dd922045e74be2736cc7d85b230eca96003826ef396c1c2fb78a8064bf2b4a32e09fea9f8995a125bb561f20183d6
-MISC metadata.xml 248 BLAKE2B 0f4a45d414249f9410a61d8545ba052db41e3d74516e34bff0ca5547cae55db7eefffb2c23d840c979bdea0b927da36f7a56441cbc6053291d65bd39af2421bd SHA512 0f6384333cf38e52e6a67db43f3a78723d2a0d3446da27e7972f15244d96ae41f0e428d937538d4fa52aa70dc9c92920672d4e237b481dbbdff1d9d8c325b33d
diff --git a/dev-python/python-axolotl-curve25519/metadata.xml b/dev-python/python-axolotl-curve25519/metadata.xml
deleted file mode 100644
index d68ff96..0000000
--- a/dev-python/python-axolotl-curve25519/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>gentoo@tastytea.de</email>
-    <name>tastytea</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1.ebuild b/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1.ebuild
deleted file mode 100644
index 33fe568..0000000
--- a/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-EGIT_COMMIT="e4a9c4de0eae27223200579c58d1f8f6d20637e2"
-DESCRIPTION="python implementation of axolotl-curve25519 encryption"
-HOMEPAGE="https://github.com/tgalal/python-axolotl-curve25519"
-SRC_URI="https://github.com/tgalal/python-axolotl-curve25519/archive/${EGIT_COMMIT}.zip -> python-axolotl-curve25519-${EGIT_COMMIT}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( README.md )
diff --git a/dev-python/python-axolotl/Manifest b/dev-python/python-axolotl/Manifest
deleted file mode 100644
index 2ccd246..0000000
--- a/dev-python/python-axolotl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-axolotl-0.1.42.tar.gz 53869 BLAKE2B 045d19b38478404b19717daee431a4fc36d187dc511d42ee950b37ef257d98aaee8ba42633888d596265c0d64bfc33f2da9307d45feb4189ec04c03d69687108 SHA512 db9e1cfab87d690619a672b1782942a18b12b17af555959c17bcc3e2581e9c689c57becc0ea884a1129df9dace17684ba03de38b81f8c8c65cab27962ebdb6c5
-EBUILD python-axolotl-0.1.42.ebuild 660 BLAKE2B bd5986858838a8eda98a0be2f738f5008c4d22ca37f964b5525e49cd2335061e72477d644c87c2780c49dc33cd439cecaf7e48ae858a6953b68842396eb6b19f SHA512 9c80382ed58d21d124411e0b676532baafcbfafb467a9d8a19b2bbd34710ba9dc9002a2d66ed1a47b72efd817bcbc3682ad8818c41cba746666201c10d56ec82
-MISC metadata.xml 248 BLAKE2B 0f4a45d414249f9410a61d8545ba052db41e3d74516e34bff0ca5547cae55db7eefffb2c23d840c979bdea0b927da36f7a56441cbc6053291d65bd39af2421bd SHA512 0f6384333cf38e52e6a67db43f3a78723d2a0d3446da27e7972f15244d96ae41f0e428d937538d4fa52aa70dc9c92920672d4e237b481dbbdff1d9d8c325b33d
diff --git a/dev-python/python-axolotl/metadata.xml b/dev-python/python-axolotl/metadata.xml
deleted file mode 100644
index d68ff96..0000000
--- a/dev-python/python-axolotl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>gentoo@tastytea.de</email>
-    <name>tastytea</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-python/python-axolotl/python-axolotl-0.1.42.ebuild b/dev-python/python-axolotl/python-axolotl-0.1.42.ebuild
deleted file mode 100644
index 1230050..0000000
--- a/dev-python/python-axolotl/python-axolotl-0.1.42.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="python implementation of axolotl encryption"
-HOMEPAGE="https://github.com/tgalal/python-axolotl"
-SRC_URI="https://github.com/tgalal/${PN}/archive/${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/python-axolotl-curve25519[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( README.md )
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index cdbbca2..9e125b0 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,4 +1,4 @@
 AUX disable-gspell.patch 798 BLAKE2B 2d5c3d413f078e171e0e7cfc144731302e137c53b7b52cfac3aeb92fc8eb399f8865d25b89c589c1e017a43c4903ed11b1bc3f24f1001b538513a5096e6d29ff SHA512 6dfbbe82517c73412512916480bca049588728cac92099a418b1a2be47480131032cb7536cf67896e8511232d4ce1a9576406326bd237b4ae1f799ffc3a2c83c
 DIST gajim-1.0.3.tar.bz2 5964743 BLAKE2B af4bf2206a962eb68c4df09359fa3a0ccaca1e886d4fad67d9839f5fd4c1fd359c7ee7933d39d8c1ae7dcbde6b72548fef3564a467653064d4d37aa1db234c04 SHA512 a6d7f92a22a9dddc8a4b07eda0aae0b6fb4db57c73133ee19937f7e2a2a82c5351051d1f3627c94a44434276ed001b83d375f708f177962125af66cda8579ec8
-EBUILD gajim-1.0.3-r2.ebuild 2484 BLAKE2B f04f87c069de3023f103e18fc78a37278fe239ba8ea42a272e362934859d01d2b203604c23894a3e749474b0571d823797753a86e56d89494bb45f8b730fa1c1 SHA512 ebb7495207e9ad99b95f8a60b12dbe16751ae2d1ab882186e11d9ab0dd718b0f09b6b8ee186a3fe868c91840458e768b23c906524de4093dcf2e6a22e57063fa
+EBUILD gajim-1.0.3-r2.ebuild 2486 BLAKE2B 9766f6874b4738295f5b8371ed4dc19ba156665333681d1b71ef8807dc992d2d1ba865827fb2b0d230e3321d709e4e305e9803bf9acd31b09ae0590317c76132 SHA512 c06fc88f9dd8eb171c65796c1a192d178e46759d48fef26bce3d59682a6606479cf9bc5c86f8308ae31e6f32f50f2b96bcbfee1599ed947756736408b5e630c2
 MISC metadata.xml 807 BLAKE2B 1fd3f760c7dbc30a7396142f2fb2abe8fb896757a1b36cb9fb77db41ba9f825d5ea72bd1f7038a888738f81d4cf09a0fc8cb818dd769b34f1c76b573d200cfff SHA512 d7f93ff96e63bba7ef947bfc69019cad0b22fd2b2c0b65cbe4653a632759bf52849f46ec0c082bbb49a8dc32211c5c89ba800837c53f0642970b83002cb32787
diff --git a/net-im/gajim/gajim-1.0.3-r2.ebuild b/net-im/gajim/gajim-1.0.3-r2.ebuild
index 63ec4f4..5d76e14 100644
--- a/net-im/gajim/gajim-1.0.3-r2.ebuild
+++ b/net-im/gajim/gajim-1.0.3-r2.ebuild
@@ -67,8 +67,8 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT="test"
 
 src_prepare() {
-	elog "I will likely not update the Gajim ebuilds in the future since they are"
-	elog "available in the pzskc383 repo now. Please use that instead."
+	ewarn "I will likely not update the Gajim ebuilds in the future since they are"
+	ewarn "available in the pzskc383 repo now. Please use that instead."
 
 	default