summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2016-11-09 17:19:15 -0600
committerKacper Kowalik <xarthisius@gentoo.org>2016-11-09 17:19:15 -0600
commit2bb9e51568f12dd31bba9c947e5f1142054eda1f (patch)
tree0d09c32d88f9f50b3b0c1df7c3f58db826ad2aed /x11-wm/i3/i3-9999.ebuild
parentdev-java/jstun: Stable for amd64+x86. (diff)
downloadgentoo-2bb9e51568f12dd31bba9c947e5f1142054eda1f.tar.gz
gentoo-2bb9e51568f12dd31bba9c947e5f1142054eda1f.tar.bz2
gentoo-2bb9e51568f12dd31bba9c947e5f1142054eda1f.zip
x11-wm/i3: prevent injection of debug flags
Package-Manager: portage-2.2.28
Diffstat (limited to 'x11-wm/i3/i3-9999.ebuild')
-rw-r--r--x11-wm/i3/i3-9999.ebuild35
1 files changed, 19 insertions, 16 deletions
diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild
index 03b4ef62bbaa..f1ac47a16f4c 100644
--- a/x11-wm/i3/i3-9999.ebuild
+++ b/x11-wm/i3/i3-9999.ebuild
@@ -2,9 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-inherit eutils toolchain-funcs git-2
+inherit autotools git-r3
DESCRIPTION="An improved dynamic tiling window manager"
HOMEPAGE="http://i3wm.org/"
@@ -15,7 +15,7 @@ EGIT_BRANCH="next"
LICENSE="BSD"
SLOT="0"
KEYWORDS=""
-IUSE="+pango"
+IUSE="doc"
CDEPEND="dev-lang/perl
dev-libs/libev
@@ -29,39 +29,42 @@ CDEPEND="dev-lang/perl
x11-libs/xcb-util-keysyms
x11-libs/xcb-util-wm
x11-libs/xcb-util-xrm
- pango? (
- >=x11-libs/pango-1.30.0[X]
- >=x11-libs/cairo-1.12.2[X,xcb]
- )"
+ >=x11-libs/pango-1.30.0[X]
+ >=x11-libs/cairo-1.14.4[X,xcb]"
DEPEND="${CDEPEND}
- app-text/asciidoc
+ doc? ( app-text/asciidoc app-text/xmlto )
virtual/pkgconfig"
RDEPEND="${CDEPEND}
dev-perl/AnyEvent-I3
dev-perl/JSON-XS"
src_prepare() {
- if ! use pango; then
- sed -i common.mk -e '/PANGO/d' || die
+ default
+
+ if ! use doc ; then
+ sed -e '/AC_PATH_PROG(\[PATH_ASCIIDOC/d' -i configure.ac || die
fi
+ eautoreconf
cat <<- EOF > "${T}"/i3wm
#!/bin/sh
exec /usr/bin/i3
EOF
+}
- epatch_user #471716
+src_configure() {
+ local myeconfargs=( --enable-debug=no ) # otherwise injects -O0 -g
+ econf "${myeconfargs[@]}"
}
src_compile() {
- emake V=1 CC="$(tc-getCC)" AR="$(tc-getAR)"
- emake mans
+ emake -C "${CBUILD}"
}
src_install() {
- default
- dohtml -r docs/*
- doman man/*.1
+ emake -C "${CBUILD}" DESTDIR="${D}" install
+ einstalldocs
+
exeinto /etc/X11/Sessions
doexe "${T}"/i3wm
}