commit: b303a6babce18c69588b6fa76faf68f0653505c1 Author: Harri Nieminen <moikkis <AT> gmail <DOT> com> AuthorDate: Thu Feb 9 10:00:33 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Feb 9 21:52:48 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b303a6ba
x11-misc/blockdpy: EAPI bump 0 -> 6 Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/3891 .../{blockdpy-1.ebuild => blockdpy-1-r1.ebuild} | 37 +++++++++++++++------- 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/x11-misc/blockdpy/blockdpy-1.ebuild b/x11-misc/blockdpy/blockdpy-1-r1.ebuild similarity index 60% rename from x11-misc/blockdpy/blockdpy-1.ebuild rename to x11-misc/blockdpy/blockdpy-1-r1.ebuild index 252c06355c..f96d837aaa 100644 --- a/x11-misc/blockdpy/blockdpy-1.ebuild +++ b/x11-misc/blockdpy/blockdpy-1-r1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ +EAPI=6 + inherit toolchain-funcs DESCRIPTION="Tool to block access via the physical display while x11vnc is running" @@ -13,37 +15,48 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="x11-libs/libX11 +RDEPEND=" + x11-libs/libX11 x11-libs/libXext" -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + virtual/pkgconfig" S=${WORKDIR} src_unpack() { - cp "${DISTDIR}"/blockdpy.c blockdpy.c + cp "${DISTDIR}"/blockdpy.c blockdpy.c || die +} + +src_prepare() { + default # Add includes to avoid QA warnings. - sed -i '/#include <stdio.h>/i#include <stdlib.h>' blockdpy.c - sed -i '/#include <stdio.h>/i#include <string.h>' blockdpy.c + sed -i '/#include <stdio.h>/i#include <stdlib.h>' blockdpy.c || die + sed -i '/#include <stdio.h>/i#include <string.h>' blockdpy.c || die } src_compile() { - $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o blockdpy blockdpy.c -lX11 -lXext || - die "compile failed" + $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \ + $($(tc-getPKG_CONFIG) --cflags x11) \ + $($(tc-getPKG_CONFIG) --cflags xext) \ + -o blockdpy blockdpy.c \ + $($(tc-getPKG_CONFIG) --libs x11) \ + $($(tc-getPKG_CONFIG) --libs xext) \ + || die "compile failed" # Create README from head comment in source. - sed -n '1,/^ *\*\//s/^[ -]*\*[ \/]*//p' < blockdpy.c > README + sed -n '1,/^ *\*\//s/^[ -]*\*[ \/]*//p' < blockdpy.c > README || die } src_install() { - dobin blockdpy || die "install failed" - dodoc README + dobin blockdpy + einstalldocs } pkg_postinst() { # Just warn about missing xlock instead of requiring it in case # the user wants to use something else. - if ! [ -x /usr/bin/xlock ]; then + if [[ ! -x ${EPREFIX}/usr/bin/xlock ]]; then ewarn 'The xlock executable was not found.' ewarn 'blockdpy runs "xlock" as the screen-lock program by default.' ewarn 'You should either install x11-misc/xlockmore or override the'
