commit: 553eb3a91bf4e38e73a39661ca48079d99e67ae5
Author: David Seifert gentoo org>
AuthorDate: Tue Dec 24 17:40:15 2019 +
Commit: David Seifert gentoo org>
CommitDate: Tue Dec 24 17:40:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=553eb3a9
x11-wm/echinus: Port to EAPI 7
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: David Seifert gentoo.org>
x11-wm/echinus/echinus-0.4.9.ebuild| 32 +-
x11-wm/echinus/files/echinus-0.4.9-gentoo.diff | 22 ++
2 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/x11-wm/echinus/echinus-0.4.9.ebuild
b/x11-wm/echinus/echinus-0.4.9.ebuild
index 6ed20ef6b80..21454373228 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 75b8b48c121..2bada877b17 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
+
