Fix missing dependency over gccmakedep and imake (thanks to Benigno B. Junior for reporting), avoid collision on modular setup, respect CFLAGS and LDFLAGS.

Package-Manager: portage-2.1_pre7-r2

3 files changed, 30 insertions, 16 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/Manifest b/x11-terms/kterm/Manifest
index d9c451a3a330..4eec5435e98f 100644
--- a/x11-terms/kterm/Manifest
+++ b/x11-terms/kterm/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4e306559c3f34b30bad1018ce1800349 ChangeLog 2858
-RMD160 4ac48db078f1aa5b0889ef080b72503d5abc73cd ChangeLog 2858
-SHA256 2e2a915489b4770ac6a11f22cc001810d717cc06f1e96f4d2e7d129ed2c81b01 ChangeLog 2858
+MD5 7c311569724746db81726ba3284d7e57 ChangeLog 3099
+RMD160 dcc055cdd4685027156e70b244b71ed187e6d1c4 ChangeLog 3099
+SHA256 bd7ceb9f11d8f5bd0b1ba8d8d76e8e258936e550352610a2a6e49a73dfe2bf43 ChangeLog 3099
 MD5 d6502de9f8df5d2e7fd13e9b85e7720d files/6.2.0-underline.patch 540
 RMD160 1d410fd3187387cfc3f25288391b9873faa4a9e8 files/6.2.0-underline.patch 540
 SHA256 00198e2c7fa6f262821273a8ab1e1d598c5d1991a8edeb65991603d28215465b files/6.2.0-underline.patch 540
@@ -34,16 +34,16 @@ SHA256 cd1420a2579289626ba239ee4238d5eb3959029f8730b99bbdc5b6ab33257c17 kterm-6.
 MD5 eba79edba2a5e8a0f8532231fd204c4b kterm-6.2.0-r3.ebuild 1798
 RMD160 7e3a0eec0031faa938f0ec72b4b8b4d48f58d36d kterm-6.2.0-r3.ebuild 1798
 SHA256 8afba7c344361bdb3bacf1dd14d08a77e3082f552341a3d9efd1dc216fb8df50 kterm-6.2.0-r3.ebuild 1798
-MD5 b897d4a91159bbdb381247dba98028ff kterm-6.2.0-r4.ebuild 1841
-RMD160 829c08eb2998d8818ba092f19066fdde59443b91 kterm-6.2.0-r4.ebuild 1841
-SHA256 659bf3eb9d5b4315e8962a30c38e6f1905f1fdf219c27518ead313cfe95d73be kterm-6.2.0-r4.ebuild 1841
+MD5 dfacda2635b2d2c71e2b6db481f0d1b8 kterm-6.2.0-r4.ebuild 2158
+RMD160 72d176a3fd3061ea4e260a08ebb526aaf56b2ad4 kterm-6.2.0-r4.ebuild 2158
+SHA256 f8349477758ea343953b1319b5a9cf106d91127595fc6bd0f7a7674a1e80603e kterm-6.2.0-r4.ebuild 2158
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 metadata.xml 156
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFD9M7q9ZFPrqoILX8RAj9kAKDFeJwy4ByaxFOSqlTsbQzSAHzYjACfQCJT
-YsuhVOgjtimWePxzkMa3Hng=
-=pYtk
+iD8DBQFEKx99AiZjviIA2XgRAsLSAJ0W9BvO5uhozey5YzAxWCQgOYO4UwCg4Fh2
+JCC7xtAIfY6p8G0hyHfLCqg=
+=DGkn
 -----END PGP SIGNATURE-----
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
 }