Use CC/CFLAGS/LDFLAGS variables (#240234 by Diego Pettenò)

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

4 files changed, 167 insertions, 2 deletions

diff --git a/dev-lang/icon/ChangeLog b/dev-lang/icon/ChangeLog
index 88dd3e8f46dd..5ad13baa6635 100644
--- a/dev-lang/icon/ChangeLog
+++ b/dev-lang/icon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/icon
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/ChangeLog,v 1.36 2008/08/27 18:12:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/ChangeLog,v 1.37 2008/10/06 20:24:45 truedfx Exp $
+
+*icon-9.4.3-r4 (06 Oct 2008)
+
+  06 Oct 2008; Harald van Dijk <truedfx@gentoo.org>
+  +files/icon-9.4.3-flags.patch, +icon-9.4.3-r4.ebuild:
+  Use CC/CFLAGS/LDFLAGS variables (#240234 by Diego Pettenò)
 
   27 Aug 2008; Raúl Porcel <armin76@gentoo.org> icon-9.4.3-r3.ebuild:
   alpha/ia64/sparc/x86 stable
diff --git a/dev-lang/icon/Manifest b/dev-lang/icon/Manifest
index 17db7dbd729d..7339b792f8f5 100644
--- a/dev-lang/icon/Manifest
+++ b/dev-lang/icon/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX icon-9.4.3-flags.patch 1131 RMD160 aea43d0716554ccebd074eec79bdd44d7cbd5d04 SHA1 6e7de4b806d192e5e495a0d82399c39e3c4d862d SHA256 d981adbb75ceac52d234735f3996288bf0c4751a3717ef24e859d850218d7a51
 AUX tests-943.patch 3643 RMD160 80bbfd6cb8a15ba6c40997a9db74e67b5245d635 SHA1 0afed4ccccf6b6211004e88c7f25ff4d1f4ce9e2 SHA256 78222584fab1d1906baceca5cc950deb3458493cdc553f7f00def395af174900
 DIST icon.v942src.tgz 3204076 RMD160 7e0ec62b714c433acb23a31bad62028424f72ead SHA1 9536e9346188deb2dc5853e03b5f7a85991314b1 SHA256 483118e7d70f3cb05e1ba9712c60c460cd699269380db0658377dea10b51ce27
 DIST icon.v943src.tgz 3218627 RMD160 af75af7f106920cd59a7f8ac85954aa472ae78e7 SHA1 92bd3347807b333fb903edf61a2805f2e1159577 SHA256 d6b6dc508922251748c4ceefbc3a96b54a9f488e260f9f517b5e08dc21615bff
@@ -5,6 +9,14 @@ EBUILD icon-9.4.2.ebuild 1352 RMD160 02a828231e10dc0bc059b0e913747fc4b7198ade SH
 EBUILD icon-9.4.3-r1.ebuild 2119 RMD160 c5d60c259f01799c539c831dc79acff54cb40582 SHA1 718f9b3dd50b588d2f1c6220ffde5d0769407cf4 SHA256 1a83610c8b8f85a5426a3dafb9d801063a686aa9d11c33f35c0ea91273dfaf6f
 EBUILD icon-9.4.3-r2.ebuild 2519 RMD160 3fffa24ac4fa1909b2b570b3ab29184e38c18e21 SHA1 ce2728b748b8934e95b09c07b335a45a01ba40a8 SHA256 9b500c08d48ea1973818ed5001da747374dec225c72feeb087668eda6f742e61
 EBUILD icon-9.4.3-r3.ebuild 2728 RMD160 99a42cf7fe20f247afc2dd56dc2f3c6644172471 SHA1 006ad44bace292c0e643f2e9e0305fcb9c907798 SHA256 7c8e4c40138e4a95296002f962d27c187202ec04139a58c1b2dbddfc0db0d7c5
+EBUILD icon-9.4.3-r4.ebuild 2874 RMD160 7814705d7b7e65014cbeae654ac931926268edfa SHA1 9cac8c0431f2ec70c194ea26649f6dbed50a10fc SHA256 d080cb25847c2eea085b6851a9439a36d30a281b1775a5af560059e1ea82a153
 EBUILD icon-9.4.3.ebuild 2239 RMD160 a701e2d52189a0dfa41bc5c8e329e6c97b3b9187 SHA1 21d2e7f4a2c02817c834340f4ae4e72cc0ef9b98 SHA256 b8383f2a7cf622c31f73029abdcaf6d5511fa4690418a7a24d9d34f59b7faa5d
-MISC ChangeLog 5422 RMD160 07588e79250bb72341f5ca54a01f809b5338bcba SHA1 20e45f7133dda9a7e95b8ca18d437681882eb696 SHA256 38bb9532c979b654f9ce372d2173c36b84d8e1f00a7fb3787a58297c5a3a0c21
+MISC ChangeLog 5623 RMD160 4ca79a358dc090763748b29b9aa531b7b4c624f7 SHA1 f736d73134d039645421434ba395665eb3e86cc6 SHA256 d5183f52ad3abd5f9a0ca1d55cef47f8ae29e0defff947bb09d22f30f64a3c87
 MISC metadata.xml 244 RMD160 b2f04edcd2d3ff57e0ba36211770eaec51e4c6c6 SHA1 c8d47ce6a7ee64cc3d86fa9fea8c0293a5e0a905 SHA256 7955bac417b9aab6461e2601288d7ec454b34f1a3fa8df15b9d335dd087241b8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjqdB8ACgkQwnQyISwouHzkggCglklMk3q6Hwz4YctOBiKeARQI
+cbEAn3XIwiRu9sI/9o5CQEWKrA+Rtixb
+=JJHz
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/icon/files/icon-9.4.3-flags.patch b/dev-lang/icon/files/icon-9.4.3-flags.patch
new file mode 100644
index 000000000000..d929e776ca69
--- /dev/null
+++ b/dev-lang/icon/files/icon-9.4.3-flags.patch
@@ -0,0 +1,40 @@
+--- icon.v943src/src/common/Makefile
++++ icon.v943src/src/common/Makefile
+@@ -8,7 +8,7 @@
+ common:		doincl $(OBJS) gpxmaybe
+ 
+ doincl:		doincl.c ../h/arch.h
+-		$(CC) $(CFLAGS) -o doincl doincl.c
++		$(CC) $(CFLAGS) $(LDFLAGS) -o doincl doincl.c
+ 		-./doincl -o ../../bin/rt.h ../h/rt.h
+ 
+ patchstr:	patchstr.c
+@@ -29,7 +29,7 @@
+ 	  ../h/typedefs.h ../h/mproto.h ../h/cpuconf.h
+ 
+ ../h/arch.h:	infer.c
+-		$(CC) $(CFLAGS) -o infer infer.c
++		$(CC) $(CFLAGS) $(LDFLAGS) -o infer infer.c
+ 		./infer >../h/arch.h
+ 
+ identify.o: ../h/version.h
+@@ -46,7 +46,7 @@
+ 
+ #  for rswitch, $(CFLAGS) is deliberately omitted  (-O may cause problems)
+ rswitch.o: ../h/define.h ../h/arch.h $(RSW)
+-	$(CC) -c $(RSW)
++	$(CC) $(CFLAGS) -O0 -c $(RSW)
+ 
+ 
+ #  The following section is needed if changes are made to the Icon grammar,
+--- icon.v943src/src/runtime/Makefile
++++ icon.v943src/src/runtime/Makefile
+@@ -39,7 +39,7 @@
+ 
+ iconx: $(OBJS)
+ 	cd ../common; $(MAKE)
+-	$(CC) $(RLINK) -o iconx  $(OBJS) $(XL) $(RLIBS) $(TL)
++	$(CC) $(LDFLAGS) $(RLINK) -o iconx  $(OBJS) $(XL) $(RLIBS) $(TL)
+ 	cp iconx ../../bin
+ 	strip $(SFLAGS) ../../bin/iconx$(EXE)
+ 
diff --git a/dev-lang/icon/icon-9.4.3-r4.ebuild b/dev-lang/icon/icon-9.4.3-r4.ebuild
new file mode 100644
index 000000000000..ea7e64168c86
--- /dev/null
+++ b/dev-lang/icon/icon-9.4.3-r4.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/icon-9.4.3-r4.ebuild,v 1.1 2008/10/06 20:24:45 truedfx Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PV=${PV//./}
+SRC_URI="http://www.cs.arizona.edu/icon/ftp/packages/unix/icon.v${MY_PV}src.tgz"
+HOMEPAGE="http://www.cs.arizona.edu/icon/"
+DESCRIPTION="very high level language"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X iplsrc"
+
+S="${WORKDIR}/icon.v${MY_PV}src"
+
+DEPEND="X? ( x11-proto/xextproto
+			x11-proto/xproto
+			x11-libs/libX11
+			x11-libs/libXpm
+			x11-libs/libXt )
+	sys-devel/gcc"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}"/${P}-flags.patch
+
+	# Patch the tests so that they do not fail
+	# The following files in tests/standard are patched..
+	# io.icn - change /etc/motd to /etc/gentoo-release
+	# io.std - change /etc/motd to /etc/gentoo-release
+	# kwds.std - add two lines for the two new added keywords
+	# nargs.std - a couple of functions picked up additional parameters
+	epatch "${FILESDIR}/tests-${MY_PV}.patch"
+
+	# do not prestrip files
+	find "${S}"/src -name 'Makefile' | xargs sed -i -e "/strip/d" || die
+}
+
+src_compile() {
+	# select the right compile target.  Note there are many platforms
+	# available
+	local mytarget;
+	if [[ ${CHOST} == *-darwin* ]]; then
+		mytarget="macintosh"
+	else
+		mytarget="linux"
+	fi
+
+	if use X; then
+		emake X-Configure name=${mytarget} -j1 || die
+	else
+		emake Configure name=${mytarget} -j1 || die
+	fi
+
+	echo "#define MultiThread 1" >> src/h/define.h
+	echo "#define EventMon 1" >> src/h/define.h
+	echo "#define Eve 1" >> src/h/define.h
+
+	append-flags $(test-flags -fwrapv)
+
+	emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "Make Failed"
+}
+
+src_test() {
+	make Samples || die "Samples failed"
+	make Test || die "Test failed"
+}
+
+src_install() {
+	dodir /usr
+	dodir /usr/bin
+	dodir /usr/$(get_libdir)
+
+	make Install dest="${D}/usr/$(get_libdir)/icon" || die "Make install failed"
+	dosym /usr/$(get_libdir)/icon/bin/icont /usr/bin/icont
+	dosym /usr/$(get_libdir)/icon/bin/iconx /usr/bin/iconx
+	dosym /usr/$(get_libdir)/icon/bin/icon  /usr/bin/icon
+	dosym /usr/$(get_libdir)/icon/bin/vib   /usr/bin/vib
+
+	cd "${S}/man/man1"
+	doman icont.1
+	doman icon.1
+	rm -rf "${D}"/usr/$(get_libdir)/icon/man
+
+	cd "${S}/doc"
+	dodoc *.txt *.sed ../README
+	# dohtml ignores all anything except .html files, no use here
+	mkdir -p "${D}"/usr/share/doc/${PF}/html
+	cp -dpR *.htm *.gif *.jpg *.css "${D}"/usr/share/doc/${PF}/html
+	rm -rf "${D}"/usr/$(get_libdir)/icon/{doc,README}
+
+	# optional Icon Programming Library
+	if use iplsrc; then
+		cd "${S}"
+		dodir /usr/$(get_libdir)/icon/ipl
+		rm ipl/BuildBin
+		rm ipl/BuildExe
+		rm ipl/CheckAll
+		rm ipl/Makefile
+		insinto /usr/$(get_libdir)/icon
+		doins -r ipl
+	fi
+}