Version bump, bug #314949

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 185 insertions, 5 deletions

diff --git a/dev-lang/icon/ChangeLog b/dev-lang/icon/ChangeLog
index 8f72bb26569c..461d44f88f67 100644
--- a/dev-lang/icon/ChangeLog
+++ b/dev-lang/icon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/icon
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/ChangeLog,v 1.39 2010/04/14 19:44:51 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/ChangeLog,v 1.40 2010/04/18 20:33:15 truedfx Exp $
+
+*icon-9.5.0 (18 Apr 2010)
+
+  18 Apr 2010; Harald van Dijk <truedfx@gentoo.org> +icon-9.5.0.ebuild,
+  +files/icon-9.5.0-flags.patch:
+  Version bump, bug #314949
 
   14 Apr 2010; Harald van Dijk <truedfx@gentoo.org>
   files/icon-9.4.3-flags.patch:
diff --git a/dev-lang/icon/Manifest b/dev-lang/icon/Manifest
index bb70cf44e1dd..f5dcc36b8985 100644
--- a/dev-lang/icon/Manifest
+++ b/dev-lang/icon/Manifest
@@ -2,7 +2,9 @@
 Hash: SHA1
 
 AUX icon-9.4.3-flags.patch 1783 RMD160 eb0eadb4ec18ab402c6c6ac63fa0f76fd7c2e7b3 SHA1 54a4125dfa8896754e2d7653fb27b1dbb7ba76dc SHA256 d70b68b5e213fa997af00ad020d4f207f8ecc625afb7d3c1508161d2dedc4848
+AUX icon-9.5.0-flags.patch 2148 RMD160 14b589d856f9949d47328df439a6c620c43ce456 SHA1 db17b062454e26f7755f89bfe41541de68c181c6 SHA256 f88abdd831b2fb23a5624396c9378df3816402567209d7073d588313084d6102
 AUX tests-943.patch 3643 RMD160 80bbfd6cb8a15ba6c40997a9db74e67b5245d635 SHA1 0afed4ccccf6b6211004e88c7f25ff4d1f4ce9e2 SHA256 78222584fab1d1906baceca5cc950deb3458493cdc553f7f00def395af174900
+DIST icon-v950src.tgz 3115766 RMD160 94f46adc3296a93b54167ed2a5fac81a481a4322 SHA1 0e26ba1eef6db81f3b0be942daec82ea51d33718 SHA256 ceb558bcf5b2edc3252b2d1d4ed640d2a218196f73d299b052f1e0c50e9b1557
 DIST icon.v942src.tgz 3204076 RMD160 7e0ec62b714c433acb23a31bad62028424f72ead SHA1 9536e9346188deb2dc5853e03b5f7a85991314b1 SHA256 483118e7d70f3cb05e1ba9712c60c460cd699269380db0658377dea10b51ce27
 DIST icon.v943src.tgz 3218627 RMD160 af75af7f106920cd59a7f8ac85954aa472ae78e7 SHA1 92bd3347807b333fb903edf61a2805f2e1159577 SHA256 d6b6dc508922251748c4ceefbc3a96b54a9f488e260f9f517b5e08dc21615bff
 EBUILD icon-9.4.2.ebuild 1352 RMD160 02a828231e10dc0bc059b0e913747fc4b7198ade SHA1 81756341c6280151ed1b14cdf1512c4fee37eb27 SHA256 19a382e5f6a1a057d24fa2687ccc43c1d682732f2ca4d79e570df600223b17fa
@@ -11,12 +13,13 @@ EBUILD icon-9.4.3-r2.ebuild 2519 RMD160 3fffa24ac4fa1909b2b570b3ab29184e38c18e21
 EBUILD icon-9.4.3-r3.ebuild 2728 RMD160 99a42cf7fe20f247afc2dd56dc2f3c6644172471 SHA1 006ad44bace292c0e643f2e9e0305fcb9c907798 SHA256 7c8e4c40138e4a95296002f962d27c187202ec04139a58c1b2dbddfc0db0d7c5
 EBUILD icon-9.4.3-r5.ebuild 2895 RMD160 8969f21398d4b2dce5263b0845f60d8b9df02a15 SHA1 55b7f867cd4073636cd68794464072feb951abd4 SHA256 f0e6755cd60af1e2863d3615ef4add3e50f41fb7ca6e5ea42210e3adcc1045fe
 EBUILD icon-9.4.3.ebuild 2239 RMD160 a701e2d52189a0dfa41bc5c8e329e6c97b3b9187 SHA1 21d2e7f4a2c02817c834340f4ae4e72cc0ef9b98 SHA256 b8383f2a7cf622c31f73029abdcaf6d5511fa4690418a7a24d9d34f59b7faa5d
