Version bump, bug #314949

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 178 insertions, 1 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/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
+}