summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorcharIes17 <charles17@arcor.de>2017-12-19 14:00:51 +0100
committerDavid Seifert <soap@gentoo.org>2017-12-28 11:09:59 +0100
commit0342a180ba6e0e85ddd5461928438e946adda114 (patch)
treeb4faf0444cf830424f22e35d65685247c80bbc09 /x11-wm
parentdev-qt/qtcore: remove unused patch (diff)
downloadgentoo-0342a180ba6e0e85ddd5461928438e946adda114.tar.gz
gentoo-0342a180ba6e0e85ddd5461928438e946adda114.tar.bz2
gentoo-0342a180ba6e0e85ddd5461928438e946adda114.zip
x11-wm/evilwm: Bump to EAPI=6
Bug: https://bugs.gentoo.org/615312 Package-Manager: Portage-2.3.13, Repoman-2.3.3 Closes: https://github.com/gentoo/gentoo/pull/5691
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/evilwm/evilwm-1.0.1-r1.ebuild47
-rw-r--r--x11-wm/evilwm/evilwm-1.1.1.ebuild36
2 files changed, 65 insertions, 18 deletions
diff --git a/x11-wm/evilwm/evilwm-1.0.1-r1.ebuild b/x11-wm/evilwm/evilwm-1.0.1-r1.ebuild
new file mode 100644
index 00000000000..a23d0ebd5ef
--- /dev/null
+++ b/x11-wm/evilwm/evilwm-1.0.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop toolchain-funcs
+
+DESCRIPTION="A minimalist, no frills window manager for X"
+HOMEPAGE="http://www.6809.org.uk/evilwm/"
+SRC_URI="http://www.6809.org.uk/evilwm/${P}.tar.gz"
+
+LICENSE="MIT 9wm"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libXext
+ x11-libs/libXrandr"
+
+DEPEND="${RDEPEND}
+ x11-proto/xextproto
+ x11-proto/xproto"
+
+src_prepare() {
+ default
+ sed -e 's/^#define DEF_FONT.*/#define DEF_FONT "fixed"/' \
+ -i evilwm.h || die "sed font failed"
+ sed -i -e '/^CFLAGS/s/ -Os/ /' \
+ -e 's/install -s /install /' Makefile || die "sed opt failed"
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" prefix="\$(DESTDIR)/${EPREFIX}/usr" XROOT="${EPREFIX}/usr" LDPATH="-L${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+ emake DESTDIR="${D}" prefix="\$(DESTDIR)/${EPREFIX}/usr" install
+
+ einstalldocs
+
+ echo -e "#!${EPREFIX}/bin/sh\nexec \"${EPREFIX}/usr/bin/${PN}\"" > "${T}/${PN}" || die
+ exeinto /etc/X11/Sessions
+ doexe "${T}/${PN}"
+
+ insinto /usr/share/xsessions
+ doins "${FILESDIR}/${PN}.desktop"
+ domenu "${FILESDIR}"/evilwm.desktop
+}
diff --git a/x11-wm/evilwm/evilwm-1.1.1.ebuild b/x11-wm/evilwm/evilwm-1.1.1.ebuild
index f7bf3c01701..e1ae05372ef 100644
--- a/x11-wm/evilwm/evilwm-1.1.1.ebuild
+++ b/x11-wm/evilwm/evilwm-1.1.1.ebuild
@@ -1,45 +1,45 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit toolchain-funcs
-
-MY_P=${P/_}
+EAPI=6
+inherit desktop toolchain-funcs
DESCRIPTION="A minimalist, no frills window manager for X"
HOMEPAGE="http://www.6809.org.uk/evilwm/"
-SRC_URI="http://www.6809.org.uk/${PN}/${MY_P}.tar.gz"
+SRC_URI="http://www.6809.org.uk/evilwm/${P}.tar.gz"
LICENSE="MIT 9wm"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris"
IUSE=""
-RDEPEND="x11-libs/libX11
+RDEPEND="x11-libs/libXext
x11-libs/libXrandr
- x11-libs/libXext"
+ x11-libs/libX11"
DEPEND="${RDEPEND}
x11-proto/xproto"
-S=${WORKDIR}/${MY_P}
-
src_prepare() {
+ default
sed -e 's/^#define DEF_FONT.*/#define DEF_FONT "fixed"/' \
- -i evilwm.h || die
-
- sed -e '/Encoding/d' \
- -i ${PN}.desktop || die
+ -i evilwm.h || die "sed font failed"
+ sed -e '/Encoding/d' -i ${PN}.desktop || die
}
src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
}
src_install() {
- emake DESTDIR="${D}" prefix="${EPREFIX}/usr" INSTALL_STRIP="" install || die
- dodoc ChangeLog README TODO || die
+ emake DESTDIR="${D}" prefix="${EPREFIX}/usr" INSTALL_STRIP="" install
- echo -e "#!${EPREFIX}/bin/sh\nexec \"${EPREFIX}/usr/bin/${PN}\"" > "${T}"/${PN}
+ einstalldocs
+
+ echo -e "#!${EPREFIX}/bin/sh\nexec \"${EPREFIX}/usr/bin/${PN}\"" > "${T}/${PN}" || die
exeinto /etc/X11/Sessions
- doexe "${T}"/${PN} || die
+ doexe "${T}/${PN}"
+
+ insinto /usr/share/xsessions
+ doins "${FILESDIR}/${PN}.desktop"
+ domenu "${FILESDIR}"/evilwm.desktop
}