-MISC ChangeLog 5916 RMD160 887e264d912e351625d8ad85acc5a7f4fd48db05 SHA1 716dffd8e2b4b3ae3749d55664ea1ed812dcef5e SHA256 35229ca346a05d5234511d76b5b6bee279c471be9e21dd9f16a3920a966af44a
+EBUILD icon-9.5.0.ebuild 2394 RMD160 91d18414ef7a761985b1a22c7aa23c0b0c898432 SHA1 ecc4293ec068b43490008f61dff7830365205014 SHA256 0fcb68d1603b458781db533a4f4f878149dc995ef1b3ad2c3c87e70838f3cf27
+MISC ChangeLog 6077 RMD160 9aea99722a3b7c3550fafd8293921d0294396957 SHA1 4d00d32611c67ddfba7f46856ce1ee1cf450e12a SHA256 54a3fdeee6c4ec4dbbc825519dfef5195166701a68593fd250dd96c83d4e040f
 MISC metadata.xml 244 RMD160 b2f04edcd2d3ff57e0ba36211770eaec51e4c6c6 SHA1 c8d47ce6a7ee64cc3d86fa9fea8c0293a5e0a905 SHA256 7955bac417b9aab6461e2601288d7ec454b34f1a3fa8df15b9d335dd087241b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvGGz0ACgkQwnQyISwouHw5ZQCfXYGvHu/G8RZdRr3AjVHJ05fS
-TKsAoJRqq+YbtO+eUdFnGam9rI2tAagr
-=2hUp
+iEYEARECAAYFAkvLbJ0ACgkQwnQyISwouHwKOgCfb5vNTs+eqg0ZSVM8b+C29Ibm
+dTUAn0uXAGNaGsOd1GszZ3i8kKoUWfZ0
+=hCye
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/icon/files/icon-9.5.0-flags.patch b/dev-lang/icon/files/icon-9.5.0-flags.patch
new file mode 100644
index 000000000000..33fa9485c206
--- /dev/null
+++ b/dev-lang/icon/files/icon-9.5.0-flags.patch
@@ -0,0 +1,75 @@
+--- icon-v950src/ipl/cfuncs/Makefile
++++ icon-v950src/ipl/cfuncs/Makefile
+@@ -25,7 +25,7 @@
+ # library
+ 
+ $(FUNCLIB):	$(FUNCS) mklib.sh
+-		CC="$(CC)" CFLAGS="$(CFLAGS)" BIN="../../bin" \
++		CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" BIN="../../bin" \
+ 		    sh mklib.sh $(FUNCLIB) $(FUNCS)
+ $(FUNCS):	icall.h
+ 
+--- icon-v950src/ipl/cfuncs/mklib.sh
++++ icon-v950src/ipl/cfuncs/mklib.sh
+@@ -12,7 +12,7 @@
+ set -x
+ case "$SYS" in
+    Linux*|*BSD*|GNU*)
+-      $CC -shared -o $LIBNAME -fPIC "$@";;
++      $CC -shared -o $LIBNAME $CFLAGS $LDFLAGS -fPIC "$@";;
+    CYGWIN*)
+       # move the win32 import library for iconx.exe callbacks
+       # created when iconx.exe was built
+--- icon-v950src/ipl/packs/loadfunc/Makefile
++++ icon-v950src/ipl/packs/loadfunc/Makefile
+@@ -28,7 +28,7 @@
+ 		echo '$$define FUNCLIB "./$(FUNCLIB)"'	>libnames.icn
+ 
+ $(FUNCLIB):	$(FUNCS)
+-		CC="$(CC)" CFLAGS="$(CFLAGS)" BIN="../../../bin" \
++		CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" BIN="../../../bin" \
+ 			sh $(MKLIB) $(FUNCLIB) $(FUNCS)
+ 
+ 
+--- icon-v950src/src/common/Makefile
++++ icon-v950src/src/common/Makefile
+@@ -8,7 +8,7 @@
+ common:		$(OBJS) gpxmaybe
+ 
+ patchstr:	patchstr.c
+-		$(CC) $(CFLAGS) -o patchstr patchstr.c
++		$(CC) $(CFLAGS) $(LDFLAGS) -o patchstr patchstr.c
+ 
+ gpxmaybe:
+ 		-if [ "x$(XL)" != "x" ]; then $(MAKE) $(GDIR); fi
+@@ -25,7 +25,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
+--- icon-v950src/src/rtt/Makefile
++++ icon-v950src/src/rtt/Makefile
+@@ -22,7 +22,7 @@
+ 
+ 
+ rtt:	$(OBJ)
+-	$(CC) $(LDFLAGS) -o rtt $(OBJ)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o rtt $(OBJ)
+ 
+ library:	$(OBJ)
+ 		rm -rf rtt.a
+--- icon-v950src/src/runtime/Makefile
++++ icon-v950src/src/runtime/Makefile
+@@ -30,7 +30,7 @@
+ 
+ iconx: $(COBJS) $(XOBJS)
+ 	cd ../common; $(MAKE)
+-	$(CC) $(RLINK) -o iconx $(XOBJS) $(COBJS) $(XL) $(RLIBS) $(TLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(RLINK) -o iconx $(XOBJS) $(COBJS) $(XL) $(RLIBS) $(TLIBS)
+ 	cp iconx ../../bin
+ 	strip $(SFLAGS) ../../bin/iconx$(EXE)
+ 
diff --git a/dev-lang/icon/icon-9.5.0.ebuild b/dev-lang/icon/icon-9.5.0.ebuild
new file mode 100644
index 000000000000..9f4a303e4cd0
--- /dev/null
+++ b/dev-lang/icon/icon-9.5.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/icon-9.5.0.ebuild,v 1.1 2010/04/18 20:33:15 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}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-flags.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
+
+	append-flags $(test-flags -fno-strict-aliasing -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
+}