add error checking to old ebuild, and rewrite new ebuild for version bump

6 files changed, 168 insertions, 8 deletions

diff --git a/dev-tcltk/itcl/ChangeLog b/dev-tcltk/itcl/ChangeLog
index 13e1af3ef8ad..8c52fb8ed131 100644
--- a/dev-tcltk/itcl/ChangeLog
+++ b/dev-tcltk/itcl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/itcl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/ChangeLog,v 1.9 2003/10/27 02:01:14 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/ChangeLog,v 1.10 2003/10/29 04:44:27 robbat2 Exp $
+
+*itcl-3.2.1 (28 Oct 2003)
+
+  28 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> itcl-3.2-r2.ebuild,
+  itcl-3.2.1.ebuild, files/itcl-3.2.1-gentoo.diff:
+  add error checking to old ebuild, and rewrite new ebuild for version bump
 
   26 Oct 2003; Brad House <brad_mssw@gentoo.org> itcl-3.2-r2.ebuild:
   add amd64 flag
diff --git a/dev-tcltk/itcl/Manifest b/dev-tcltk/itcl/Manifest
index 738710923ce3..1eab083ff5b6 100644
--- a/dev-tcltk/itcl/Manifest
+++ b/dev-tcltk/itcl/Manifest
@@ -1,4 +1,7 @@
-MD5 f421ee53982410c0cf039924a1d964f9 ChangeLog 1507
-MD5 83d6f2c589fbe3ce7d80a1c804832769 itcl-3.2-r2.ebuild 844
-MD5 d78d1b2bd36da73b8fb0ff8e5663ec26 files/digest-itcl-3.2-r2 60
+MD5 0662d07e236ff237e7ffab15892be129 itcl-3.2.1.ebuild 924
+MD5 811e240330b9176df20edfe4210adc3f itcl-3.2-r2.ebuild 888
+MD5 df592d90eadbf74fe7cb06854b589e6b ChangeLog 1733
+MD5 e3a3b717c90821cebb7c3e22fa8be626 files/digest-itcl-3.2.1 62
 MD5 d491331a9a5e13cc91ebb8070cc378da files/itcl-3.2-r2-gentoo.diff 1540
