gentoo resync : 15.01.2020

3 files changed, 40 insertions, 18 deletions

diff --git a/x11-wm/echinus/Manifest b/x11-wm/echinus/Manifest
index 919d954fbd24..c3fd0e787658 100644
--- a/x11-wm/echinus/Manifest
+++ b/x11-wm/echinus/Manifest
@@ -1,5 +1,5 @@
-AUX echinus-0.4.9-gentoo.diff 1726 BLAKE2B 1210fc069bf3d96c2d3714059054e0863491ca5edbea2d1da8ee581859017672aebb3e4c8dedc5bf3d97abda422458f6f7214952c49cda490a20e90acb8388f7 SHA512 09164473f568385b7989bfb6f1c0529eb224aa7060ca39baa81ec61a545fde58d711092db1a6cd5feef6409bc2031c5d1ba71e2c176c2d527478a331fb84e016
+AUX echinus-0.4.9-gentoo.diff 2214 BLAKE2B 60dd119006f6e4ccd67cce54a108f684818ad66949916bdd23e83825b486b6c828c5cb626f91ef837306d72a2936afc86ddc4c60116891586d6e6547c402869f SHA512 be8e619129ff6ddbb2020e6a96c0689955fc68a7b0f6871fc08d0c3da96ddae09e439114ebc0de85411c9f86af643d2c332ff8a2e6113cca97b395876c1a5d71
 AUX echinus.desktop 100 BLAKE2B 5f9dab316e812c5ae2293525e4731c66dd45f92b8d727abd2698a99debc8f91b809e6b445d057744d1872a9823abdb3e53b888a31c174fddc6019daa49264447 SHA512 df3450598a78a6484323735ee95b8c03e0b8bed40335e495a6c41dafabbccdb1e52987c383093576bfb05fa017c2bf474ec53fff30975ebd07fe6ea08196e566
 DIST echinus-0.4.9.tar.gz 32934 BLAKE2B 50fff8a78b65f6fa2f8506016dc4556e656ba2e2c6096cb7e7d175607cf63ab145081d000b5dc795108b6b8573c18318925bb3830ecea5658125fb66a301963b SHA512 a735291129bc287c6ed8c0f5d98c3d81db6da19d903a5fd5b44af5ec55d0b90dc7a559fc0cbd3e0dcced4a25783307adbd777a0c79fbd91ed78e9867544c47bf
-EBUILD echinus-0.4.9.ebuild 1607 BLAKE2B 111acc57a34a873c2e4ba096bea5a3354b02d9ff9dd617a4939234c27da7bac1208eec926256e19b2925017c9ec1bc13ac1188d386345096ee9db5dfe0c15a0c SHA512 87f745d1c61bbbf3eda4d8c844010449e92e3cf001d346353abcff448c2d5b5978e3c3356afb5a787e9ab8717f487f12d9f3f3eeba14781b187ba2914f43e093
+EBUILD echinus-0.4.9.ebuild 1511 BLAKE2B 34f64bdf118c3aa899d0fe255aa759dbacd9c3abe8f6d2670c3387ae47675e52dbcfb5efba0706834a4beebe9f69cfcef4da64fddf6cdc4bf02383af8afbcf04 SHA512 d673c4dea76b8b63ff68cd9552132974b9d232a3d87a07400412f74f8fef382bc2c687f53aba9d6fa0bdb7e639f91a4a0661be02bcdbc32e9f94288f68708831
 MISC metadata.xml 253 BLAKE2B c4c0d013c216042f0b28f5c862217d07832125864810826e75650ff3237cdad06fc84cd90c0901228036a8e5b84c60a69fc1c51feecfb536b8acd74041416d9d SHA512 120e3b08d73b91ae3fcf18fb497938d5225851b757de10c859f2fbc7d3cbfd7f66e74bdaaa6d8f189c06706ae6643236c7223002242747e7dd204e36d740d132
diff --git a/x11-wm/echinus/echinus-0.4.9.ebuild b/x11-wm/echinus/echinus-0.4.9.ebuild
index 6ed20ef6b800..214543732284 100644
--- a/x11-wm/echinus/echinus-0.4.9.ebuild
+++ b/x11-wm/echinus/echinus-0.4.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs multilib
+inherit toolchain-funcs
 
 DESCRIPTION="A window manager for X in the spirit of dwm"
 HOMEPAGE="https://plhk.ru/"
@@ -14,30 +14,30 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="xrandr"
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXft
 	xrandr? ( x11-libs/libXrandr )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-DOCS=( README )
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-pkg_setup() {
-	tc-export CC
-	use xrandr && export MULTIHEAD=1
-}
+PATCHES=( "${FILESDIR}"/${P}-gentoo.diff )
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.diff
-	sed -i -e "s|CONFDIR|/usr/share/${PN}|g" echinus.1 README || die
+src_configure() {
+	use xrandr && export MULTIHEAD=1
 	sed -i -e "s|/usr/lib|/usr/$(get_libdir)|g" config.mk || die
+
+	tc-export CC
 }
 
 src_install() {
 	dobin ${PN}
 	doman ${PN}.1
-	dodoc README
+	einstalldocs
+
 	insinto /usr/share/${PN}
 	doins {close,iconify,max}.xbm ${PN}rc
+
 	insinto /usr/share/xsessions
 	doins "${FILESDIR}"/${PN}.desktop
 }
@@ -51,7 +51,7 @@ pkg_postinst() {
 		elog ""
 	fi
 	elog "A standard config file with its pixmaps has been installed to:"
-	elog "${EPREFIX}/usr/share/${PN}/examples"
+	elog "${EROOT}/usr/share/${PN}/examples"
 	elog "Copy this folder to ~/.${PN}/ and modify the echinusrc as you wish."
 	elog ""
 	elog "For changing the modkey you can use \"Echinus*modkey: X\""
diff --git a/x11-wm/echinus/files/echinus-0.4.9-gentoo.diff b/x11-wm/echinus/files/echinus-0.4.9-gentoo.diff
index 75b8b48c121a..2bada877b17a 100644
--- a/x11-wm/echinus/files/echinus-0.4.9-gentoo.diff
+++ b/x11-wm/echinus/files/echinus-0.4.9-gentoo.diff
@@ -48,6 +48,17 @@
  # Solaris
  #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
  #LDFLAGS = ${LIBS}
+--- a/echinus.1
++++ b/echinus.1
+@@ -40,7 +40,7 @@
+ loads the configuration file from
+ .Pa ~/.echinus/echinusrc,
+ if present, then looks for the system-wide configuration file
+-.Pa CONFDIR/echinusrc .
++.Pa /usr/share/echinus/echinusrc .
+ .El
+ .Pp
+ The following notation is used in this page:
 --- a/Makefile
 +++ b/Makefile
 @@ -19,13 +19,13 @@
@@ -66,3 +77,14 @@
  
  clean:
  	@echo cleaning
+--- a/README
++++ b/README
+@@ -22,7 +22,7 @@
+ On new install:
+ 
+ % mkdir ~/.echinus
+-% cp -r CONFDIR ~/.echinus
++% cp -r /usr/share/echinus ~/.echinus
+ 
+ 1.Configuration file
+ --------------------