patched to work

7 files changed, 119 insertions, 98 deletions

diff --git a/dev-tcltk/itcl/ChangeLog b/dev-tcltk/itcl/ChangeLog
index afe0195164bc..6dae6ff2edca 100644
--- a/dev-tcltk/itcl/ChangeLog
+++ b/dev-tcltk/itcl/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-tcltk/itcl
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/ChangeLog,v 1.1 2002/02/01 21:53:28 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/ChangeLog,v 1.2 2002/05/27 13:31:20 seemant Exp $
+
+*itcl-3.2-r2 (27 May 2002)
+
+  27 May 2002; Seemant Kulleen <seemant@gentoo.org> itcl-3.2-r2.ebuild
+  files/digest-itcl-3.2-r2 files/itcl-3.2-r2-gentoo.diff :
+
+  Adjusted dependency to generic dev-lang/tk instead of specific tk version,
+  and adjusted man page locations to be LFH compliant. This closes bug #2936
+  by kodath@freezingmail.com
 
 *itcl-3.2-r1 (1 Feb 2002)
 
diff --git a/dev-tcltk/itcl/files/digest-itcl-3.2 b/dev-tcltk/itcl/files/digest-itcl-3.2-r2
index 777d05179cb9..777d05179cb9 100644
--- a/dev-tcltk/itcl/files/digest-itcl-3.2
+++ b/dev-tcltk/itcl/files/digest-itcl-3.2-r2
diff --git a/dev-tcltk/itcl/files/itcl-3.2-gentoo.diff b/dev-tcltk/itcl/files/itcl-3.2-gentoo.diff
deleted file mode 100644
index 1821124c95f2..000000000000
--- a/dev-tcltk/itcl/files/itcl-3.2-gentoo.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur itcl3.2.orig/itcl/generic/itcl_class.c itcl3.2/itcl/generic/itcl_class.c
---- itcl3.2.orig/itcl/generic/itcl_class.c	Mon Aug 28 23:58:00 2000
-+++ itcl3.2/itcl/generic/itcl_class.c	Tue May 29 12:00:19 2001
-@@ -960,7 +960,7 @@
-      *    it--as it is being resolved again by the compiler.
-      */
-     cmdPtr = (Command*)mfunc->accessCmd;
--    if (!cmdPtr || cmdPtr->deleted) {
-+    if (!cmdPtr || (cmdPtr->flags & CMD_IS_DELETED)) {
-         mfunc->accessCmd = NULL;
- 
-         if ((flags & TCL_LEAVE_ERR_MSG) != 0) {
-diff -ur itcl3.2.orig/itcl/generic/itcl_ensemble.c itcl3.2/itcl/generic/itcl_ensemble.c
---- itcl3.2.orig/itcl/generic/itcl_ensemble.c	Mon Aug 28 23:58:00 2000
-+++ itcl3.2/itcl/generic/itcl_ensemble.c	Tue May 29 12:05:33 2001
-@@ -819,7 +819,7 @@
-     cmdPtr->clientData = NULL;
-     cmdPtr->deleteProc = DeleteEnsemble;
-     cmdPtr->deleteData = cmdPtr->objClientData;
--    cmdPtr->deleted = 0;
-+    cmdPtr->flags &= ~CMD_IS_DELETED;
-     cmdPtr->importRefPtr = NULL;
- 
-     ensPart->cmdPtr = cmdPtr;
-@@ -896,7 +896,7 @@
-     cmdPtr->clientData = NULL;
-     cmdPtr->deleteProc = deleteProc;
-     cmdPtr->deleteData = (ClientData)clientData;
--    cmdPtr->deleted = 0;
-+    cmdPtr->flags &= ~CMD_IS_DELETED;
-     cmdPtr->importRefPtr = NULL;
- 
-     ensPart->cmdPtr = cmdPtr;
diff --git a/dev-tcltk/itcl/files/itcl-3.2-r2-gentoo.diff b/dev-tcltk/itcl/files/itcl-3.2-r2-gentoo.diff
new file mode 100644
index 000000000000..ad42e8b301f8
--- /dev/null
+++ b/dev-tcltk/itcl/files/itcl-3.2-r2-gentoo.diff
@@ -0,0 +1,73 @@
+diff -urN itcl3.2.old/itcl/generic/itcl_class.c itcl3.2/itcl/generic/itcl_class.c
+--- itcl3.2.old/itcl/generic/itcl_class.c	Mon Aug 28 20:58:00 2000
++++ itcl3.2/itcl/generic/itcl_class.c	Mon May 27 06:17:26 2002
+@@ -960,7 +960,7 @@
+      *    it--as it is being resolved again by the compiler.
+      */
+     cmdPtr = (Command*)mfunc->accessCmd;
+-    if (!cmdPtr || cmdPtr->deleted) {
++    if (!cmdPtr || (cmdPtr->flags & CMD_IS_DELETED)) {
+         mfunc->accessCmd = NULL;
+ 
+         if ((flags & TCL_LEAVE_ERR_MSG) != 0) {
+diff -urN itcl3.2.old/itcl/generic/itcl_ensemble.c itcl3.2/itcl/generic/itcl_ensemble.c
+--- itcl3.2.old/itcl/generic/itcl_ensemble.c	Mon Aug 28 20:58:00 2000
++++ itcl3.2/itcl/generic/itcl_ensemble.c	Mon May 27 06:17:26 2002
+@@ -819,7 +819,7 @@
+     cmdPtr->clientData = NULL;
+     cmdPtr->deleteProc = DeleteEnsemble;
+     cmdPtr->deleteData = cmdPtr->objClientData;
+-    cmdPtr->deleted = 0;
++    cmdPtr->flags &= ~CMD_IS_DELETED;
+     cmdPtr->importRefPtr = NULL;
+ 
+     ensPart->cmdPtr = cmdPtr;
+@@ -896,7 +896,7 @@
+     cmdPtr->clientData = NULL;
+     cmdPtr->deleteProc = deleteProc;
+     cmdPtr->deleteData = (ClientData)clientData;
+-    cmdPtr->deleted = 0;
++    cmdPtr->flags &= ~CMD_IS_DELETED;
+     cmdPtr->importRefPtr = NULL;
+ 
+     ensPart->cmdPtr = cmdPtr;
+diff -urN itcl3.2.old/iwidgets2.2.0/Makefile.in itcl3.2/iwidgets2.2.0/Makefile.in
+--- itcl3.2.old/iwidgets2.2.0/Makefile.in	Mon Aug 28 20:58:00 2000
++++ itcl3.2/iwidgets2.2.0/Makefile.in	Mon May 27 06:20:06 2002
+@@ -31,6 +31,7 @@
+ 
+ srcdir = @srcdir@
+ bindir = @bindir@
++mandir = @mandir@
+ 
+ # The following definition can be set to non-null for special systems
+ # like AFS with replication.  It allows the pathnames used for installation
+@@ -52,7 +53,7 @@
+ INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
+ 
+ # Top-level directory in which to install manual entries:
+-MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
++MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir)
+ 
+ # Directory in which to install manual entry for itclsh:
+ MAN1_INSTALL_DIR = $(MAN_INSTALL_DIR)/man1
+diff -urN itcl3.2.old/iwidgets3.0.0/Makefile.in itcl3.2/iwidgets3.0.0/Makefile.in
+--- itcl3.2.old/iwidgets3.0.0/Makefile.in	Mon Aug 28 20:58:00 2000
++++ itcl3.2/iwidgets3.0.0/Makefile.in	Mon May 27 06:20:30 2002
+@@ -31,6 +31,7 @@
+ 
+ srcdir = @srcdir@
+ bindir = @bindir@
++mandir = @mandir@
+ 
+ # The following definition can be set to non-null for special systems
+ # like AFS with replication.  It allows the pathnames used for installation
+@@ -52,7 +53,7 @@
+ INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
+ 
+ # Top-level directory in which to install manual entries:
+-MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
++MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir)
+ 
+ # Directory in which to install manual entry for itclsh:
+ MAN1_INSTALL_DIR = $(MAN_INSTALL_DIR)/man1
diff --git a/dev-tcltk/itcl/itcl-3.2-r1.ebuild b/dev-tcltk/itcl/itcl-3.2-r1.ebuild
deleted file mode 100644
index 68926d45dff5..000000000000
--- a/dev-tcltk/itcl/itcl-3.2-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/itcl-3.2-r1.ebuild,v 1.1 2002/01/15 01:27:50 gbevin Exp $
-
-S=${WORKDIR}/itcl${PV}
-DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
-SRC_URI="http://dev.scriptics.com/ftp/itcl/itcl${PV}.tar.gz"
-HOMEPAGE="http://dev.scriptics.com/ftp/itcl/"
-
-DEPEND=">=dev-lang/tk-8.4.2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	try patch -p1 < ${FILESDIR}/${PF}-gentoo.diff
-}
-
-src_compile() {
-	./configure --prefix=/usr --host=${CHOST} || die
-	make CFLAGS_DEFAULT="${CFLAGS}" || die
-}
-
-src_install () {
-	make prefix=${D}/usr install || die
-
-	rm ${D}/usr/lib/iwidgets
-	ln -s iwidgets3.0.1 ${D}/usr/lib/iwidgets
-	dodoc CHANGES INCOMPATIBLE README TODO
-	cd ${S}/doc ; docinto doc
-	dodoc README
-}
diff --git a/dev-tcltk/itcl/itcl-3.2-r2.ebuild b/dev-tcltk/itcl/itcl-3.2-r2.ebuild
new file mode 100644
index 000000000000..f65ca9cad47d
--- /dev/null
+++ b/dev-tcltk/itcl/itcl-3.2-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/itcl-3.2-r2.ebuild,v 1.1 2002/05/27 13:31:20 seemant Exp $
+
+MY_P=${PN}${PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
+SRC_URI="http://dev.scriptics.com/ftp/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://www.tcltk.com/itcl/"
+
+DEPEND="dev-lang/tk"
+
+SLOT="0"
+LICENSE="as-is"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${PF}-gentoo.diff || die
+}
+
+src_compile() {
+	econf || die
+	make CFLAGS_DEFAULT="${CFLAGS}" || die
+}
+
+src_install () {
+
+	einstall || die
+
+	rm ${D}/usr/lib/iwidgets
+	ln -s iwidgets3.0.1 ${D}/usr/lib/iwidgets
+	dodoc CHANGES INCOMPATIBLE README TODO license.terms
+	docinto doc
+	dodoc doc/*
+}
diff --git a/dev-tcltk/itcl/itcl-3.2.ebuild b/dev-tcltk/itcl/itcl-3.2.ebuild
deleted file mode 100644
index ec35630cbb11..000000000000
--- a/dev-tcltk/itcl/itcl-3.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/itcl-3.2.ebuild,v 1.3 2001/11/10 12:19:00 hallski Exp $
-
-S=${WORKDIR}/itcl${PV}
-DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
-SRC_URI="http://dev.scriptics.com/ftp/itcl/itcl${PV}.tar.gz"
-HOMEPAGE="http://dev.scriptics.com/ftp/itcl/"
-
-DEPEND=">=dev-lang/tcl-tk-8.4.2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	try patch -p1 < ${FILESDIR}/${PF}-gentoo.diff
-}
-
-src_compile() {
-	./configure --prefix=/usr --host=${CHOST} || die
-	make CFLAGS_DEFAULT="${CFLAGS}" || die
-}
-
-src_install () {
-	make prefix=${D}/usr install || die
-
-	rm ${D}/usr/lib/iwidgets
-	ln -s iwidgets3.0.1 ${D}/usr/lib/iwidgets
-	dodoc CHANGES INCOMPATIBLE README TODO
-	cd ${S}/doc ; docinto doc
-	dodoc README
-}