+MD5 67dc49dd69f1b7df89aa5f4198b18352 files/itcl-3.2.1-gentoo.diff 4282
+MD5 d78d1b2bd36da73b8fb0ff8e5663ec26 files/digest-itcl-3.2-r2 60
diff --git a/dev-tcltk/itcl/files/digest-itcl-3.2.1 b/dev-tcltk/itcl/files/digest-itcl-3.2.1
new file mode 100644
index 000000000000..03ecfeb99094
--- /dev/null
+++ b/dev-tcltk/itcl/files/digest-itcl-3.2.1
@@ -0,0 +1 @@
+MD5 44dcc2129232329cacd6c8abebf38403 itcl3.2.1_src.tgz 427026
diff --git a/dev-tcltk/itcl/files/itcl-3.2.1-gentoo.diff b/dev-tcltk/itcl/files/itcl-3.2.1-gentoo.diff
new file mode 100644
index 000000000000..fafc61ed4a95
--- /dev/null
+++ b/dev-tcltk/itcl/files/itcl-3.2.1-gentoo.diff
@@ -0,0 +1,116 @@
+diff -ru itcl3.2.1.old/itcl/Makefile.in itcl3.2.1/itcl/Makefile.in
+--- itcl3.2.1.old/itcl/Makefile.in	2001-05-29 11:51:16.000000000 -0400
++++ itcl3.2.1/itcl/Makefile.in	2003-06-11 18:12:50.000000000 -0400
+@@ -269,16 +269,16 @@
+ #========================================================================
+ 
+ install-libraries: libraries
+-	$(mkinstalldirs) $(includedir)
++	$(mkinstalldirs) $(DESTDIR)$(includedir)
+ 	@echo "Installing header files in $(includedir)"
+ 	@for i in $(GENERIC_HDRS) ; do \
+ 	    echo "Installing $$i" ; \
+-	    $(INSTALL_DATA) $$i $(includedir) ; \
++	    $(INSTALL_DATA) $$i $(DESTDIR)$(includedir) ; \
+ 	done;
+ 	@echo "Installing library files in $(ITCL_LIBRARY)"
+ 	@for i in $(srcdir)/library/*.tcl ; do \
+ 	    echo "Installing $$i" ; \
+-	    $(INSTALL_DATA) $$i $(ITCL_LIBRARY) ; \
++	    $(INSTALL_DATA) $$i $(DESTDIR)$(ITCL_LIBRARY) ; \
+ 	done;
+ 
+ #========================================================================
+@@ -287,13 +287,13 @@
+ #========================================================================
+ 
+ install-doc: doc
+-	$(mkinstalldirs) $(mandir)/mann
++	$(mkinstalldirs) $(DESTDIR)$(mandir)/mann
+ 	@echo "Installing man pages in $(mandir)"
+ 	@for i in $(srcdir)/doc/*.n; \
+ 	    do \
+ 	    echo "Installing $$i"; \
+-	    rm -f $(mandir)/mann/`basename $$i`; \
+-	    $(INSTALL_DATA) $$i $(mandir)/mann ; \
++	    rm -f $(DESTDIR)$(mandir)/mann/`basename $$i`; \
++	    $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/mann ; \
+ 	    done
+ 
+ test: $(TCLSH_PROG)
+@@ -443,7 +443,7 @@
+ 	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
+ 	  else :; fi; \
+ 	done
+-	$(INSTALL_DATA) pkgIndex.tcl $(pkglibdir)
++	$(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir)
+ 
+ #========================================================================
+ # Install binary executables (e.g. .exe files)
+@@ -481,7 +481,7 @@
+ 	$(mkinstalldirs)  $(DESTDIR)$(libdir)
+ 	$(mkinstalldirs)  $(DESTDIR)$(bindir)
+ 	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
+-	$(mkinstalldirs)  $(ITCL_LIBRARY)
++	$(mkinstalldirs)  $(DESTDIR)$(ITCL_LIBRARY)
+ 
+ .PHONY: all binaries clean depend distclean doc install installdirs \
+ libraries test
+diff -ru itcl3.2.1.old/itk/Makefile.in itcl3.2.1/itk/Makefile.in
+--- itcl3.2.1.old/itk/Makefile.in	2001-05-29 11:51:16.000000000 -0400
++++ itcl3.2.1/itk/Makefile.in	2003-06-11 18:11:49.000000000 -0400
+@@ -264,16 +264,16 @@
+ #========================================================================
+ 
+ install-libraries: libraries
+-	$(mkinstalldirs) $(includedir)
++	$(mkinstalldirs) $(DESTDIR)$(includedir)
+ 	@echo "Installing header files in $(includedir)"
+ 	@for i in $(GENERIC_HDRS) ; do \
+ 	    echo "Installing $$i" ; \
+-	    $(INSTALL_DATA) $$i $(includedir) ; \
++	    $(INSTALL_DATA) $$i $(DESTDIR)$(includedir) ; \
+ 	done;
+ 	@echo "Installing library files in $(ITK_LIBRARY)"
+ 	@for i in $(srcdir)/library/*.* $(srcdir)/library/tclIndex ; do \
+ 	    echo "Installing $$i" ; \
+-	    $(INSTALL_DATA) $$i $(ITK_LIBRARY) ; \
++	    $(INSTALL_DATA) $$i $(DESTDIR)$(ITK_LIBRARY) ; \
+ 	done;
+ 
+ #========================================================================
+@@ -282,13 +282,13 @@
+ #========================================================================
+ 
+ install-doc: doc
+-	$(mkinstalldirs) $(mandir)/mann
++	$(mkinstalldirs) $(DESTDIR)$(mandir)/mann
+ 	@echo "Installing man pages in $(mandir)"
+ 	@for i in $(srcdir)/doc/*.n; \
+ 	    do \
+ 	    echo "Installing $$i info $(mandir)/mann"; \
+-	    rm -f $(mandir)/mann/`basename $$i`; \
+-	    $(INSTALL_DATA) $$i $(mandir)/mann ; \
++	    rm -f $(DESTDIR)$(mandir)/mann/`basename $$i`; \
++	    $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/mann ; \
+ 	    done
+ 
+ test: $(TCLSH_PROG)
+@@ -417,7 +417,7 @@
+ 	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
+ 	  else :; fi; \
+ 	done
+-	$(INSTALL_DATA) pkgIndex.tcl $(pkglibdir)
++	$(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir)
+ 
+ #========================================================================
+ # Install binary executables (e.g. .exe files)
+@@ -455,7 +455,7 @@
+ 	$(mkinstalldirs)  $(DESTDIR)$(libdir)
+ 	$(mkinstalldirs)  $(DESTDIR)$(bindir)
+ 	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
+-	$(mkinstalldirs)  $(ITK_LIBRARY)
++	$(mkinstalldirs)  $(DESTDIR)$(ITK_LIBRARY)
+ 
+ .PHONY: all binaries clean depend distclean doc install installdirs \
+ libraries test
diff --git a/dev-tcltk/itcl/itcl-3.2-r2.ebuild b/dev-tcltk/itcl/itcl-3.2-r2.ebuild
index c51b8a3f4cb5..85aee3037ab8 100644
--- a/dev-tcltk/itcl/itcl-3.2-r2.ebuild
+++ b/dev-tcltk/itcl/itcl-3.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/itcl-3.2-r2.ebuild,v 1.10 2003/10/27 02:01:14 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/itcl-3.2-r2.ebuild,v 1.11 2003/10/29 04:44:27 robbat2 Exp $
 
 MY_P=${PN}${PV}
 S=${WORKDIR}/${MY_P}
@@ -22,12 +22,12 @@ src_unpack() {
 }
 
 src_compile() {
-	econf || die
-	make CFLAGS_DEFAULT="${CFLAGS}" || die
+	econf || die "Econf failed"
+	make CFLAGS_DEFAULT="${CFLAGS}" || die "Make failed"
 }
 
 src_install() {
-	einstall || die
+	einstall || die "Einstall failed"
 
 	rm ${D}/usr/lib/iwidgets
 	ln -s iwidgets3.0.1 ${D}/usr/lib/iwidgets
diff --git a/dev-tcltk/itcl/itcl-3.2.1.ebuild b/dev-tcltk/itcl/itcl-3.2.1.ebuild
new file mode 100644
index 000000000000..83c88a754162
--- /dev/null
+++ b/dev-tcltk/itcl/itcl-3.2.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/itcl-3.2.1.ebuild,v 1.1 2003/10/29 04:44:27 robbat2 Exp $
+
+MY_P=${PN}${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
+SRC_URI="mirror://sourceforge/incrtcl/${MY_P}_src.tgz"
+HOMEPAGE="http://www.tcltk.com/${PN}/"
+
+SLOT="0"
+LICENSE="as-is BSD"
+KEYWORDS="~x86 ~ppc ~sparc"
+DEPEND="dev-lang/tk"
+PDEPEND="dev-tcltk/iwidgets"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PF}-gentoo.diff
+}
+
+src_compile() {
+	econf || die "econf failed"
+	emake DESTDIR="${D}" CFLAGS_DEFAULT="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die	"make install failed"
+	dodoc CHANGES INCOMPATIBLE README TODO license.terms
+	dodoc doc/*
+	dosym /usr/lib/itcl3.2 /usr/lib/itcl
+	dosym /usr/lib/itk3.2 /usr/lib/itk
+}