diff options
author | Jeroen Roovers <jer@gentoo.org> | 2013-05-14 13:17:53 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2013-05-14 13:17:53 +0000 |
commit | 329de34114dc365f6732f0157d6c92adc5958f06 (patch) | |
tree | f77b6ae831df3b0adcd5510ebeadb76b24ba67c7 /x11-misc/numlockx | |
parent | drop old (diff) | |
download | gentoo-2-329de34114dc365f6732f0157d6c92adc5958f06.tar.gz gentoo-2-329de34114dc365f6732f0157d6c92adc5958f06.tar.bz2 gentoo-2-329de34114dc365f6732f0157d6c92adc5958f06.zip |
Fix building with automake-1.13 (bug #469824 by Billy DeVincentis).
(Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'x11-misc/numlockx')
-rw-r--r-- | x11-misc/numlockx/ChangeLog | 7 | ||||
-rw-r--r-- | x11-misc/numlockx/numlockx-1.2.ebuild | 29 |
2 files changed, 20 insertions, 16 deletions
diff --git a/x11-misc/numlockx/ChangeLog b/x11-misc/numlockx/ChangeLog index a905fed41ed4..73e97a8a002e 100644 --- a/x11-misc/numlockx/ChangeLog +++ b/x11-misc/numlockx/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-misc/numlockx -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/numlockx/ChangeLog,v 1.35 2012/05/16 00:17:42 ssuominen Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/numlockx/ChangeLog,v 1.36 2013/05/14 13:17:53 jer Exp $ + + 14 May 2013; Jeroen Roovers <jer@gentoo.org> numlockx-1.2.ebuild: + Fix building with automake-1.13 (bug #469824 by Billy DeVincentis). 16 May 2012; Samuli Suominen <ssuominen@gentoo.org> numlockx-1.2.ebuild: Change license from EDB to MIT wrt #416179 by "df" diff --git a/x11-misc/numlockx/numlockx-1.2.ebuild b/x11-misc/numlockx/numlockx-1.2.ebuild index 196df03e74d5..aa78701ad4c5 100644 --- a/x11-misc/numlockx/numlockx-1.2.ebuild +++ b/x11-misc/numlockx/numlockx-1.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/numlockx/numlockx-1.2.ebuild,v 1.8 2012/05/16 00:17:42 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/numlockx/numlockx-1.2.ebuild,v 1.9 2013/05/14 13:17:53 jer Exp $ -EAPI=4 +EAPI=5 inherit autotools DESCRIPTION="Turns on numlock in X" @@ -14,15 +14,22 @@ SLOT="0" KEYWORDS="alpha amd64 ppc ppc64 sparc x86" IUSE="" -RDEPEND="x11-libs/libX11 +RDEPEND=" + x11-libs/libX11 x11-libs/libXext - x11-libs/libXtst" -DEPEND="${RDEPEND} + x11-libs/libXtst +" +DEPEND=" + ${RDEPEND} x11-proto/xextproto - x11-proto/xproto" + x11-proto/xproto +" src_prepare() { - sed -i -e '/^K_.*$/d' configure.in || die + sed -i \ + -e '/^K_.*$/d' \ + -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \ + configure.in || die sed -i -e 's,@X_[_A-Z]\+@,,g' Makefile.am || die eautoreconf } @@ -31,9 +38,3 @@ src_install() { dobin ${PN} dodoc AUTHORS README } - -pkg_postinst() { - elog - elog "add 'numlockx' to your X startup programs to have numlock turn on when X starts" - elog -} |