gentoo resync : 05.01.2018

19 files changed, 114 insertions, 225 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index e67d863c51b6..df1f726456df 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 972f5df730f5..3f5b26c15e30 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -2,9 +2,7 @@ AUX 1.48.6-disable-unittest.patch 854 BLAKE2B ea819adc1a2922093d3f79ecd96ac9f599
 AUX gjs-1.43.3-disable-unittest-1.patch 2128 BLAKE2B 73921b6b0f8b77bb98fdbe79e3a4debbad4577e856fdfba7ef57e22630a71672e6a3e330f3aa561c6c09cc7feb1d2339de4fb136643df5faa322c09179b0e804 SHA512 6fd3134bb5c19c46ee2b1f0d87e8644bc5c7a92e32fd62963fe6051ca49f20affde5f6cfbc134aaea0b7b6a5b9833e946796c689e7ebec56951b805b96cc56f2
 AUX gjs-1.43.3-disable-unittest-2.patch 1119 BLAKE2B 8ab995513b63faee201f84ec45fce226c7e7838f85160342a15e9b283c0020de52d35b43999ddfe9c06ec190e3eab5366665734bd5abe40767510b8ed548f6eb SHA512 a6f8df3c3454a635852b83ad1c3733182f2e7a28874476d1c28fb2edf8a8c0bcd7fece723c2baa43141c0ac252c2450a6b57e73821a991cb0ddd5a49aca62251
 DIST gjs-1.46.0.tar.xz 490812 BLAKE2B d7b71d6c611404d9313cdd19959e2a0cb7f035bbd2528db77ccb0030e685019b756216bfbc64885b3641c14cab2f29110492c87047c3ceb1a627765857b19a95 SHA512 14af40668e95d269ac87556c75cf45680c41bc8246f04c46726d34bd80e9344045c0a510567f156c2c25c1f10dd474dc38bd50581d1b2e5abe0daa0cf570e2bc
-DIST gjs-1.48.6.tar.xz 596964 BLAKE2B 8065075ba66a139a76486df24d9c528959d821b4695ee84b5213d4e6b35bdd052c898112b7fb21981c59c24ea9e15bc79258b6d07457df930e94bcba798e262a SHA512 29d70bbee722bbb58eb95acf1409d5e34930d11ebd9525f3b7d0050a13b72eb50e357df7c2bb9bc2ba147dcfdbc2dfb1f1f7b710347473d05cd484006b6ea256
 DIST gjs-1.48.7.tar.xz 595324 BLAKE2B eac8b5b2f7e909e94e3fb305cac443da3f433047ee07fa8fbd15905890f77d57449c8689867df61f1ac849b8b4bddc089a9b1ddc3aa79d4b3d054226c58fa909 SHA512 b8c58e068eaecfca2fa40cebe209fa8058e603809be4307099a0f3dbd561752a540d587d546ffa74aef0268a111f2b2846a1e0febda1adcefdac8c02e716e2dd
 EBUILD gjs-1.46.0.ebuild 1559 BLAKE2B 8e46f9f4a7f06ed43132e023b25203eef301345e8de0d52183edb25c07b79fc1dec1c2285ea5b4b57b4923092e165901ebba049362cbce73c50a377b4a7e5d0e SHA512 083fd06684cd111f77b35f251c9d1418614550947366e838408daa2f214204d530273a2954304f6e3aba092c8160dec9ae581d7422f033cbf3aaaf72ec99ccae
