Add missing dependencies. Respect LDFLAGS (bug #336301), CC, CFLAGS, mainly by running eautoreconf, and also remove a weird redefinition of malloc(), calloc() and realloc(). Use emake instead of make.

Package-Manager: portage-2.2_rc83/cvs/Linux i686

3 files changed, 58 insertions, 3 deletions

diff --git a/x11-terms/cxterm/ChangeLog b/x11-terms/cxterm/ChangeLog
index dc43df758500..5c20c97d0b1e 100644
--- a/x11-terms/cxterm/ChangeLog
+++ b/x11-terms/cxterm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-terms/cxterm
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/cxterm/ChangeLog,v 1.12 2007/07/22 05:42:43 dberkholz Exp $
+# 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 $
+
+*cxterm-5.2.3-r1 (19 Sep 2010)
+
+  19 Sep 2010; Jeroen Roovers <jer@gentoo.org> +cxterm-5.2.3-r1.ebuild:
+  Add missing dependencies. Respect LDFLAGS (bug #336301), CC, CFLAGS,
+  mainly by running eautoreconf, and also remove a weird redefinition of
+  malloc(), calloc() and realloc(). Use emake instead of make.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; cxterm-5.2.3.ebuild:
   Drop virtual/x11 references.
diff --git a/x11-terms/cxterm/Manifest b/x11-terms/cxterm/Manifest
index c6cab0aa30c4..33064650f4dd 100644
--- a/x11-terms/cxterm/Manifest
+++ b/x11-terms/cxterm/Manifest
@@ -1,4 +1,5 @@
 DIST cxterm-5.2.3.tgz 2653315 RMD160 a5bbc89e411e9bf5556cfba4133a2cb53d6c77e5 SHA1 a96dd12c829a21d87680b9091512d38bd8b949de SHA256 0a97ea0900815904460916210a38a8cd29cabb6b80232912c9aaa8900d03ed84
+EBUILD cxterm-5.2.3-r1.ebuild 1167 RMD160 cd4807a0d92b170133b3a164f88494ea9a0e69b9 SHA1 bfb90a48d756a954983a4b8696e50c34943a6831 SHA256 1be66f94c720ef8c408a8f8d37094909505c3ef00ba4767605031eae954e733a
 EBUILD cxterm-5.2.3.ebuild 649 RMD160 dce0a220a31cabeeff539b4a711550e401d4a080 SHA1 dca1be1761635be4b826fd5132f27c3a41a574bf SHA256 3a58d2968b774b119cd9a8d14bbb4d22027ca4f443fb5b1f343a11fc6961882b
-MISC ChangeLog 1371 RMD160 d043fccc2f11a6eb32aa926f62342e4fee315d7e SHA1 1c4e34989715c4dca182ee0f726cbdb3195824a5 SHA256 86b4a0dd2c71f13bd73a050157e37b937d4635f062cc847e9ad4fa4a870f7705
+MISC ChangeLog 1677 RMD160 40be895495ef1382fd6b23dfa25811c6f8742a77 SHA1 b82a0f646225386c3fd55ebc8562cf549a0e2a84 SHA256 b8665498d8ae00ae42ad9808aeddcf06768a0125984148d493326ff129c8f1b4
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
diff --git a/x11-terms/cxterm/cxterm-5.2.3-r1.ebuild b/x11-terms/cxterm/cxterm-5.2.3-r1.ebuild
new file mode 100644
index 000000000000..39011e8852e5
--- /dev/null
+++ b/x11-terms/cxterm/cxterm-5.2.3-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2010 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"
+
+inherit autotools
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+HOMEPAGE="http://cxterm.sourceforge.net/"
+DESCRIPTION="A Chinese/Japanese/Korean X-Terminal"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+RDEPEND="
+	sys-libs/ncurses
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXmu
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# use the canonical compiler and linker calls and...
+	sed -i utils/Makefile.am \
+		-e '/ -c /s|gcc|$(COMPILE)|g' \
+		-e '/ -o /s|gcc|$(LINK)|g' \
+		|| die "sed utils/Makefile.am"
+	# ...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"
+	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/*
+}