gentoo resync : 10.11.2019

17 files changed, 389 insertions, 66 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 1f1756e853b8..60fe43fa26e1 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/nitrogen/Manifest b/x11-misc/nitrogen/Manifest
index a2497d869fed..52c94a763fac 100644
--- a/x11-misc/nitrogen/Manifest
+++ b/x11-misc/nitrogen/Manifest
@@ -1,4 +1,5 @@
 DIST nitrogen-1.6.1.tar.gz 314332 BLAKE2B 4e2ce39a770434e35250cc2ff2bff792f3943eef489a0dc9b897b47fb98c3791cf633974ded2481b6e29ceb00f26964115254cc047041e77954563e82c7cd44b SHA512 125bb62162da95c3aab8c146f93113162c171512ffd3e8e6011fff22f1a1b841d1ffc9b4df4fd1b0b62a3731c68cd30c8448dbc836e9861216f50068d8b08c9c
 EBUILD nitrogen-1.6.1-r1.ebuild 990 BLAKE2B 9112f03b3711858c11d82b5ef9b7a3affdc87c0bedcfcbc0bc00bdbc3660c419dbfb7e1fd8e748fe0ec54e3fac9b7f59280a54b6d1deddb18df5e2eefd457859 SHA512 a7429f2f9678801dd8af97761da0d248fadb39f71959db026bc834f5c58f510df6d8e3364d2fde5c146b09610a2a5afa7a49e61404be31a7339dadb5c083b77a
 EBUILD nitrogen-1.6.1.ebuild 930 BLAKE2B 79555c78a52cb219eb57879ea93c6bd42bf6ac3aa73c7b91e1c8170d0d7245bfbcf469ea0a482f0bf855a392a9378258800109d669d123a60e4f9add088b2e04 SHA512 8c27a5ff194a32869eff972bf3754add2f0b65d2b3b3c1aa07d960f0e55f1c6a1ca7207e03b574b3640b10605f60ee4dbce2980417d6f8446b64d270d31974dc
