diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-03-29 23:59:44 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-03-29 23:59:44 +0000 |
| commit | ee9299e2a8d3652319e55625eb2debf9de133d27 (patch) | |
| tree | a7bfd62b7c7fcf0e615a6eaae8b6a44cc7cb0dd0 /x11-terms/kterm | |
| parent | Clean out old version. (diff) | |
| download | gentoo-2-ee9299e2a8d3652319e55625eb2debf9de133d27.tar.gz gentoo-2-ee9299e2a8d3652319e55625eb2debf9de133d27.tar.bz2 gentoo-2-ee9299e2a8d3652319e55625eb2debf9de133d27.zip | |
Fix missing dependency over gccmakedep and imake (thanks to Benigno B. Junior for reporting), avoid collision on modular setup, respect CFLAGS and LDFLAGS.
(Portage version: 2.1_pre7-r2)
Diffstat (limited to 'x11-terms/kterm')
| -rw-r--r-- | x11-terms/kterm/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-terms/kterm/kterm-6.2.0-r4.ebuild | 19 |
2 files changed, 20 insertions, 6 deletions
diff --git a/x11-terms/kterm/ChangeLog b/x11-terms/kterm/ChangeLog index 286a96ee987e..1be62fc3fec2 100644 --- a/x11-terms/kterm/ChangeLog +++ b/x11-terms/kterm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-terms/kterm # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/kterm/ChangeLog,v 1.19 2006/02/16 19:13:08 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/kterm/ChangeLog,v 1.20 2006/03/29 23:59:44 flameeyes Exp $ + + 29 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> kterm-6.2.0-r4.ebuild: + Fix missing dependency over gccmakedep and imake (thanks to Benigno B. + Junior for reporting), avoid collision on modular setup, respect CFLAGS and + LDFLAGS. *kterm-6.2.0-r4 (16 Feb 2006) diff --git a/x11-terms/kterm/kterm-6.2.0-r4.ebuild b/x11-terms/kterm/kterm-6.2.0-r4.ebuild index 7c16642140dd..4c5fc853ef78 100644 --- a/x11-terms/kterm/kterm-6.2.0-r4.ebuild +++ b/x11-terms/kterm/kterm-6.2.0-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/kterm/kterm-6.2.0-r4.ebuild,v 1.1 2006/02/16 19:13:08 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/kterm/kterm-6.2.0-r4.ebuild,v 1.2 2006/03/29 23:59:44 flameeyes Exp $ inherit eutils flag-o-matic @@ -16,12 +16,18 @@ LICENSE="X11" SLOT="0" KEYWORDS="-alpha ~amd64 ~ppc ~sparc ~x86" -DEPEND="app-text/rman +RDEPEND="app-text/rman sys-libs/ncurses || ( ( x11-libs/libXmu x11-libs/libXpm x11-libs/libxkbfile ) virtual/x11 ) Xaw3d? ( x11-libs/Xaw3d )" +DEPEND="${RDEPEND} + || ( ( + x11-misc/gccmakedep + x11-misc/imake + ) virtual/x11 )" + src_unpack(){ unpack ${A} @@ -40,12 +46,12 @@ src_unpack(){ src_compile(){ xmkmf -a || die - emake EXTRA_LDOPTIONS="$(bindnow-flags)" || die + emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" LOCAL_LDFLAGS="${LDFLAGS}" \ + XAPPLOADDIR=/etc/X11/app-defaults EXTRA_LDOPTIONS="$(bindnow-flags)" || die "emake failed" } src_install(){ - - einstall DESTDIR=${D} BINDIR=/usr/bin || die + einstall DESTDIR=${D} BINDIR=/usr/bin XAPPLOADDIR=/etc/X11/app-defaults || die # install man pages newman kterm.man kterm.1 @@ -53,6 +59,9 @@ src_install(){ iconv -f ISO-2022-JP -t EUC-JP kterm.jman > kterm.ja.1 newins kterm.ja.1 kterm.1 + # Remove link to avoid collision + rm -f ${D}/usr/lib/X11/app-defaults + dodoc README.kt } |