new version (#125258). Install is more FHS and upstream frendly and fixes possible collisions. Updated modular X dependencies.

(Portage version: 2.1_pre6-r5)

4 files changed, 116 insertions, 1 deletions

diff --git a/dev-lang/icon/ChangeLog b/dev-lang/icon/ChangeLog
index 8c89fbf8f17d..5c2675c7c798 100644
--- a/dev-lang/icon/ChangeLog
+++ b/dev-lang/icon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/icon
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/ChangeLog,v 1.11 2006/03/16 14:02:08 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icon/ChangeLog,v 1.12 2006/03/27 11:29:16 george Exp $
+
+*icon-9.4.3 (27 Mar 2006)
+
+  27 Mar 2006; George Shapovalov <george@gentoo.org> +icon-9.4.3.ebuild:
+  new version. Install is more FHS and upstream frendly and fixes possible
+  collisions. Updated modular X dependencies. See #125258 for more details.
+  Thanks to Cheyenne Wills for sorting out many issues.
 
   16 Mar 2006; Caleb Tennis <caleb@gentoo.org> icon-9.4.2.ebuild,
   icon-9.40.ebuild:
diff --git a/dev-lang/icon/Manifest b/dev-lang/icon/Manifest
index fd5896216afa..88dea4dd4526 100644
--- a/dev-lang/icon/Manifest
+++ b/dev-lang/icon/Manifest
@@ -4,6 +4,9 @@ SHA256 fccaa9b19d344dd8cf8a1f985bffbcbbf9d3ed722cd9e6b9dd930c1cb164e571 ChangeLo
 MD5 640a91b011b92976911ea322c40e60f4 files/digest-icon-9.4.2 62
 RMD160 fdeda36fa0437bdf86d6e72be2f413e08e379bf9 files/digest-icon-9.4.2 62
 SHA256 1055b566090e20729e7fdec0229e5db227c17aa78d4b92f26f6cf513fbd3045b files/digest-icon-9.4.2 62
+MD5 16e13028a4cb899cda6a782e1aeeeccc files/digest-icon-9.4.3 232
+RMD160 a63469f5369548d2649151af4a45eaa802d38603 files/digest-icon-9.4.3 232
+SHA256 70ceab069bacd89f913d62869149c22b860e484c7847b10d9597d39ea2fca072 files/digest-icon-9.4.3 232
 MD5 abd61a0d7e185c2ac47a4539c79e5d0c files/digest-icon-9.40 62
 RMD160 170931a9b20968b692cc5ba73fcc037720a3e4c3 files/digest-icon-9.40 62
 SHA256 61bb5137f780d69d53c6a06338e4f3d1bcfb7b78d927c0766bde211987adf012 files/digest-icon-9.40 62
@@ -13,6 +16,9 @@ SHA256 08d180626d40a7eddf76b6790164e01fb81762c35a491789e06ee560279c65f1 files/ic
 MD5 a7105bfe916d7df666490650aa3f6772 icon-9.4.2.ebuild 1446
 RMD160 df1ba8be8d22343f404abda0dded68119e05ab2d icon-9.4.2.ebuild 1446
 SHA256 3e2f0091f720234fd143308d2f1e5e46b78dba7b5e82443df267e351452c55e6 icon-9.4.2.ebuild 1446
+MD5 2a8544acf0c10c8e9c5791e8c2168f31 icon-9.4.3.ebuild 2233
+RMD160 c726c2f696482077273b01b9be082afa70781f6a icon-9.4.3.ebuild 2233
+SHA256 6272df66ab82507c95551f361c612f7d9979ebbbe71c1218c48fc7c83021f186 icon-9.4.3.ebuild 2233
 MD5 562c27300ac8f92312980ace689b090c icon-9.40.ebuild 1172
 RMD160 a3f27588016b2cc2b32b4fe468bfe96ff688fc80 icon-9.40.ebuild 1172
 SHA256 173558b0185dfd3ed2867ca160b6681be1145776fe4fdaaed50ac13961c7269d icon-9.40.ebuild 1172
diff --git a/dev-lang/icon/files/digest-icon-9.4.3 b/dev-lang/icon/files/digest-icon-9.4.3
new file mode 100644
index 000000000000..6a213e1b39ee
--- /dev/null
+++ b/dev-lang/icon/files/digest-icon-9.4.3
@@ -0,0 +1,3 @@
+MD5 4740b1fc5caf2fe7409367923dffe607 icon.v943src.tgz 3218627
+RMD160 af75af7f106920cd59a7f8ac85954aa472ae78e7 icon.v943src.tgz 3218627
+SHA256 d6b6dc508922251748c4ceefbc3a96b54a9f488e260f9f517b5e08dc21615bff icon.v943src.tgz 3218627
diff --git a/dev-lang/icon/icon-9.4.3.ebuild b/dev-lang/icon/icon-9.4.3.ebuild
new file mode 100644
index 000000000000..193f49db5e1c
--- /dev/null
+++ b/dev-lang/icon/icon-9.4.3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2006 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.ebuild,v 1.1 2006/03/27 11:29:16 george Exp $
+
+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 ~ppc-macos ~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 )
+		virtual/x11
+	)
+	sys-devel/gcc"
+
+src_unpack() {
+	unpack ${A}
+
+	#these are not that critical, so no || die ..
+#	cd ${S}
+#	sed -i -e "s:CFLAGS = -O:CFLAGS = ${CFLAGS}:" Makedefs
+	cd ${S}/config
+	grep -rle "CFLAGS = -O" . | xargs sed -i -e "s:CFLAGS = -O:CFLAGS = ${CFLAGS}:"
+}
+
+src_compile() {
+	# select the right compile target.  Note there are many platforms
+	# available
+	local mytarget;
+	if use ppc-macos; then
+		mytarget="ppc_macos"
+	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
+
+	emake -j1  || die "Make Failed"
+}
+
+src_test() {
+	make Samples || die "Samples failed"
+	make Test || die "Test failed"
+}
+
+src_install() {
+	dodir /usr
+	dodir /usr/bin
+	dodir /usr/lib
+
+	make Install dest="${D}/usr/lib/icon" || die "Make install failed"
+	dosym /usr/lib/icon/bin/icont /usr/bin/icont
+	dosym /usr/lib/icon/bin/iconx /usr/bin/iconx
+	dosym /usr/lib/icon/bin/icon  /usr/bin/icon
+	dosym /usr/lib/icon/bin/vib   /usr/bin/vib
+
+	cd "${S}/man/man1"
+	doman icont.1
+	doman icon.1
+	rm -rf ${D}/usr/lib/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/lib/icon/{doc,README}
+
+	# optional Icon Programming Library
+	if use iplsrc; then
+		cd "${S}"
+		dodir /usr/lib/icon/ipl
+		rm ipl/BuildBin
+		rm ipl/BuildExe
+		rm ipl/CheckAll
+		rm ipl/Makefile
+		insinto /usr/lib/icon
+		doins -r ipl
+	fi
+}