-EBUILD gjs-1.48.6.ebuild 1587 BLAKE2B 7c8f16d8b2f9c7332914a8f828e938ed2fa8de55ac137ae0c7f1793ffd9c044c8b9c311d4fd3a2815c8970db534d90ba211c9b9b8b876990d0906cec369ec3fe SHA512 1ebb3aa24c7164d00f0179f3ec361642ea2b58b080366e018b374eced5680af0b829be8d9d266677b3a8c32557cba8d9c8a97e933142a0933b54d5ff7a29810f
-EBUILD gjs-1.48.7.ebuild 1556 BLAKE2B 86383650e69cc89919e1a9d235a06f76bffb32a1106ee7b7d36b0342c4101a43d0ad3cb207a52bac90181e3e17110d818284c34068e5b2caf1a5a0bac16aef03 SHA512 ed7eacb397017e527378e22efc7d6573baaadda4176a6e660f1715c2e9887686c9e9400bab29a5537e6f29487718ee6049aed1ea9fcd9174c8efb693a955aa18
+EBUILD gjs-1.48.7.ebuild 1557 BLAKE2B d84d484c54d45e13ec2dcbcf2e40ebd9ed98e79ce21e558d24f87404e3c20b0d2e9f4fca374fb1356c8bd989ce4ba0cbb150809bf1154a65d5ed3edada999fab SHA512 d63ce482e8269a8d7d5a4085864d2fcf710b42ed3bed99b0940a664d3694221e01a7a8dbce611af4fa03e8d1abaf807ce57a0d0a67eee8a391bffb79c8390359
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/gjs/gjs-1.48.6.ebuild b/dev-libs/gjs/gjs-1.48.6.ebuild
deleted file mode 100644
index 782d4047a2a2..000000000000
--- a/dev-libs/gjs/gjs-1.48.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 pax-utils virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.52.1
-	>=dev-libs/gobject-introspection-1.52.1:=
-
-	sys-libs/readline:0
-	dev-lang/spidermonkey:38
-	virtual/libffi
-	cairo? ( x11-libs/cairo[X] )
-	gtk? ( >=x11-libs/gtk+-3.20:3 )
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-
-PATCHES=(
-	# Disable unittest failing without pt_BR locale, upstream bug #????
-	"${FILESDIR}"/${PV}-disable-unittest.patch
-)
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
-	# XXX: Do NOT enable coverage, completely useless for portage installs
-	gnome2_src_configure \
-		--disable-systemtap \
-		--disable-dtrace \
-		--disable-code-coverage \
-		$(use_with cairo cairo) \
-		$(use_with gtk) \
-		$(use_with test dbus-tests) \
-		$(use_with test xvfb-tests)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	# installation sometimes fails in parallel, bug #???
-	gnome2_src_install -j1
-
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins "${S}"/examples/*
-	fi
-
-	# Required for gjs-console to run correctly on PaX systems
-	pax-mark mr "${ED}/usr/bin/gjs-console"
-}
diff --git a/dev-libs/gjs/gjs-1.48.7.ebuild b/dev-libs/gjs/gjs-1.48.7.ebuild
index a1e72ae1d191..cf678c8db0cf 100644
--- a/dev-libs/gjs/gjs-1.48.7.ebuild
+++ b/dev-libs/gjs/gjs-1.48.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ RDEPEND="
 	>=dev-libs/glib-2.52.1
 	>=dev-libs/gobject-introspection-1.52.1:=
 
-	sys-libs/readline:0
+	sys-libs/readline:0=
 	dev-lang/spidermonkey:38
 	virtual/libffi
 	cairo? ( x11-libs/cairo[X] )
diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest
index e1c5db087c1e..47bff66242c0 100644
--- a/dev-libs/klibc/Manifest
+++ b/dev-libs/klibc/Manifest
@@ -6,5 +6,5 @@ AUX klibc.m4 3619 BLAKE2B b0895e5d775b2edc497514ce5adffa3824730cebd1b0c9f166a6ca
 DIST klibc-2.0.4.tar.xz 469348 BLAKE2B 5975e3d25f72b70c4cbaa56ea5363417407e8dace1e02e2da0b835bbb2cad56648b0084e5404528206ef3facf4ffd3611e8bd729eadd80b00e30d1a70b3057cf SHA512 7a01d1744b49f3de64111fefc522b1d63f054199acf671254bc046d6f1d0b6ca68e050c99025bf8303751c2466a5e034677555649ae5909c40997858d393db8d
 DIST klibc_2.0.4-9.debian.tar.xz 28628 BLAKE2B aaad6fafb7372152987eebda5951b9f3de2e33da583e0ea7597f666461977f461303566f9e363e9c96994c7b0eb6213c6a17b2fab72df7460db3cfbc0c2e1cf8 SHA512 0fe9a6642be962fa631919850d7eeed5a87c10682766ee10fe31dec2b19a6179e0067602acb26bdc2aa8ceecfd39b1dc95a76f3b0a9bc813b172c0ffe9f0ff53
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
-EBUILD klibc-2.0.4-r2.ebuild 9393 BLAKE2B 61ca66fe69ee754245cacfbebd43e41b3afdc104aedb73dc4fb28a2b738b4048a2f6f8879cab898c094d62acc053cc4bee1debbca70b2ca8fc1d5ebd0e725f0b SHA512 4f8fc87424636ac7d083ce20e4f5da20ae83169bc7186b151ff5caf7dfd1e8ac0642a9f44b90d69984e4c948a7bd4a7b88cdfb07ad2a12e207e15ac675c6b108
+EBUILD klibc-2.0.4-r2.ebuild 9408 BLAKE2B edebd4801c55ddf27208c663f6c53ec331cbfb6ffe482362590631704c5e4cc7645baa1672035ba6d61c2e6dc075ac77bd00a548dd030ca4cac8f615ae0605cd SHA512 9c840e5353ef7ed7dc24caa16f8123b1ec57c12f82a4c8853ab8481444ee5836e26715a13a9a820a2dd1b864bd85eb1685e3f63be205d26b9bb5d35cff051372
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/klibc/klibc-2.0.4-r2.ebuild b/dev-libs/klibc/klibc-2.0.4-r2.ebuild
index eea7eee113fd..0e44a71bc25d 100644
--- a/dev-libs/klibc/klibc-2.0.4-r2.ebuild
+++ b/dev-libs/klibc/klibc-2.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Robin H. Johnson <robbat2@gentoo.org>, 12 Nov 2007:
@@ -54,8 +54,9 @@ KEYWORDS="~alpha amd64 ~arm ia64 -mips ~ppc ~ppc64 ~sparc x86"
 SLOT="0"
 IUSE="debug test custom-cflags"
 
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}
+	sys-devel/bc"
 
 KS="${WORKDIR}/linux-${OKV}"
 
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index bdd8f924e2ad..efa5809ef0a9 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,9 +1,7 @@
 AUX libfilezilla-0.9.2-cppunit-pkgconfig.patch 15391 BLAKE2B a9d72ff20ba52c74e932a347321dd6010c1e39a5e7149d201ce00377521471bf77fcc560c104ac2725892f4ba827ef7be2893dcd19a9df36b5bbad242ff09e5a SHA512 99e8c3ee7784a730d975279521e6e1a5d5dcd63ec0e30181dbfa8b23d080243a77d3a04e5aee124435030380df26df92509a61ff1cce48a5c9c64e00b48c900e
-DIST libfilezilla-0.11.0.tar.bz2 395727 BLAKE2B 7a2854f39462041ccd2fa0ad7ac0b15cb3169bb268b2f9ce68abea69490fd509742bfe22de064aed0ec92777b516cb42d23ca899997979713ebb5d9e3f73d7c2 SHA512 aa5356a8fbb9488072c9d32c7ab2de51de426a97cb30ec8b07c9e55bca351f82d8c4879f413aae05d5a2602bb153c0832f6bd7a71b8510a4957bafe9926d1d19
 DIST libfilezilla-0.11.1.tar.bz2 395868 BLAKE2B d7d0004ca2b64fcfb8ba8121fefffb416bca2c4575c7a47ac9f890e352c88d3b35a5b881a3d7ca476a5b202a01a0d8094a1377f31b4b0b46b064c335781884b7 SHA512 a41ad8b2b0de25cba3283a55344a147383860d6ae7df7a0c634b48c07319bcb8057f84611e5cb98696e1f94856f5901f948c2e376fffe7151e145bf18ab82cc4
 DIST libfilezilla-0.9.1.tar.bz2 383315 BLAKE2B 0cade4316662d64b9a0eb6abd586355236bc2c3d73f3d2ad84fe857a25e593027bbb090f57c8656b8c06ae40d126d93b8310fb0642e2e73d3cace7e560c86837 SHA512 bbcd826675e9c3e2f8cf1cea4da01434a66359ae816efdc5c981fbfebde0b73ce44a6d37546196fc00cb118d9b4d7772b73e30f8d5a78294f97b9899e9ba3393
 DIST libfilezilla-0.9.2.tar.bz2 383522 BLAKE2B e70d23a67a8c365d06692dc27cf76543db75200ebb808e9ad91be95dafb8df2c7603c23e249405b056b7c44bffc527fd84d5a4052e704db63135fb93876d916f SHA512 f825d116e252786801115189f9966ba7ab8663863d921cce530569a172ab33dbc31234d6286b0b3e6edc19ec0a5ba009788382ec5d5359f97a9cb10f30715f88
-EBUILD libfilezilla-0.11.0.ebuild 923 BLAKE2B 4b40f1899648d0c08b747549b1c60df1d87fbd8291d3aadb28278e1d174c749ec641ae9bd3e5b9f6c3d2d811508e14f2bd3692e92a822ac0e0117dde83dcdabb SHA512 a0528f93114da82ee995455260f0e443658ed17e9a0d2771c254869503f9d83e568dd18bd0aa110b991fe32859632ba245e36ec6b9274eb9d22742399ff949e9
 EBUILD libfilezilla-0.11.1.ebuild 923 BLAKE2B 4b40f1899648d0c08b747549b1c60df1d87fbd8291d3aadb28278e1d174c749ec641ae9bd3e5b9f6c3d2d811508e14f2bd3692e92a822ac0e0117dde83dcdabb SHA512 a0528f93114da82ee995455260f0e443658ed17e9a0d2771c254869503f9d83e568dd18bd0aa110b991fe32859632ba245e36ec6b9274eb9d22742399ff949e9
 EBUILD libfilezilla-0.9.1.ebuild 921 BLAKE2B 4c68ad50f7a65b85281194981fefad1dce5a958c4066312a57f1b492f5c5784ea0636ae32565a343674eba4bd06f389b019329ff9c88a5385bb80efab027b1ec SHA512 73c7ba2f0180dc26580e0e0d9226b1a8dfa70818720e8bbb78c53fada8ec68e690278859416694aefd7fe69178b401485e4da48591da96b4f848cc34b18b6bd8
 EBUILD libfilezilla-0.9.2.ebuild 1065 BLAKE2B 3c19a20507b7fb350bd3332104b51c91201b4e42935a3f93a3ec3cb41ae88f601ddc01c303f9a1a216c21a4d82a1ca780ecd9e2d5f63aa74b98df361e863c10b SHA512 880341a0f71b1bb08b48c9f7e6fe78dbdf8197e62faf9f82cafabf561e675b01f4f084d409eb815ee509c99c4da2ca88acbf92638c88a53dd23cf3456e3e4572
diff --git a/dev-libs/libfilezilla/libfilezilla-0.11.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.11.0.ebuild
deleted file mode 100644
index 31545f46bee8..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.11.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="mirror://sourceforge/filezilla/${P}.tar.bz2
-	http://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index d33cf0f4ad5b..2d3aa399ec3a 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -1,7 +1,9 @@
 DIST libpqxx-4.0.1.tar.gz 1582532 BLAKE2B e84f455de3cdce1bbcdb29ae0ff5fea6e5c624f910a3612976eea1f50e054b785b9b7f2b816fa5d0e11ec4f53498404eb2ec1d9c80fc60a8be27d0e0cef0de14 SHA512 00204985097ef8bb0a3376d6ba541dbb471d7c52d7135f6244a9f4acbf6c8e5254d6f813e4411421e49bb56f4a520fc6ac67e300141d724396ce0ac11bd3a95e
 DIST libpqxx-5.1.0.tar.gz 677998 BLAKE2B 5d486beff9d45249d191b380b2a552dcab621c0509c318e8745abfcb5d6d30b0c31dbe3431fea0c1c212b7a3d6d48abf15d537c6f5a6b3869963dd7615f3e4d3 SHA512 4e881bb509b36b6b48d18dddd0895ab6864ba0430630d3e1417036ff8ff0008b446467868f2672e0b49b46cc3a86c6a61a8a3e5c6b63e0bf422be3268d7f9702
 DIST libpqxx-5.1.1.tar.gz 678031 BLAKE2B c615094b7d872355ad45eb49c3f2e9776f314bca0fbf393ab9ec96daeae5732082c9907eef4793f575cf2cbb95ffa30e1d83cbfb9c4a2938019d9d207ebcc9cf SHA512 fbbefe37d01ef58dd7f73629b5174c7285c0fe7d2f2ae10d3118d55d944f7e92b88d0e9c8ac72425c3bc55bdcc12f3e110e1974b303b7fb227be805e935982dd
+DIST libpqxx-6.0.0.tar.gz 676528 BLAKE2B a40095ba9851acde1296d93af7e4c4414f334a734b5062874b63a146836105fdde24672707caf623f2073dc1caf87b1053f25c80b10c3fa779fc91a52f9ec7ae SHA512 f237cc03c01a8262eee44a9428206c1cc11b6034dddf540afef145f58eee5c32b880d84832563480d73d834c24311170e2ef6789e100793afbe0b6e393bd4169
 EBUILD libpqxx-4.0.1.ebuild 2332 BLAKE2B a6d7affcddc3930d4a789ee7f7ae2cb2b1c1e823465a02dc8385930ac3951fb39bac8e1e85fe4dc577f02303143a26629aeadc98b05ad9f98a1b8687cda5412a SHA512 6d01421a6f56b160e51297cb02d73f5c0ad5c197a5bda8491efee96c8c46fc1cc0d792a3b3f21d9898e3296eadd5511e3be7b9e8482598db8b28ddf443c33b0a
 EBUILD libpqxx-5.1.0.ebuild 2182 BLAKE2B d92910a7f05c82109dc98d40a66ec1837b57e820250f784a16a85073979c1708588a3e5c02b9cf2c98a559ae0231029069365860fc520a9eab083f98ff049179 SHA512 9cd97b0fc56f25b52409886a37e3faa477c93e0723274fdbaf2ae7659c57f8df93e52309c95d3426d0734a6574d5bd1d75c12233b2ab8841b5bd68d33e95f49b
 EBUILD libpqxx-5.1.1.ebuild 2187 BLAKE2B 6bb232930a9db7762a0cc34301c31b691c9cd744dff027a32906891e253b0efb9a37b5edd337fc40548d370058339e2738b015212b4d742bcb98968c3df2d4ba SHA512 399b8ed2100dbef667be36a03df5f80793408ccdc33aeacbd44dcd41e413937676fc5e84535d4b5a0ddb426982f92d188095a953b92104e0c9b6df89d36e7c86
+EBUILD libpqxx-6.0.0.ebuild 2187 BLAKE2B 9e2561a9ee88c4a88033227426212c15f43321dea1f792cfa561b4875668fd46a9438f52e81bb2cb3f9ef0c1fafbccf36a864d8fd5d529cb8a1e3ea63ea389de SHA512 6a802cae61aedd1709c8746d6e8e0d78c1b3ffb8dd77f147cbb0c3951390bf3c1565e7a60b514f9ec016df0bdf13d1ab5d03edc9c21192a0120d7cab35afb026
 MISC metadata.xml 597 BLAKE2B 2371e4c701506d5e8b4eb0938325a6cd909ad874badbc000a7ea831d2e7ff55cf1b6f4fbb3ae09f9392850319f9cbbbde083492a20cf1209e94139f7b1ceb927 SHA512 c732dc922e3ac9e63a373dbe8b53ef8fb93d87c7cd91a1db1b94e89fe33f3109b818cf0730df36b00f2abf1dc554e1bf261f39db807cf61775b8177db231d37f
diff --git a/dev-libs/libpqxx/libpqxx-6.0.0.ebuild b/dev-libs/libpqxx/libpqxx-6.0.0.ebuild
new file mode 100644
index 000000000000..28955cdc8416
--- /dev/null
+++ b/dev-libs/libpqxx/libpqxx-6.0.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+DESCRIPTION="Standard front-end for writing C++ programs that use PostgreSQL"
+SRC_URI="https://github.com/jtv/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="http://pqxx.org/development/libpqxx/"
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc static-libs"
+
+RDEPEND="dev-db/postgresql:="
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	doc? (
+		app-doc/doxygen
+		app-text/xmlto
+	)
+"
+
+DOCS=( AUTHORS NEWS README{.md,-UPGRADE} )
+
+src_prepare() {
+	default
+
+	sed -e 's/python/python2/' \
+		-i tools/{splitconfig,template2mak.py} \
+		|| die "Couldn't fix Python shebangs"
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable doc documentation) \
+		$(use_enable static-libs static)
+}
+
+src_test() {
+	einfo "The tests need a running PostgreSQL server and an existing database."
+	einfo "Test requires PGDATABASE and PGUSER to be set at a minimum. Optionally,"
+	einfo "set PGPORT and PGHOST. Define them at the command line or in:"
+	einfo "    ${EROOT%/}/etc/libpqxx_test_env"
+
+	if [[ -z $PGDATABASE || -z $PGUSER ]] ; then
+		if [[ -f ${EROOT%/}/etc/libpqxx_test_env ]] ; then
+			source "${EROOT%/}/etc/libpqxx_test_env"
+			[[ -n $PGDATABASE ]] && export PGDATABASE
+			[[ -n $PGHOST ]] && export PGHOST
+			[[ -n $PGPORT ]] && export PGPORT
+			[[ -n $PGUSER ]] && export PGUSER
+		fi
+	fi
+
+	if [[ -n $PGDATABASE && -n $PGUSER ]] ; then
+		local server_version
+		server_version=$(psql -Aqtc 'SELECT version();' 2> /dev/null)
+		if [[ $? = 0 ]] ; then
+			cd "${S}/test" || die
+			emake check
+		else
+			eerror "Is the server running?"
+			eerror "Verify role and database exist, and are permitted in pg_hba.conf for:"
+			eerror "    Role: ${PGUSER}"
+			eerror "    Database: ${PGDATABASE}"
+			die "Couldn't connect to server."
+		fi
+	else
+		eerror "PGDATABASE and PGUSER must be set to perform tests."
+		eerror "Skipping tests."
+	fi
+}
+
+src_install () {
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die
+	fi
+}
diff --git a/dev-libs/libtermkey/Manifest b/dev-libs/libtermkey/Manifest
index c421c63a3516..dae583d7e892 100644
--- a/dev-libs/libtermkey/Manifest
+++ b/dev-libs/libtermkey/Manifest
@@ -1,5 +1,5 @@
 DIST libtermkey-0.19.tar.gz 43148 BLAKE2B 652745171dded4a26c9c6557b8e97b390922a0ba9ed3e2f82d1d6255dfd7e73508ccf3581e2cd2b96115d4778a7b2c28477ae2e8795d14eef51d763d0a23733e SHA512 052ea6bcc7e440808e90e2f4912370985f3429866539a01f28676f1deb29381176bfa43de4c54ec1fa2682b399432c7a85c236c9de648a3c0f60087d2908e2d1
 DIST libtermkey-0.20.tar.gz 45167 BLAKE2B e51a0c91efce056824ee56918aa6a794096e1f19e02d04278c0f3e82382055f16b0413c9f3832492677fbb68bcc1803303cb4c8ee8dc7363276dfeda3e5a6e4f SHA512 81a4bc5917c60ca692ec3065ac0252ae5dc1adccc2832be1c83c82318c97473d883900ab88a8a0ee08ab3f831ff07f3a4827ee3d8e936a3a42c4708ee58f6301
 EBUILD libtermkey-0.19.ebuild 895 BLAKE2B 1c68afb92e259a7de42d2d3bd48ef26240ef079037de7e2ceaa21e0a7fdcfef3ea47dda13462addab9440298c723e5ad372559f4c3ae805b3e31a08e844c5d6c SHA512 7b7fe1baa9b808c9e6a4da1ea635de605dc6ba958bdc937c29153f2ed1eeb67d0c253b15975a6dcf932340c658807605ae7ab9bd2eeefd6b6b4ce3ce49888553
-EBUILD libtermkey-0.20.ebuild 967 BLAKE2B bf1239bc524f8b1616e555e6b2836c6ff8017af9b9d941ccacfc8868160ebd1c4404bc7894bbdf4ceedd0fccdf6aa15b5b4d325af215cec07856058b0a52ae97 SHA512 0fd57a879ca3666c60861c72e42e7ac1aeba79d75830e12d0f66285ff983ae9ce198410386143735917a7d0cacf82de3acc7e9fb9a28de707e6c3c49c38c40a4
+EBUILD libtermkey-0.20.ebuild 965 BLAKE2B 1e16f410da62765d9818cd526aa1e2cb5e88f96940d17bbd21c9d90ca7d50787825f0115a633dc4803be5e37d2cf39945c84d559a21dc22ca0ae62f1ff6fcae6 SHA512 a738569e408342f8605d32dbe96fda1f4843a39efe49f998b981b5d4f3d78cacf2e2be5832603704aac66c6a9fe84fc052aaea925196298721d4f69380bf641e
 MISC metadata.xml 357 BLAKE2B b658c2de2a5bcbf02faff436d83266b842ab4217adb954f71f0543e5be5f791e48c97f4299e6c97e1338b0a2ee3937136062d0b80c1c8cb09deb3cec8d7add13 SHA512 0b48ba4931f32eda8d9c162693389fc65a0e0eac83b8f2f0dda2e58cabcd93a2bbf301c86c12cc0b2d89ed2c19afd82bbc3a54da9ab3e3f8c615aca24290dfbd
diff --git a/dev-libs/libtermkey/libtermkey-0.20.ebuild b/dev-libs/libtermkey/libtermkey-0.20.ebuild
index dfd18c20e65d..6dd0ea0eb31e 100644
--- a/dev-libs/libtermkey/libtermkey-0.20.ebuild
+++ b/dev-libs/libtermkey/libtermkey-0.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="demos static-libs"
 
 RDEPEND="dev-libs/unibilium:="
diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
index 35999d3ac251..79521a2cfb33 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -1,5 +1,3 @@
-DIST libvterm-0.0_pre20151022.tar.xz 61140 BLAKE2B 9a89b2494cdfb739e40bf69cb274b88ee4fc5ec4ecfd8f3377357c2c0ce3bbbc3aa1619862b70d8c7f36fb69955e671f3a77a4f7f2ad5cb89a02f60ddfdedbb6 SHA512 d8179493bb6185a45e4565190d21dc08dc0d279945e898b2cc12cecca9c01b8d8a4ca24bb363861c1edfb009fab7ac2b2c4739393953efefda7616228ffd3bae
 DIST libvterm-0.0_pre20160305.tar.xz 665672 BLAKE2B 3f86ada9967f8c5e085ef324330082858c27b07583af2fa4946f74f3edf3bc697cb3335108df89a6de7f058b9649e82fc85b133084c0c8212a98e5f8adab6ce8 SHA512 7e9a44ae679b8c7216f019c0c6b90f1b762f051f58fdb349cfa2a3b2df606940d891547fbc24f05ff32a33e4749242ce8ee2af214b7b3623b83a9f4b9fd53585
-EBUILD libvterm-0.0_pre20151022.ebuild 763 BLAKE2B e40eba6ce786b642c4c8340aa354fa1e19e239bf86c637f467e8f5865588df2730468864b70141c6a4dadf0bde09893edd598e52eb8e18104e19c26306e838cb SHA512 d2e7af182ad1e67963eaf9ffb0322ae1c3cc04303e7e8ab063a71ca52dc4b0b954e1e4eea9180dab7b79a48dd1bf45311f77aac92adf03763707c221f6b7ca31
-EBUILD libvterm-0.0_pre20160305.ebuild 763 BLAKE2B e8f161b1d1a0d883126ecf2ec0b95a6ab9e84ab19952c5ca475ce7da7b3af5611d508ed67a36be0d922006a19985f1d530e878dca43410927972b4f093b0fb01 SHA512 474981531b51bad001fd55ff62467a6524c4cfa80a9a13afbb070acd8edb9049aee832382a6cab28c91c5402ef5ab2c82472e05e895ee7580fee1adb3fef8b08
+EBUILD libvterm-0.0_pre20160305.ebuild 763 BLAKE2B 5eba9e60a96c6197e0630c4f324f1fe4803ddc24c5e0a2113fe48e3135e7b3dbbc22f3cd7be57851f37e2484516e044c42a623560580281f3e33e3f4f0e5321f SHA512 b3314341167cd00f0e849e566da865acaf84644f82b0370a87e25b5f1384919b35ede81d65ce3fd30302e294c0beeeae1dec06ad324ea886bf83596cf4ba4644
 MISC metadata.xml 255 BLAKE2B c3c51ff357cdf3ea565d7f4bf7cb236342061e471b67eacc0a436c26d52532ce7499657a76fc92a845321318a65f9eb877573104341ddae66dc3a554a35f7362 SHA512 305ae93d2bb3da79ee181cf36bb0ca2bbac016c20555967d7281cd5c0edfc26c1450dacd7a7de57078650dab0e815be9169c0b25a24d71488185f71ae8834167
diff --git a/dev-libs/libvterm/libvterm-0.0_pre20151022.ebuild b/dev-libs/libvterm/libvterm-0.0_pre20151022.ebuild
deleted file mode 100644
index 07a6b973cf82..000000000000
--- a/dev-libs/libvterm/libvterm-0.0_pre20151022.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
-HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
-SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-devel/libtool
-	virtual/pkgconfig"
-
-RDEPEND="!dev-libs/libvterm-neovim"
-
-src_compile() {
-	append-cflags -fPIC
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" install
-	prune_libtool_files
-
-	dodoc doc/*
-}
diff --git a/dev-libs/libvterm/libvterm-0.0_pre20160305.ebuild b/dev-libs/libvterm/libvterm-0.0_pre20160305.ebuild
index 4b9388171f69..65353c8e11ac 100644
--- a/dev-libs/libvterm/libvterm-0.0_pre20160305.ebuild
+++ b/dev-libs/libvterm/libvterm-0.0_pre20160305.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=5
@@ -10,10 +10,10 @@ SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 x86"
 
-DEPEND="sys-devel/libtool
+DEPEND="
+	sys-devel/libtool
 	virtual/pkgconfig"
 
 RDEPEND="!dev-libs/libvterm-neovim"
@@ -24,7 +24,9 @@ src_compile() {
 }
 
 src_install() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
 		DESTDIR="${D}" install
 	prune_libtool_files
 
diff --git a/dev-libs/qoauth/Manifest b/dev-libs/qoauth/Manifest
index f8e46e64b522..805b0219a921 100644
--- a/dev-libs/qoauth/Manifest
+++ b/dev-libs/qoauth/Manifest
@@ -1,7 +1,5 @@
 AUX qoauth-1.0.1-disable-ft.patch 629 BLAKE2B c466bf98a007c645b4b38e804dce9454954b92307c268d96ac2d8db3991d70eda2b41a44628533c7191df5f1c11c2e363e78f522b535a9921d32fce5733b4080 SHA512 04d06d1989866e208510f9c726fb3a447df2020ba0c7ec169534b39075343c03e05f2dc854696c87cd007ce980dc747f0658d8e88d0ef96b77dc0c70dae923d7
 AUX qoauth-2.0.1_pre20160315-prf.patch 312 BLAKE2B 06da99ad51db25d6ff8069bb9e202cb7997b1fc7ee1d657386ccafba26d57b35b4ae22272e31ab5f71b615d4cd8ab7824be01f795e52a3dec5b82a039fc97758 SHA512 2bdd73d0b43325359edcff59d717ec18b2fc87d720d068cc8e8d04ef25eeb213050ab5ebc7991ec59c91299a5c49a2b727a5e5ad11677641b17cbd424092753f
-DIST qoauth-1.0.1-src.tar.bz2 42298 BLAKE2B f524a0ab873578e0699ba62b8ca26a9eaa432e981bc4123f145da5436867dac39947724ad4590fb2a8c4b1e9f57d75bf31c691f01217ee9bcb17ec10554c28c1 SHA512 86869c82e6efd490888f3bb16cba5bb014821e35507d3d396a84f5112a2d0bd7cb1251ba5dff82a8913eeae77a0feeebfdf4a7d1e9870023fb3c106d603c3dd8
 DIST qoauth-2.0.1_pre20160315.tar.xz 45604 BLAKE2B 290d768e8661c6e8f9ae8094ec140da22f00c53cbfd9ed6ebab1f159ae82c2a0a111a9306eeab0c08ea5b0a349e07d9b7f402f14812a5688ba9860832991494c SHA512 ec44c597c7b9729645ab98e2c71c805d01eab4c0684b7ea0da6b015a052b0ad6e3aa9352ef53e36a67ff99b9f75fb9b89156ca8b23c639a70cc49aab656366c3
-EBUILD qoauth-1.0.1.ebuild 1417 BLAKE2B ffe9339b53aaff507fd12516cb93ab28dc786f573e0cae8cb219433af3ad608ae55d7376f9c58e86a44169c4bee748b6ad3d0d70267166e12d95e93094bdae1d SHA512 f119c5bcf1d58f811792ed0971abf67a75a3759c0f1356d72c96792a4b1d7197cef2ffc1b3b5193c42f0afdafd2b17625b157847003bbd143ca89b5ad634450a
 EBUILD qoauth-2.0.1_pre20160315-r2.ebuild 1322 BLAKE2B 25ad36e73832c9cbd376b335924aeb9b5981443c007058ddf5348bad5aef0a81a9c896c7cd1a361b9765774fe05c5f1cab6493f1d9078fe19eada17e19abce6e SHA512 0572f6e926b9139e680cfdca73727f1690ab33d466d631375892d2b8ba8419e49100842e40f090096a8e13909db51c7355ac7fd813d71a5376c7cb05058de8fb
 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/dev-libs/qoauth/qoauth-1.0.1.ebuild b/dev-libs/qoauth/qoauth-1.0.1.ebuild
deleted file mode 100644
index fb045417507e..000000000000
--- a/dev-libs/qoauth/qoauth-1.0.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit qt4-r2
-
-DESCRIPTION="A Qt-based library for OAuth support"
-HOMEPAGE="https://github.com/ayoy/qoauth/wiki"
-SRC_URI="http://files.ayoy.net/qoauth/release/${PV}/src/${P}-src.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="debug doc static-libs test"
-
-COMMON_DEPEND="app-crypt/qca:2[debug?,qt4(+)]"
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-qt/qttest:4 )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-crypt/qca:2[ssl]
-"
-
-S=${WORKDIR}/${P}-src
-
-DOCS="README CHANGELOG"
-PATCHES=(
-	# disable functional tests that require network connection
-	# and rely on 3rd party external server (bug #341267)
-	"${FILESDIR}/${P}-disable-ft.patch"
-)
-
-src_prepare() {
-	qt4-r2_src_prepare
-
-	if ! use test; then
-		sed -i -e '/SUBDIRS/s/tests//' ${PN}.pro || die "sed failed"
-	fi
-
-	sed -i -e '/^ *docs \\$/d' \
-		-e '/^ *build_all \\$/d' \
-		-e 's/^\#\(!macx\)/\1/' \
-		src/src.pro || die "sed failed"
-
-	sed -i -e "s/\(.*\)lib$/\1$(get_libdir)/" src/pcfile.sh || die "sed failed"
-}
-
-src_compile() {
-	default
-	if use static-libs; then
-		emake -C src static
-	fi
-}
-
-src_install() {
-	qt4-r2_src_install
-
-	if use static-libs; then
-		dolib.a "${S}"/lib/lib${PN}.a
-	fi
-
-	if use doc; then
-		doxygen "${S}"/Doxyfile || die "failed to generate documentation"
-		dohtml "${S}"/doc/html/*
-	fi
-}
diff --git a/dev-libs/unibilium/Manifest b/dev-libs/unibilium/Manifest
index be382087523e..5a14c917f538 100644
--- a/dev-libs/unibilium/Manifest
+++ b/dev-libs/unibilium/Manifest
@@ -3,5 +3,5 @@ DIST unibilium-1.2.0.tar.gz 88488 BLAKE2B 47615a1c9e5a7f2e03c5b5f852b8d53bce047b
 DIST unibilium-1.2.1.tar.gz 94966 BLAKE2B d449accb3bf4a24049b0e4878ce6953c9082103ff40e9f79c59a848651e9595b2eca508a29d51a60eaea5ea38de9189b990e36ca77f1986ed87beeaff96db56b SHA512 2a3e92051382cd427220f6994a49ab10966fd13e51d1ccb437d695d5556ede8ee8d1dc0e0f92871ca48c559abd6f229599df3d1c1a2d2f80fb0820686280ce79
 EBUILD unibilium-1.1.4.ebuild 672 BLAKE2B dfd5dbea39d0f3b49faf9a81b5d6659af1c10d0d8fb50e1dfd81c99b81340bcdbf08259174d486c5ab539400e2c207955e6710bad83f284108e10432f9fcbb4e SHA512 286bf13e85c9c719caf3c004ff2a6a9f5e96533c4a6496af7365bacf303872bd77d1c687912e07a29c4e4123dc98d6c0cda6c0678ab224b6edf0614bdcff169b
 EBUILD unibilium-1.2.0.ebuild 777 BLAKE2B edfb4a3eff49280a9d192482dbec092c2245b7ba5c78b1bbb314116a8b9dd03c886fef53ba3820f8a845c7af79f025dbecb658b4ad214609c214df54cf9ebec3 SHA512 9861c12d38def779606ef9b1c3bcf06c6c266dcedfc11b6107ec4596c91c5b13abdebad0af3cd1c82bd502cb5d7cbd9a7a188c8fe57fdb5e3c4dd06b84f4fedb
-EBUILD unibilium-1.2.1.ebuild 777 BLAKE2B edfb4a3eff49280a9d192482dbec092c2245b7ba5c78b1bbb314116a8b9dd03c886fef53ba3820f8a845c7af79f025dbecb658b4ad214609c214df54cf9ebec3 SHA512 9861c12d38def779606ef9b1c3bcf06c6c266dcedfc11b6107ec4596c91c5b13abdebad0af3cd1c82bd502cb5d7cbd9a7a188c8fe57fdb5e3c4dd06b84f4fedb
+EBUILD unibilium-1.2.1.ebuild 774 BLAKE2B cd7373f901fd4994bbf761389a8a04be3ee90d07b6a7e0fa634e46e2e1e031744a723c68b6511d1726218ef1715bac696a9242ab182974f579b0f389a1f043d2 SHA512 7865158eb602aaf3fde2f29b38b8f3f6b38c77033e442c84eff4d4136c15075eeb40c613b93303c405d33e9057c4c49453ceadaba2a83d8a077aded42a52ee50
 MISC metadata.xml 339 BLAKE2B 36a1748f4030bc835201a0001ddf70b7ee4f1a73703c40a98650df0ef8b7e48e8acf3bb2272232ce528e2794310908214f1f9d9ac3ed75cf5bfadac1bd1cf19f SHA512 27c4da145b68654f559c956b5414a877ff9ca54a794390e690e1c11596dfda61d4d2ebfc3f891593f40c42f4070dd802ae7c73a9ece69e4c9ce0c1f76873644a
diff --git a/dev-libs/unibilium/unibilium-1.2.1.ebuild b/dev-libs/unibilium/unibilium-1.2.1.ebuild
index 651c9d14afe7..727acdee1e7c 100644
--- a/dev-libs/unibilium/unibilium-1.2.1.ebuild
+++ b/dev-libs/unibilium/unibilium-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,15 +6,17 @@ inherit flag-o-matic
 
 DESCRIPTION="A very basic terminfo library"
 HOMEPAGE="https://github.com/mauke/unibilium/"
-SRC_URI="https://github.com/mauke/unibilium/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/mauke/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+ MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs"
 
-DEPEND="dev-lang/perl
+DEPEND="
+	dev-lang/perl
 	sys-devel/libtool"
+
 RDEPEND=""
 
 src_compile() {