+EBUILD nitrogen-99999.ebuild 951 BLAKE2B 593d5517c0a3cfdd367dbe884302708c9d63ad83b7c0cabceda61d2ec4a5fcc15f5aad86163bcb51e71a6603cd3630214826fcf9af66aac42fbc630d323c3f70 SHA512 dfb30c112a5bbf409ad322dc084ae9d0c6ec15e001b19c21735d1d416486528c7d7a47f1a767fd49e514789ee20e0e8f0acc3157495150a2eacd11647fd98acd
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/nitrogen/nitrogen-99999.ebuild b/x11-misc/nitrogen/nitrogen-99999.ebuild
new file mode 100644
index 000000000000..dec80fb27a1d
--- /dev/null
+++ b/x11-misc/nitrogen/nitrogen-99999.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic git-r3 xdg-utils
+
+DESCRIPTION="A background browser and setter for X"
+HOMEPAGE="https://github.com/l3ib/nitrogen"
+EGIT_REPO_URI="https://github.com/l3ib/${PN}"
+
+IUSE="nls xinerama"
+KEYWORDS=""
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	>=dev-cpp/gtkmm-2.10:2.4
+	>=gnome-base/librsvg-2.20:2
+	>=x11-libs/gtk+-2.10:2
+	xinerama? ( x11-libs/libXinerama )
+"
+BDEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	xinerama? ( x11-base/xorg-proto )
+"
+
+src_prepare() {
+	default
+
+	sed -i -e '/^UPDATE_DESKTOP/s#=.*#= :#g' data/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf \
+		$(use_enable nls) \
+		$(use_enable xinerama)
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/sent/Manifest b/x11-misc/sent/Manifest
index 8456a44c8533..3605ab344577 100644
--- a/x11-misc/sent/Manifest
+++ b/x11-misc/sent/Manifest
@@ -2,5 +2,5 @@ DIST sent-0.2.tar.gz 13479 BLAKE2B 0641cf856450af5a451b5b122feaddc884512ad5e068f
 DIST sent-1.tar.gz 15285 BLAKE2B 97bd71ff355b51a809e62a0a0a6c602550adce2331d53d8e2eef86fabfbd6c3122f93d431a670479fd22ec2a7c37880f2b464e453780ce1a965143ef83c47f07 SHA512 4797468bf949de507662253eac1ec80f566553051f407a55a88ccdd6544532c0d8d0f51bb11b88bdff78e6630519558049569ac0c9d3d8279f243882653ef1c0
 EBUILD sent-0.2.ebuild 702 BLAKE2B 03b51aa2e154afdbd8c31d551f56e641720f714913647b6bf786d2f54e50637e31d5bc306b557c72c4834a20c5bff9b00f9c82496bce3e81cbf6ad38a52b40f4 SHA512 af2e3a329548c1e70b6cf0c27252f3b6e7e9176761e264bfcb19d41ec1621d82962e6d5931946105d9ccc6eedd55e2df4e04f321076b2eba37a26f2ab5b31c4f
 EBUILD sent-1-r1.ebuild 757 BLAKE2B 65268e220629350ab5a541f8726072e534d054b484e9ee4947f4c1d3e1e1c4a28fb05c08746adcfbd69f2036b46675e6d18f0a3a13c0c523d741d81cc866d8d3 SHA512 78dc5847a75e1a09c21f5aaeb56b0587d3594dcbe3a97bab470e3a5b4e60ff65a68371ed239320d194cf57636c6d29cd70914a2652f9fb80b33370efffc0f0ae
-EBUILD sent-9999.ebuild 740 BLAKE2B 509f90a8aeca5c46d8735c7d331b973b562b82cac329da2760d52d3444dd3e8c7e7b2f42bd13a642fed92a891720a0112a17853c624aedd06ba177920e4b6c48 SHA512 e29a30dc06a938ac5c72dc16865b2e9218461138909bb39dc70d14dd3b2e20549be06b5f1e9c114a2a2a717a93e2f42d98d18e0bedad3ad103e6ba6db58f025a
+EBUILD sent-9999.ebuild 737 BLAKE2B 11237d6702a9ec44a088397e363bb17ea954af778721e651bd6c4faf09976506e32c52c0acc2a745cce25eb4c5f32b4c66bd8b364d87f16682dfca411f92a24d SHA512 c7bd1af6fad3a4a59133d66faff93390576a7808310d7532fbb47dfbc2c5b4157163a1aadfbe34acd2019c570e3f0d10cc5e8c81dc080b89759796ff1352f8ef
 MISC metadata.xml 385 BLAKE2B da07e1a364f8d7bfab3b67f730b66f213d3be504a23f0ef4b724e021ca5e9475df65a68131a100d02d631f9572f5f3aede20cf6ddd755771e68433837f17309d SHA512 33686894bc0fd21279a825a7a505106da89f92a881c90b4e7ea1f6f1d7ce6632fa2976c211db3c6aeabc999146c863d193adb27b0fefee8b6fb0b536a613db26
diff --git a/x11-misc/sent/sent-9999.ebuild b/x11-misc/sent/sent-9999.ebuild
index ad9a0d7e799b..95b2d9227ca5 100644
--- a/x11-misc/sent/sent-9999.ebuild
+++ b/x11-misc/sent/sent-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit git-r3 savedconfig toolchain-funcs
 
 DESCRIPTION="Simple plaintext presentation tool"
diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest
index 135f4156354f..5bc8b273e9d5 100644
--- a/x11-misc/tint2/Manifest
+++ b/x11-misc/tint2/Manifest
@@ -1,7 +1,9 @@
 DIST tint2-16.2.tar.gz 537236 BLAKE2B b8ff236f4c21465603c3cdf1e3d9f62e238cfbd05fbb7976e4f90ac054566eb433d8be78ee657421b94465dceeb8461ace202090b08585693f13003d401e4faf SHA512 0e267d59aef3d812ab41c1e5904e3e96162afd8d98c76dc697fe8c2815707f34a31e392f68260311bdc66fcb4c0b1766ad549ff30d4314e6ab2e2debf069cafe
 DIST tint2-16.6.1.tar.gz 546590 BLAKE2B 0e970293b09ba766d795b7bc454f06c7a9e95a7c3534144583f5739fd275d3fee2568677f24b5d9b0809ebbc466351cfa17f91dbb726f5cdae3a0bdc9b9df16f SHA512 ae3b8c7b1573f7bb993a587a125341e4018ace605b4b357a7d633beb02e7622443b92cd11b95028d4704e94211ae9f2e13e89cd3bca91474e7daba2fb9fc2b46
 DIST tint2-16.6.tar.gz 546960 BLAKE2B 083e29d754c1faa9eff50dc480d18df99d64f44a2f88673f06e659d55de13c074eacf4614a57211d5b5aeec3a10f3d68471212d24a7280020b52fe91777d305d SHA512 f81770f330d3f2462292f726a6a90ac0182c518b2db7d79f098babe52863e5ceaf4293f975708f83fbc26735c79fdfefd110102ef0f4be45ae242b4f664d72b1
+DIST tint2-16.7.tar.gz 551525 BLAKE2B 890018f219cac86dcfdacb292799ef83a4f039a6c617bd719d57eed317eb5882889e5241283aeccccd3eb174f3d20a5d2468c138f613ad62503a9d365a54c59f SHA512 7f0a7bf8514d698df078fbc4103f82ba926aba3eeef709cace35de1a5f5dce0ac00eede7445e62ac19ef7b84da9fbe7dd61c65f3fc4436bf34997bdee511c5c3
 EBUILD tint2-16.2.ebuild 1273 BLAKE2B ef37602f6f90f16fe0b6fef490bed60e55b326437d925cac0187df093c16b0038eb2e7460db16bb8f02881a797064510076ac7f8f99e26a43e6b85fbf4ea8f4c SHA512 329bf5a8f20b644e6fcc5e382cc72a8d1fa3766f66e302c3648d59c7f9495efb3babe31848772116320dc0df23f687d86233859fafd54f762a46aa26e2db132c
 EBUILD tint2-16.6.1.ebuild 1275 BLAKE2B f8cacb894d6955a00e3432a2ebc3de37faefd9e1c07a6da5da3cf288d7382a63252bf5b88ab87c085b3eb2616da7b133e15c04212407df5133b36ca33f92f472 SHA512 82db6f40551561c1ffa5fd315380f929f3747de63cedecf7e2ea66845db444aba2dc350b4dfd32f90172af750917e3a5a28044d5a7fceb08414e944218ac0893
 EBUILD tint2-16.6.ebuild 1278 BLAKE2B 0f8fff73d71aa594f162e951c8258a70902b303c7db43ae3d9a238f4a2d92e04cf160791f90e8648473012862cd86351a16256ac4aacc57ebd4e8a9afdb60288 SHA512 f80543332fd3602c29423d8420b85afa8b1d2f3e55550acf54151dedab7405e587b7e5cfab6874fb5fca1eb9c7eb0dd3343e21fc11461fac65c12d3865902419
+EBUILD tint2-16.7.ebuild 1304 BLAKE2B 5d5c14c66aee6484b50f0cf20b8a886f7daec06ae8ea5c7f59310f2a152e2efb138a1c911894042ba1e93cbac97c11fc53d06c853efc70c093c92f927970af8b SHA512 92c823c990d1129a66707559d935e14bcfea0c06e473af9cacf2781c3850aba8da6f19a0111f2a3bf4369c5342c761beb8b0519e62c8acde13c7b81aa9077043
 MISC metadata.xml 789 BLAKE2B 95159a0de8a09e4381a7cccf494554faecd8ca1e20e3d175eeb1ef76015f7609a3fe6cbbc0208414b7b703d78339b0a8b643263766269e1e466506ee25a4cbe7 SHA512 e50c127a10ae89a7ec04c7b3a1d5dad3fd1ca89ac37b66378d8b24921d3ffe43ea4037182e20a624880be0eea527414e3727726e6799bbec4d46e2d3bdc934cf
diff --git a/x11-misc/tint2/tint2-16.7.ebuild b/x11-misc/tint2/tint2-16.7.ebuild
new file mode 100644
index 000000000000..40278f4826fa
--- /dev/null
+++ b/x11-misc/tint2/tint2-16.7.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils vcs-snapshot xdg
+
+DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux."
+HOMEPAGE="https://gitlab.com/o9000/tint2"
+SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="battery svg startup-notification tint2conf"
+
+DEPEND="
+	dev-libs/glib:2
+	svg? ( gnome-base/librsvg:2 )
+	>=media-libs/imlib2-1.4.2[X,png]
+	x11-libs/cairo[X]
+	x11-libs/pango
+	tint2conf? ( x11-libs/gtk+:2 )
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXinerama
+	>=x11-libs/libXrandr-1.3
+	x11-libs/libXrender
+	startup-notification? ( x11-libs/startup-notification )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	xdg_src_prepare
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_BATTERY="$(usex battery)"
+		-DENABLE_TINT2CONF="$(usex tint2conf)"
+		-DENABLE_SN="$(usex startup-notification)"
+		-DENABLE_RSVG="$(usex svg)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/x11-misc/vnc2swf/Manifest b/x11-misc/vnc2swf/Manifest
index 3574f811bfcb..68e7ed50b824 100644
--- a/x11-misc/vnc2swf/Manifest
+++ b/x11-misc/vnc2swf/Manifest
@@ -1,3 +1,3 @@
 DIST vnc2swf-0.5.0.tar.gz 438058 BLAKE2B bb0effab90934746451efbe23610b3534de31ca1f5f8331dfc1f907b9733f69e78d960bd8d27cc6d75cb0ef688045b019b9b984dcd0e6207819e0590b35fa183 SHA512 f1551015eaafb7810b5d6367b73605f97bc5c0d4d3449dfe1a98af90f743133c0534c8988ee72ce2fc8599926a5f3ed5a785bf18788522b4a7c3cb8bc0529913
-EBUILD vnc2swf-0.5.0-r1.ebuild 1046 BLAKE2B 611a1ffeb42228b42ff03cf3f9058bc7d57cc95c0878c4916357d0604126e8f21e3b751ad2023dbe5102ed6247e60c1b79fa932fce9d371c8347fcfff85b7208 SHA512 4b39e10662fe6438fe630b63836555406e13a6ab78a6b7fe60c9d77b0ae3ae5244da0929cdc865ad0c06eb5ace685bcb57d88491bf4cbedc77f7dd7b2e6f4f65
+EBUILD vnc2swf-0.5.0-r1.ebuild 959 BLAKE2B 6154829c5750ef8e5ac4af7f856d6163beaf141837c2b6fdac6aa1c3aa5062732d14169a82f9cdbd179e53811a9cd782b0c87ec9f93e37327749daebfae579c7 SHA512 dce65ca80c31c5caad4e7e9765363100cd2491d86489fedb6667bf8102271f624d8ad5591b0e94d794720ec1cadde26ecdeb14a69c12bcca8486b61e7ea13c2e
 MISC metadata.xml 595 BLAKE2B e5cb40382a69ca1f5d8df0825ad2fe0b1df483f25f6f460694de69d3ecb52206436e0b283a6d647f58ceab872df857a50b106a2af52abe91b1ae343dea354463 SHA512 6704b8f85e5439e662e490d581adcfe3b822bfd75e78b91a4074e5cf23267b1e180b91d18cf098c5745587c4e31829d4469bbbee3741fc1535eefe6d737f9732
diff --git a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild b/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
index 8f9e37b5c918..63abdeceb57c 100644
--- a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
+++ b/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
@@ -1,47 +1,45 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="A tool for recording Flash SWF movies from VNC sessions"
 HOMEPAGE="http://www.unixuser.org/~euske/vnc2swf"
 SRC_URI="http://www.unixuser.org/~euske/vnc2swf/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="x11vnc"
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	sys-libs/zlib
+	x11-libs/libX11
 	x11-libs/libXaw
 	x11-libs/libXext
 	x11-libs/libXmu
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	sys-apps/sed
-	sys-libs/zlib
+	x11-libs/libXt
 	x11vnc? ( x11-misc/x11vnc )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -ie "s:docs:html:" README || die
-	sed -ie "s:-mouse ::" recordwin.sh || die
+src_prepare() {
+	default
+	sed -i -e "s:docs:html:" README || die
+	sed -i -e "s:-mouse ::" -e "s:./vnc2swf:vnc2swf:" recordwin.sh || die
 }
 
 src_install() {
-	dobin vnc2swf || die
+	dobin vnc2swf
 	if use x11vnc; then
 		# this USE flag is needed because recordwin
 		# only works on x11vnc
 		newbin recordwin.sh recordwin
-		dosed "s:./vnc2swf:vnc2swf:" /usr/bin/recordwin || die
 	fi
 	insinto /etc/X11/app-defaults
-	newins Vnc2Swf.ad Vnc2Swf || die
-	dodoc README*  || die
-	dohtml -a html,swf docs/* || die
+	newins Vnc2Swf.ad Vnc2Swf
+	dodoc README*
+
+	docinto html
+	dodoc docs/*.{html,swf}
 }
diff --git a/x11-misc/x2vnc/Manifest b/x11-misc/x2vnc/Manifest
index e23fad818e51..58a2ad86c958 100644
--- a/x11-misc/x2vnc/Manifest
+++ b/x11-misc/x2vnc/Manifest
@@ -1,4 +1,4 @@
-AUX expectk.patch 394 BLAKE2B f04672f857c7098c5509e2b90d88ec69f19115f93340ed832019a35ecc77577ff0ea61d89f1bef563213fa8e16d22204fd26939534397e00fdb9f5b030dafd9d SHA512 d5a2747bbf8beb5ffe49e68b47dbfb75e44486d14d7b21dcaf871d6c53cc502d4fa1e3583acf92da5d653a5bbb6f01838b4457629cfa3008db56500b6094aab7
+AUX expectk.patch 410 BLAKE2B 4e3f8882adbc64fc6c152394cdeed792a9630637e9962803a6ba5fbe9da5daa792024663cbe6192089a11bf18c51c088ef85d5d5928b174bc0caeb194f591183 SHA512 bb1dacf7d14e4a2d12ddcbe46029b912f781970f054f3127a23574bb290d26688d4a6fdc894dd5ef8d5d29474e5cae4b478e8618d2d2ccbf4043c9df7919312d
 DIST x2vnc-1.7.2.tar.gz 82258 BLAKE2B 4eebf2f33a38ac3fefc4b5a2a527977ad5dc73d0e3e8c289bffb2c0be1ca01117bbef5c312e186f295c910cbed0c71bea82cba8aaedb2cbbb192795d8eac9133 SHA512 f9bb9f8b95a6172758d1fd8b97f235088f0815afa21f2e11db77e59b36f8b3fe2fa2d8b922b14ccde1c589851d80489c9fd81d9f734ca9b053e4bc4019eade0b
-EBUILD x2vnc-1.7.2-r1.ebuild 750 BLAKE2B 658095acbd45f25c8958e447ceda9d9a9b9a2343959a7163952679a28bbdca717b57c64515c4360fbd9495fc8c1a1c4c7c077be794356363204ba446b2064641 SHA512 2a6fef6ca456f0f884899c7520584044ab8c9ce4a2baec1eb9fb385ac813a198a2da9e27c64ee3857e057c5f263bf94b19e1fac6225e53783ecc8105eb74f755
+EBUILD x2vnc-1.7.2-r1.ebuild 679 BLAKE2B 10e92c07c08c03c2ef2de0cf852117af8625defe292f77d7aadf99c6bda08ff5b6a8df3cf68d2313f6fff601cede0b21922bad96b679c1e8c27c0199da8640c1 SHA512 f488dbdd3b18da6b23a15f8a701a04791aaf498e1be49ba8910e6a7029fa95a0498c8dc46c5996843ae5287282ca0c5c684555b9d53810c459c2985b82e59e68
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/x2vnc/files/expectk.patch b/x11-misc/x2vnc/files/expectk.patch
index 5c5ba6887cb1..354dc4ffbe9e 100644
--- a/x11-misc/x2vnc/files/expectk.patch
+++ b/x11-misc/x2vnc/files/expectk.patch
@@ -1,5 +1,5 @@
---- tkx2vnc	2010-03-14 21:31:49.000000000 +0100
-+++ tkx2vnc.new	2010-03-14 21:32:58.000000000 +0100
+--- a/contrib/tkx2vnc	2010-03-14 21:31:49.000000000 +0100
++++ b/contrib/tkx2vnc	2010-03-14 21:32:58.000000000 +0100
 @@ -1,10 +1,13 @@
 -#!/usr/bin/expectk -f
 +#!/usr/bin/wish
diff --git a/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild b/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild
index 7a41c7b368d7..31f6fe487ba8 100644
--- a/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild
+++ b/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Control a remote computer running VNC from X"
 HOMEPAGE="http://fredrik.hubbe.net/x2vnc.html"
 SRC_URI="http://fredrik.hubbe.net/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE="tk"
@@ -22,15 +20,13 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 	tk? ( dev-tcltk/expect )"
 
-src_unpack() {
-		unpack ${A}
-		cd "${S}/contrib"
-		epatch "${FILESDIR}/expectk.patch"
-}
+PATCHES=(
+	"${FILESDIR}/expectk.patch"
+)
 
 src_install() {
 	dodir /usr/share /usr/bin
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	use tk && dobin contrib/tkx2vnc
 	dodoc ChangeLog README
 }
diff --git a/x11-misc/x2x/Manifest b/x11-misc/x2x/Manifest
index a75bd8d33e3a..abb15b8a2208 100644
--- a/x11-misc/x2x/Manifest
+++ b/x11-misc/x2x/Manifest
@@ -1,7 +1,6 @@
 DIST x2x-1.27-keymap.diff.gz 1145 BLAKE2B cca78c368a9f5a27c94121eec12ab800322d1b0549c1be940b22dd455cbd42761283d1646bba8e098b94364cd6023ef6e615df9f788cf68913af967077eb6de9 SHA512 46e0d9cef4b985523e4bf2d6c550d68f488c0975a007433f2a6c03d77541ce0cbdffd44ea29472fa6db4e8b804503cdaf9e8b5f9d72c56d902270cf3291ca37f
-DIST x2x-1.27-license.patch.gz 1001 BLAKE2B c63aaa33f669a63073e5ee52c51d47a9c2ca27d222f28cefe46eb6ed092d32004b4a42ce7b9176960a75ef95443ed7fee33cb01f4e343c7c2cda2d80f516f9f5 SHA512 cdff296ed3ea7d3d72b7d64f4878d94b63ee459a3487668b2174f54e4d2519daa1fb80ffec2cb3ce188032bb72148629cb276eb0d0311ed1f26c3da8066caed8
 DIST x2x-1.27.tar.gz 16776 BLAKE2B 8f78d801c1911928b0d5bb37b406bcf5285d3a54daf5067abae40125ad4e4f7fc52b8cc74f4e1c35b99350fc794f80c26120cae48e5076326746ec87d7aee0f3 SHA512 c5f8b1ec49f9871bf0d8142a047a2dff9a6ee262dfafd459044c977973dd45e297186961a8793938fc8e328f2553ec4de97e06343bdf3550f3bc3f2368b23131
 DIST x2x_1.27-8-initvars.patch.gz 494 BLAKE2B 97d48f4a2e7b65fd6755860c51399e5b6343bd0c7e6c79c7dd311792a899a02ed0ac6991d16495e96ca34913fbcec011b106bac6d0f9798540fb5704ca12f4cf SHA512 53060affef7575106932380063616473103c738193fdeab9118e0fb9ec1d1de2fe63f4112e5af82fe38198d0b42a10effde574bb9dee95c8fefdbdf680dbdf01
 DIST x2x_1.27-8.diff.gz 13291 BLAKE2B 4a4a0bf34a864596cff2f0722163bfe53968e30892bd0a18ed18ca6c3ef8f5bc763b215381c46792b499839397dbecab033bd9095646fad36613ad11beba1240 SHA512 8201ab5fd0efd93adec53cec3b48f7b4de907b2db184ffa6e85a1e16739b4d0021f4562820d0b4730a0f6a2779985b5574973c2b0ceb04b241f0d7dc15060b71
-EBUILD x2x-1.27-r3.ebuild 1541 BLAKE2B 35dc25ff56018c7276ae41bcb74d1d2077f48663d0ac2fb5395b3a63ec27b136e5714eb2311bfdf302db3c37b1b31eaedc6421c8e649de722a5c323e908c287e SHA512 3a849ac8b1cdc367c5fa7ab9b3b01d9185c9912a67c5df42b6e96dbad84cf84f1a44cf04a68a96c13ef4ba5f6308ac38dbb3060afaac334255147e546d805aa5
+EBUILD x2x-1.27-r3.ebuild 1369 BLAKE2B a1059db6b8afd9ced6ba724f5c06f2e465db7843c2f9472edc61d41bcfb02d43c7d95e74c2c9d81a9a0177bcf8e2874e654b1fda9540729f35eb2b0dfeee98f2 SHA512 e0ebcbc0817b5e8aefce91a3d4e854d040bd1ce59d73f5fbc84fa4e0409b3f88c7f0f2334d9b1b2deee53fcb080494f18e3f241aaa313c26c9e3dbb9d5f6fc1e
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/x2x/x2x-1.27-r3.ebuild b/x11-misc/x2x/x2x-1.27-r3.ebuild
index a353108f7c60..4c02869b428b 100644
--- a/x11-misc/x2x/x2x-1.27-r3.ebuild
+++ b/x11-misc/x2x/x2x-1.27-r3.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A utility to connect the Mouse and KeyBoard to another X"
 HOMEPAGE="http://www.the-labs.com/X11/#x2x"
-LICENSE="x2x"
 SRC_URI="http://ftp.digital.com/pub/Digital/SRC/x2x/${P}.tar.gz
 	mirror://debian/pool/main/x/x2x/x2x_1.27-8.diff.gz
 	mirror://gentoo/x2x_1.27-8-initvars.patch.gz
-	mirror://gentoo/${P}-license.patch.gz
 	mirror://gentoo/${P}-keymap.diff.gz"
+
+LICENSE="x2x"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~mips ppc x86"
 IUSE=""
@@ -25,36 +25,35 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 	x11-misc/imake"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+PATCHES=(
 	# Patch from Debian to add -north and -south, among other fixes
-	epatch "${DISTDIR}"/x2x_1.27-8.diff.gz
-	# Revert part of debian patch messing with CFLAGS
-	sed -i '/CFLAGS = -Wall/d' Imakefile || die
-
+	"${WORKDIR}"/x2x_1.27-8.diff
 	# Fix variable initialization in Debian patch
-	epatch "${DISTDIR}"/x2x_1.27-8-initvars.patch.gz
-
-	# Patch to add LICENSE
-	epatch "${DISTDIR}"/${P}-license.patch.gz
-
+	"${WORKDIR}"/x2x_1.27-8-initvars.patch
 	# Patch to fix bug #126939
 	# AltGr does not work in x2x with different keymaps:
-	epatch "${DISTDIR}"/${P}-keymap.diff.gz
+	"${WORKDIR}"/${P}-keymap.diff
+)
+
+src_prepare() {
+	default
 
+	# Revert part of debian patch messing with CFLAGS
+	sed -i '/CFLAGS = -Wall/d' Imakefile || die
 	# Man-page is packaged as x2x.1 but needs to be x2x.man for building
 	mv x2x.1 x2x.man || die
 }
 
-src_compile() {
+src_configure() {
 	xmkmf || die
+}
+
+src_compile() {
 	emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}" || die
+		EXTRA_LDOPTIONS="${LDFLAGS}"
 }
 
-src_install () {
-	emake DESTDIR="${D}" install || die
-	newman x2x.man x2x.1 || die
+src_install() {
+	default
+	newman x2x.man x2x.1
 }
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 968c6b9938bb..25e87769b3fb 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -8,10 +8,12 @@ AUX xscreensaver-5.35-gentoo.patch 1328 BLAKE2B 406f9c9d318ad3de6d5b098f54b25869
 AUX xscreensaver-5.35-offensive.patch 1678 BLAKE2B 6479ad1d5f081d3ae0ab7e9f08edf2656ac63bb77ec1c21885e0dc8f213580669d8021ff2de76556e7be00bfee78f9c6adf410b50e57d404637fff83c42437bc SHA512 fbc7a4f8e296e1249c2e0454978e48ea82a7b99f2467e2f46ff65e3294f5d8b4a5e366c3b6c9bc37b7f0aca92fa6d59d7492b6310d48c0b3240953f77821408a
 AUX xscreensaver-5.41-comments.patch 462 BLAKE2B 6df2d5573bd3a1c44582116f3653c7c0f2ea3738e94695dd3a680a5e0333c490c9a308554ae370e6565d766768e87a49a28d0c7cefbf7e69c8e32a4a1f4dba82 SHA512 672ee1c9d455883215bbf09bc5ebb7c38efa132419a27352d0b6b570e94f193e374524e6a4e5a75f8bb178cccd1d72442b7adf5866a0c2dc389704f123f8f931
 AUX xscreensaver-5.43-gentoo.patch 1340 BLAKE2B 177631b961b97d339149fd969d68ebbab5bd6444aea4f1379c199efbcbe5924106890578a5210bae5c55249ea1883af437e7edebb32fbccd35022acc3d7c29de SHA512 53ec2d02e20139389f832750ecee92e634ec8ecea5bfd5ef27a58ab0e6f3cbde299263bd92006581a4076f4b0721c036c1ac28cac50b1a2bf47c24df08347d04
+AUX xscreensaver-5.43-offensive.patch 1799 BLAKE2B f85d26a07ba2712855567a0779eaff7dba7e9a7350f320f78db5b1280890925cd82694ec3fa9c47c173ada2a1979a21b707dacb05c46c8721516687d52fcc8b7 SHA512 041105a4c96a197506c596d4793f7200f52e496f13d41209daa7eb05d5433280ede45411ee3f60679a1030c1edc4009383d6d50a97dff1af7e65a63a217b25d3
 DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
 DIST xscreensaver-5.42.tar.gz 26903469 BLAKE2B a82716a3f1f19f85eb1bc7a8ba1981221ac2ad47c1411687f1043da7e50edada73ab9c7465d655546f8a9015db69ab4f35ef8ff2a0b3d79f5a59d3e02aa2f819 SHA512 84cde9364c933de720acd51a0bf75eb4d0642d60f62b92de89d932233eb5abb51e1edb53cd413b2dc4801a02cb68652a28d7d1f83cdaa8d8cdd1fee7d651eefd
 DIST xscreensaver-5.43-r1.tar.gz 26973508 BLAKE2B 67b57214e8a41ba895df6e9efcac3e712f24be06ee7914b38d3a8e639d4945c927c4ac28469d2180bc4a3999a4b89d2a60e633799ac5204c42fa17ad76dd21fc SHA512 7ccaf30fb05ae2110f742f1a5c99f83cd4c8e6749124066b5a418cf3e0ba1b8ff09858eeec29c11b0c8ea428b95b2916481c50cee6a5d952ec941b3ad1b6adcd
 EBUILD xscreensaver-5.38.ebuild 3385 BLAKE2B e3de5033620cba11adac6b1c60ad110ced71228f6186e78632a871230bd5a1fa71ad89692bccee58836d10c1602bcd83aca1798a8565381920f65f94ff499100 SHA512 a51df05efd08870545ed04afa71e01608560a680958956d8a1a1e4c31e2c1aee0c7fba9e92b7e3d868845cf4769621338206fbf7bfcc4511223244f7d78d864d
 EBUILD xscreensaver-5.42.ebuild 3379 BLAKE2B d1c4caaa30884a7246c779a9395ac5b75edc83fca264bbe1878054d8e5843e8cc8973269ea4ba7dca1795f59be5a769b07e466d028648cfebac05cf9ffe6424c SHA512 31be7e3ff82e3d5427c8fbc2aca4cbfbf70ec448b6e856b5a78811116d3fd322c37d4669f3f65ecf30a5f343f7b731f09328b1356620bb94cab2a758f539667c
 EBUILD xscreensaver-5.43-r1.ebuild 3354 BLAKE2B 06eba2635de71983d774615b5f6e99d7bdf986b366d0960c782239272ce5e6581cf173b868e0c3107904f0a933bbce0223ac2375c1142e2a17efc2a4a8606bc7 SHA512 9b6d2474e5e06dac6cf07a4ce26491f713f8de979c4a2d28e480afed2cacaff9b064ea61ab80a74bb4624f02c3c334d3c5da7da9cce77c28f0874bffc7249da4
+EBUILD xscreensaver-5.43-r2.ebuild 3381 BLAKE2B 4bb9eb02b27bcc82ec26231bce1f76273064d0e257707de5d1818ead57d647a43b950a07305df6399ef0a939efa9658b4706a7048ebb98a62cf22526cabb0b59 SHA512 55bfabf2ecd68ede80bc6e6a219de56f2f6ccf89d2fe118b848d570043fe4058ea1cdd74acddafe2762393dbbf609cdacf6fded708ed63c7e32d4a43461f209a
 MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.43-offensive.patch b/x11-misc/xscreensaver/files/xscreensaver-5.43-offensive.patch
new file mode 100644
index 000000000000..25ee7a96ec72
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.43-offensive.patch
@@ -0,0 +1,68 @@
+--- a/hacks/barcode.c
++++ a/hacks/barcode.c
+@@ -118,8 +118,6 @@
+   "belly",
+   "bliss",
+   "bogosity",
+-  "boobies",
+-  "boobs",
+   "booty",
+   "bread",
+   "bubba",
+@@ -132,7 +130,6 @@
+   "children",
+   "chocolate",
+   "CLONE",
+-  "cock",
+   "constriction",
+   "contrition",
+   "cop",
+@@ -266,7 +263,6 @@
+   "punishment",
+   "punk rock",
+   "punk",
+-  "pussy",
+   "quagmire",
+   "quarantine",
+   "quartz",
+@@ -334,8 +330,6 @@
+   "vegetarian",
+   "venom",
+   "verifiability",
+-  "viagra",
+-  "vibrator",
+   "victim",
+   "vignette",
+   "villainy",
+--- a/hacks/glx/glsnake.c
++++ a/hacks/glx/glsnake.c
+@@ -565,17 +565,17 @@
+ 	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
+ 	ZERO, PIN, ZERO }
+     },
+-    { "erect penis",     /* thanks benno */
++    { "shuffle board",     /* thanks benno */
+       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
+ 	PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO,
+ 	ZERO, ZERO }
+     },
+-    { "flaccid penis",
++    { "flaccid anchor",
+       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
+ 	PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
+ 	ZERO, ZERO }
+     },
+-    { "vagina",
++    { "engagement ring",
+       { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
+ 	LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
+ 	PIN, RIGHT, ZERO }
+@@ -995,7 +995,7 @@
+     { "Parrot",
+         { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO }
+     },
+-    { "Penis",
++    { "Shuttle",
+         { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO }
+     },
+     { "PictureComingSoon",
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
new file mode 100644
index 000000000000..d5c1aeca6ef0
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop flag-o-matic multilib pam
+
+DESCRIPTION="A modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/"
+SRC_URI="
+	https://www.jwz.org/xscreensaver/${P}.tar.gz -> ${P}-r1.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
+
+COMMON_DEPEND="
+	>=gnome-base/libglade-2
+	dev-libs/libxml2
+	media-libs/netpbm
+	x11-apps/appres
+	x11-apps/xwininfo
+	x11-libs/gdk-pixbuf:2[X]
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	jpeg? ( virtual/jpeg:0 )
+	new-login? (
+		gdm? ( gnome-base/gdm )
+		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+		)
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pam? ( sys-libs/pam )
+	xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		dev-lang/perl
+		dev-perl/libwww-perl
+		virtual/perl-Digest-MD5
+	)
+	selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/bc
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.05-interix.patch
+	"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch
+	"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch
+	"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch
+	"${FILESDIR}"/${PN}-5.31-pragma.patch
+	"${FILESDIR}"/${PN}-5.43-gentoo.patch
+)
+
+src_prepare() {
+	sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
+	strip-linguas -i po/
+	export ALL_LINGUAS="${LINGUAS}"
+
+	if use new-login && ! use gdm; then #392967
+		sed -i \
+			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
+			configure{,.in} || die
+	fi
+
+	default
+
+	use offensive || eapply "${FILESDIR}"/${PN}-5.43-offensive.patch
+
+	eapply_user
+
+	eautoconf
+	eautoheader
+}
+
+src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -maltivec -mabi=altivec
+		append-flags -U__VEC__
+	fi
+
+	unset BC_ENV_ARGS #24568
+	export RPM_PACKAGE_VERSION=no #368025
+
+	econf \
+		$(use_with jpeg) \
+		$(use_with new-login login-manager) \
+		$(use_with opengl gl) \
+		$(use_with pam) \
+		$(use_with suid setuid-hacks) \
+		$(use_with xinerama xinerama-ext) \
+		--enable-locking \
+		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
+		--with-dpms-ext \
+		--with-gtk \
+		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
+		--with-pixbuf \
+		--with-proc-interrupts \
+		--with-randr-ext \
+		--with-text-file="${EPREFIX}"/etc/gentoo-release \
+		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
+		--with-xdbe-ext \
+		--with-xf86gamma-ext \
+		--with-xf86vmode-ext \
+		--with-xinput-ext \
+		--with-xshm-ext \
+		--without-gle \
+		--without-kerberos \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	emake install_prefix="${D}" install
+
+	dodoc README{,.hacking}
+
+	use pam && fperms 755 /usr/bin/${PN}
+	pamd_mimic_system ${PN} auth
+
+	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}