diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-07-09 17:40:30 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-07-09 17:40:30 +0000 |
| commit | 60b420f08d3538b7ea12b29abc1f8f1b0ccbecd0 (patch) | |
| tree | 4a3c1288fb7082908b08d4e4ecba0300bf390bde /x11-terms | |
| parent | Version bump (diff) | |
| download | gentoo-2-60b420f08d3538b7ea12b29abc1f8f1b0ccbecd0.tar.gz gentoo-2-60b420f08d3538b7ea12b29abc1f8f1b0ccbecd0.tar.bz2 gentoo-2-60b420f08d3538b7ea12b29abc1f8f1b0ccbecd0.zip | |
Fix include guard with recent libX11 wrt #349448 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)
Diffstat (limited to 'x11-terms')
| -rw-r--r-- | x11-terms/cxterm/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-terms/cxterm/cxterm-5.2.3-r1.ebuild | 27 |
2 files changed, 18 insertions, 16 deletions
diff --git a/x11-terms/cxterm/ChangeLog b/x11-terms/cxterm/ChangeLog index 5c20c97d0b1e..c11b52c95730 100644 --- a/x11-terms/cxterm/ChangeLog +++ b/x11-terms/cxterm/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-terms/cxterm -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/cxterm/ChangeLog,v 1.13 2010/09/19 02:36:37 jer Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-terms/cxterm/ChangeLog,v 1.14 2011/07/09 17:40:30 ssuominen Exp $ + + 09 Jul 2011; Samuli Suominen <ssuominen@gentoo.org> cxterm-5.2.3-r1.ebuild: + Fix include guard with recent libX11 wrt #349448 by Diego Elio Pettenò *cxterm-5.2.3-r1 (19 Sep 2010) diff --git a/x11-terms/cxterm/cxterm-5.2.3-r1.ebuild b/x11-terms/cxterm/cxterm-5.2.3-r1.ebuild index 39011e8852e5..877bba897dc3 100644 --- a/x11-terms/cxterm/cxterm-5.2.3-r1.ebuild +++ b/x11-terms/cxterm/cxterm-5.2.3-r1.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/cxterm/cxterm-5.2.3-r1.ebuild,v 1.1 2010/09/19 02:36:37 jer Exp $ - -EAPI="2" +# $Header: /var/cvsroot/gentoo-x86/x11-terms/cxterm/cxterm-5.2.3-r1.ebuild,v 1.2 2011/07/09 17:40:30 ssuominen Exp $ +EAPI=4 inherit autotools SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" HOMEPAGE="http://cxterm.sourceforge.net/" DESCRIPTION="A Chinese/Japanese/Korean X-Terminal" -LICENSE="BSD" +LICENSE="BSD" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND=" @@ -28,20 +27,20 @@ src_prepare() { sed -i utils/Makefile.am \ -e '/ -c /s|gcc|$(COMPILE)|g' \ -e '/ -o /s|gcc|$(LINK)|g' \ - || die "sed utils/Makefile.am" + || die # ...remove these redefinitions, probably the reason why the original # Makefile.am above had plain `gcc' as -O[N>0] would then fail sed -i utils/tit2cit.c \ -e '/extern char.*malloc.*calloc.*realloc/d' \ - || die "sed utils/tit2cit.c" + || die + + # Fix include guard with recent libX11 wrt #349448 + sed -i -e 's:_XLIB_H_:_X11&:' cxterm/HZtable.h || die + eautoreconf } src_install() { - emake DESTDIR="${D}" install || die - dodoc README* INSTALL-5.2 Doc/* - docinto tutorial-1 - dodoc Doc/tutorial-1/* - docinto tutorial-2 - dodoc Doc/tutorial-2/* + emake DESTDIR="${D}" install + dodoc -r ChangeLog README* INSTALL-5.2 Doc/* } |