Version bumped, bug #149351.

(Portage version: 2.1.2.4)

6 files changed, 18 insertions, 42 deletions

diff --git a/dev-tcltk/tkzinc/ChangeLog b/dev-tcltk/tkzinc/ChangeLog
index 494fc673f80b..783ceba7cfd8 100644
--- a/dev-tcltk/tkzinc/ChangeLog
+++ b/dev-tcltk/tkzinc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-tcltk/tkzinc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkzinc/ChangeLog,v 1.3 2007/02/09 02:58:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkzinc/ChangeLog,v 1.4 2007/04/28 00:12:47 matsuu Exp $
+
+*tkzinc-3.3.4 (28 Apr 2007)
+
+  28 Apr 2007; MATSUU Takuto <matsuu@gentoo.org> -files/fix-makefile.patch,
+  -files/without-opengl.patch, -tkzinc-3.2.100.ebuild, +tkzinc-3.3.4.ebuild:
+  Fixed bash-3.1 issue, bug #149351.
+  Version bumped.
+  Added ~amd64.
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/dev-tcltk/tkzinc/files/digest-tkzinc-3.2.100 b/dev-tcltk/tkzinc/files/digest-tkzinc-3.2.100
deleted file mode 100644
index 1501941d2c9a..000000000000
--- a/dev-tcltk/tkzinc/files/digest-tkzinc-3.2.100
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e7e43f79f8d67167a587ef85f5e86a76 zinc-tk_3.2.100.tar.gz 1151350
-RMD160 8eee25003cddf89f4e9b86a89bf3b772ccc2634e zinc-tk_3.2.100.tar.gz 1151350
-SHA256 e9e64593aae58722d9f1e2d66fec7d44b1988fb02f6145fd2855b08c34a32643 zinc-tk_3.2.100.tar.gz 1151350
diff --git a/dev-tcltk/tkzinc/files/digest-tkzinc-3.3.4 b/dev-tcltk/tkzinc/files/digest-tkzinc-3.3.4
new file mode 100644
index 000000000000..ff50d6ba6fe1
--- /dev/null
+++ b/dev-tcltk/tkzinc/files/digest-tkzinc-3.3.4
@@ -0,0 +1,3 @@
+MD5 627b19266991833607873bbbe8efcc59 zinc-tk_3.3.4.tar.gz 2785947
+RMD160 984925dc69e3594e144a00cb9fb4409438da2ce0 zinc-tk_3.3.4.tar.gz 2785947
+SHA256 5f65fd1bf8e2d26736c892758b74259eb8642346b92d6467ea8653b5f744e26c zinc-tk_3.3.4.tar.gz 2785947
diff --git a/dev-tcltk/tkzinc/files/fix-makefile.patch b/dev-tcltk/tkzinc/files/fix-makefile.patch
deleted file mode 100644
index e58ac022506a..000000000000
--- a/dev-tcltk/tkzinc/files/fix-makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.in~	2004-05-07 17:31:55.000000000 +0800
-+++ Makefile.in	2004-08-08 15:51:53.233904744 +0800
-@@ -374,7 +374,7 @@
- # the configure script output the pkgIndex.tcl by editing configure.in.
- 
-#========================================================================
- 
--pkgIndex.tcl:
-+pkgIndex.tcl: $($(PACKAGE)_LIB_FILE)
- 	( echo package require Tk \; pkg_mkIndex -verbose -load Tk . $($(PACKAGE)_LIB_FILE) \; exit ) | $(TCLSH)
- 
- pkgIndex.tcl-hand:
diff --git a/dev-tcltk/tkzinc/files/without-opengl.patch b/dev-tcltk/tkzinc/files/without-opengl.patch
deleted file mode 100644
index 870e13665e3f..000000000000
--- a/dev-tcltk/tkzinc/files/without-opengl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- generic/tkZinc.c~	2004-07-30 15:16:33.000000000 +0800
-+++ generic/tkZinc.c	2004-08-06 16:29:51.553140552 +0800
-@@ -1450,7 +1450,9 @@
- 				   wi->width, wi->height, Tk_Depth(wi->win));
-   }
-   else {
-+#ifdef GL
-     InitRendering1(wi);
-+#endif
-   }
- 
- #ifdef PTK
-
diff --git a/dev-tcltk/tkzinc/tkzinc-3.2.100.ebuild b/dev-tcltk/tkzinc/tkzinc-3.3.4.ebuild
index f1acf8707c22..95d3e6e1bd90 100644
--- a/dev-tcltk/tkzinc/tkzinc-3.2.100.ebuild
+++ b/dev-tcltk/tkzinc/tkzinc-3.3.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkzinc/tkzinc-3.2.100.ebuild,v 1.2 2004/08/30 23:38:07 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkzinc/tkzinc-3.3.4.ebuild,v 1.1 2007/04/28 00:12:47 matsuu Exp $
 
 inherit eutils
 
@@ -9,21 +9,13 @@ HOMEPAGE="http://www.tkzinc.org"
 SRC_URI="http://www.tkzinc.org/Packages/zinc-tk_${PV}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~x86 ~ppc"
 IUSE="threads opengl doc"
 DEPEND=">=dev-lang/tk-8.4
 	opengl? ( virtual/opengl )
 	doc? ( virtual/tetex )"
 
-S=${WORKDIR}/Tkzinc
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/without-opengl.patch
-	epatch ${FILESDIR}/fix-makefile.patch
-}
+S="${WORKDIR}/Tkzinc"
 
 src_compile() {
 	local myconf
@@ -42,8 +34,9 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 
 	dodoc BUGS README
+	dohtml -r doc/*
 	use doc && dodoc doc/refman.pdf
 }