diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2008-02-10 11:17:07 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2008-02-10 11:17:07 +0000 |
| commit | 79613e6df994f68605cdd45ae40dda10cc1851d5 (patch) | |
| tree | 72175fa34e402acf0939baba9b87f93fbbaa694f /app-editors | |
| parent | * bump to 0.19, updated translations and gedit plugin icon (diff) | |
| download | gentoo-2-79613e6df994f68605cdd45ae40dda10cc1851d5.tar.gz gentoo-2-79613e6df994f68605cdd45ae40dda10cc1851d5.tar.bz2 gentoo-2-79613e6df994f68605cdd45ae40dda10cc1851d5.zip | |
Fix XJED_HAS_XRENDERFONT handling and X dependencies.
(Portage version: 2.1.4.1)
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/jed/ChangeLog | 5 | ||||
| -rw-r--r-- | app-editors/jed/jed-0.99.18.ebuild | 22 |
2 files changed, 15 insertions, 12 deletions
diff --git a/app-editors/jed/ChangeLog b/app-editors/jed/ChangeLog index 9551eda5b9ca..74980dd17ffe 100644 --- a/app-editors/jed/ChangeLog +++ b/app-editors/jed/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-editors/jed # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/ChangeLog,v 1.43 2008/02/10 09:46:52 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/ChangeLog,v 1.44 2008/02/10 11:17:07 ulm Exp $ + + 10 Feb 2008; Ulrich Mueller <ulm@gentoo.org> jed-0.99.18.ebuild: + Really set XJED_HAS_XRENDERFONT for USE="X truetype". Fix X dependencies. 10 Feb 2008; Tobias Scherbaum <dertobi123@gentoo.org> jed-0.99.18.ebuild: Added ~ppc, bug #209434 diff --git a/app-editors/jed/jed-0.99.18.ebuild b/app-editors/jed/jed-0.99.18.ebuild index 025e9bed189f..cd45d0c8b241 100644 --- a/app-editors/jed/jed-0.99.18.ebuild +++ b/app-editors/jed/jed-0.99.18.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.18.ebuild,v 1.8 2008/02/10 09:46:52 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.18.ebuild,v 1.9 2008/02/10 11:17:07 ulm Exp $ inherit versionator @@ -15,8 +15,11 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="X gpm truetype" RDEPEND=">=sys-libs/slang-2 - X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender - truetype? ( virtual/xft >=media-libs/freetype-2.0 ) ) + X? ( x11-libs/libX11 + truetype? ( x11-libs/libXext + x11-libs/libXrender + virtual/xft + >=media-libs/freetype-2.0 ) ) gpm? ( sys-libs/gpm )" DEPEND="${RDEPEND}" @@ -29,17 +32,14 @@ src_compile() { --bindir=/usr/bin || die if use gpm ; then - sed -i -e 's/#MOUSEFLAGS/MOUSEFLAGS/' \ - -e 's/#MOUSELIB/MOUSELIB/' \ - -e 's/#GPMMOUSEO/GPMMOUSEO/' \ - -e 's/#OBJGPMMOUSEO/OBJGPMMOUSEO/' \ - src/Makefile + sed -i -e '/^#[A-Z]*MOUSE/s/#//' src/Makefile fi if use X && use truetype ; then - sed -i -e 's/#XRENDERFONTLIBS/XRENDERFONTLIBS/' src/Makefile - sed -i -e 's/^CONFIG_H = config.h/xterm_C_FLAGS = `freetype-config --cflags`\nCONFIG_H = config.h/' src/Makefile - sed -i -e 's/#define XJED_HAS_XRENDERFONT 0/#define XJED_HAS_XRENDERFONT 1/' src/jed-feat.h + sed -i -e '/^#XRENDERFONTLIBS/s/#//' \ + -e '/^ALL_CFLAGS/i\' \ + -e 'xterm_C_FLAGS = -DXJED_HAS_XRENDERFONT `freetype-config --cflags`' \ + src/Makefile fi make clean || die |