7 files changed, 133 insertions, 347 deletions
diff --git a/dev-util/insight/ChangeLog b/dev-util/insight/ChangeLog
index 080c2cd81972..83958f891ff9 100644
--- a/dev-util/insight/ChangeLog
+++ b/dev-util/insight/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/insight
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/ChangeLog,v 1.55 2013/02/03 11:41:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/ChangeLog,v 1.56 2013/02/04 07:16:04 xarthisius Exp $
+
+*insight-6.8.1-r1 (04 Feb 2013)
+
+  04 Feb 2013; Kacper Kowalik <xarthisius@gentoo.org> +insight-6.8.1-r1.ebuild,
+  -files/insight-6.6-DESTDIR.patch, -files/insight-6.6-burn-paths.patch,
+  -files/tkImgGIF.patch, -insight-6.7.1-r1.ebuild:
+  Fix building with tcl-6.0 and glibc-2.16. Fixes #452820, #441036. Thanks to
+  Helmut Jarausch <jarausch@igpm.rwth-aachen.de> and Ian Abbott <ian@abbott.org>
+  for their patches. Drop old
 
   03 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due #453094
diff --git a/dev-util/insight/Manifest b/dev-util/insight/Manifest
index 3005e4c94465..11f220d5bd3e 100644
--- a/dev-util/insight/Manifest
+++ b/dev-util/insight/Manifest
@@ -2,20 +2,27 @@
 Hash: SHA256
 
 AUX 99insight 70 SHA256 3d2b493b8b7879f26b8189b3d424aeefa39f9eba1784b34c6741882eff9c1e78 SHA512 18d4f5c376b224568a5ea9a67a4dcc30491bee15544cc9732e570964e9c69d47b76904fa2dac99360058e1d3a15828d1158d81aaeb5e9e658a9556b210871efc WHIRLPOOL 873a98ce5b4a154a4d5cb3d080eb24660d7b50890c824b973cb28cc6e799cfc6293df1e719f78a7aa1145499cd1640b6ceb341256493bc1f6d5301767e94d4e2
-AUX insight-6.6-DESTDIR.patch 7362 SHA256 3a8680c762b3d3fd75a02662dc5d0fac262e30aa91407b7cf553abd201b6d0a0 SHA512 4fdc220a38215dba2741e9b2f13efee0db13e2b09a6432cb5afbc0500da719635d2fd1101c8a1789295ff431730b655afce068c6f6320c92b30a0571c0ab32f7 WHIRLPOOL 263d90c6c5ac533fb942c2c36f80764c538fb8af89030c22cca38b25c47d2d72b68b4e6455022fb7de7339bcdc70aefd016f2b4007f0a6422aef42b2a172d40f
-AUX insight-6.6-burn-paths.patch 446 SHA256 c80421818de4f7daaf1b8fde2251a06dc97b8de1fa38d6ef77aecabd301bf182 SHA512 e7b6751b4853fcce8b1d14318e14d3b0981081285b70dbde532be7502f5d36e2034ac031b312408dab26226840493acedf4aecc6bedb5a0dceeb3b81fe515744 WHIRLPOOL b9f2c5ba4ae43ca6a95cb0ab75ecbf91117568a665f765ce4efc89bb17fa04859b591414e4301c84f86bed3bda4b699c72024e4a66c45a01c32a7e206a2e48d4
-AUX tkImgGIF.patch 2577 SHA256 cd43fc8520b42f0c4a4b82cc89ae5b980f08426d1aa9936de28312e1e1f5b9d9 SHA512 138b8042aecf1bc38964350d16f5acaa7c1bf702b921457177559edfdd63a8ca31b8972a5f80308cba5c2504cfa1190e40d8ae27d3034bc5ca78a7c6c4dd156a WHIRLPOOL fb3fcc0777325b1940c6bc8a5a0b1af96825da5d17f30c0ff1861879f8b95e4e2dba68636104fdd3e563365817ca9f4f69ad26a830fcb236258b32a6312874ee
-DIST insight-6.7.1.tar.bz2 23172660 SHA256 c3b3fd534b1da4be279517e1755ce4fa65bc011ed0d62a1bb7e1aab219513542 SHA512 32eb8590072c64c22f70048a85cb449aec07855d10d1a97d1dd5d4ee8c2aaee14001a830d97ea6a9e70014a7657173dc7021066fdbc073abfcc7ee25f1284177 WHIRLPOOL 644fc2e4e53e53b888aa7848a36966d5f5603b8f19f667a25088bcd90b9951dd339f7579c875001b5d417b927a405eacf11bfc77096cf7a4919b80d220cb5124
 DIST insight-6.8-1a.tar.bz2 23900337 SHA256 51216df73adc4f68c67b60356270d5073f0ff094c1b477ecd96560f49707ea2a SHA512 ce9d5ea0ef651dbeda24f042417e6d30dd4734af5da6a02dfbdcdc777b44d816597c2f81a8beaf8b74cec07c38f3671fd38d9a39527d9ece899f5f3785d0254d WHIRLPOOL ea27f3de71460f40e78621878abad2cbfe94bc46cff0f741bf7401d8dfef79288748efb33271a48ad2eac026bec1a4728e48723ae19046def6501688eb290511
 DIST insight-6.8.1-patchset-01.tar.xz 324484 SHA256 54ca13a95d46941ebd25b8db2e31f6dcad9201dd0a414af296057b9fa91a9d0e SHA512 98551f1bdb77568ccdaf0217942cef2b3a4e6b5e5e6c27985ea805da54481fa680daaf7cc7331bc6f0a1c765d93fc8e2d8a5f76d4f56ec548e40406756aebb32 WHIRLPOOL d91122cb92078984d9d4904cb1d2a93d3c7485a37519b948be4d725ca0cd039dae57f419a242b466ce2224d2dac41d948afaded960559700e7c9f1ea8a5aeef2
-EBUILD insight-6.7.1-r1.ebuild 1895 SHA256 bca3c9750b236166b342b92e3e382138a765f94d62ea60dad040c9d119c5e629 SHA512 606b30a11e11b34634bb6361b29f49db5ec5fb0758827d21aee47fd9c41521e4e126dcca67e7f395c3c03184c90da22d1835392030b64f2ed20170de9dae2b61 WHIRLPOOL 78646c6f768ec2b768c45948b5b9d1a88bbd94706254cfda5184c4fa8f91900234c44e616035941b571cd35f0f585ceeaedf7de2db94ec16995542a2b67e941e
+DIST insight-6.8.1-patchset-02.tar.xz 325772 SHA256 294c80770a1dab976d0daf1439b5721d57b0d89aa164d39f7cfb3f6c3109712d SHA512 1759e9d19115da634b3e57cd3aa6d628b2fbcea1666d5f34ce81c87d03112dc257a84c02fe87cc903fe505631310b72b0e0b60bace79932446bd1f864cf1c2a7 WHIRLPOOL 09b1681efc0d1f0a7b2c4bdaae8b80334af5db8c031ad9b8d70df77b0e272137854df4356562ad903afd285be1943d53dd2afd4b89a97cefb84e3ab4bfac6227
+EBUILD insight-6.8.1-r1.ebuild 2567 SHA256 0ab1a05842e946bdcb4e05fb78663229f58923aab8f9d41de7ba643bb1f64068 SHA512 3f057a2762f4bb6f883f825fdcd41da8df1b9052fceb5ad8c8e78b9cc9e5c4cbc7bdac3cc6306af16f5470e25a1a18e3ecca3308d4a5975ea1eba4b892632acc WHIRLPOOL 5d95f58f6fae2f3601b43b15b4d211613eaedd2234ec901f47a1d730c7f5eb6778137f7203bb454523835596970803f016788d9514895cab53c79928754b6853
 EBUILD insight-6.8.1.ebuild 2555 SHA256 b18d155f457d761be2ec511262157c272587750d49abc786f580309a66e615fe SHA512 a39613be58009593f75c2f785626e1478baeec96c62b0cb2c8288aa1f3adaed43aae6eb18f63202d310acae603d1da4d2a77a6591226f3b36f94b56da69aa4e1 WHIRLPOOL 1db0caf13e0f8735c3489879ae491a4cef2b05d26caa922d3f106fd6361b84a5ea97277d2948a1e42cdcd01e50094f422a52218a980e809e9c9a14f03fba34bc
-MISC ChangeLog 6601 SHA256 5cefd64a0fb7ca313670b2ecd887283cf526570118593321aae83865879c053a SHA512 0a7bf17c595b1fa81751121561510bbda8c2a09326a7358a009f01e044b83adef273b5bc3353ad6549186ffbda047ecbe1109582e61f675ac3813efcb95ec279 WHIRLPOOL 9fe061ba5ce7fc8e23982ab92e30194fb48c9e02a40b69c261593635ef80f9bf98445a25e935230c5b1a941df7daf28984bac947da14648014e84c2683c0312a
+MISC ChangeLog 7033 SHA256 0d0ae6ddc7292198898a5ee70ad141d61172a40d8bb912823233b76036ff9da9 SHA512 973a803c9477e958619bde4de6049725a590e158225e9c3facc4738f4b66cefa929413b2e5d3b4b73a633b17ad667b8215c9da2e0e6b473e0f3c4aa8351ae0af WHIRLPOOL 069f084f2f9aa7d05a36d57ff9959eda581ac23909969adfab5d83b66d4d3988c6ad09b36572291b36c8121ba01efbf8a2e8e382eba5ec504c56e19523e79070
 MISC metadata.xml 224 SHA256 402a4bdf76ce631373abcd73bef4bcebb243ecd1af6311eedfbaac26d0a166f1 SHA512 76268da5ee53c624381e9d6a7288ad0aa4b885db9db0577bc248f207082938a704b01b68907072defc04ab0d4bc368da3019e2b3bf919999b538e8454d0bdd30 WHIRLPOOL 4298da7ccb284855eaf7697dbeed88910bbea313f82cb2b37ad9db725c0b979305cdcd28ed511e36bbfbc74f400dd00cb0b6fb10a135049b800d74997baa126c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEOTNkACgkQCaWpQKGI+9ScjwCeMGGk4VzK1wa3AIszqpIVNQdZ
-lfkAn3oGpdUBGZC5cOEItH1ShCtph4qO
-=5csy
+iQIcBAEBCAAGBQJRD2BVAAoJEF0huFKJUZL5L2AQAK25B6apd4tnEpCHowrr24mk
+sU/qvEAkPbr5KzIilpXMlfHKvQH5WVXP3sdnfZ9onWm04K2dN3uytv0QLJ5fzlpF
+XaLLiXIUHQUwlJmnpidAbkVBdzMh3xhmDhdJhObW2FOeIpXic0O5zB13085kJMep
+oV8ByccB0U6cGrsHjGevNAtXXgn71JI4Af+o0BwQikHbWV7yVku6jLMZRJUmAliD
+6RC39OKcIQz/pze5iyqPjRt2m0QM63KFYayDpVul4y6pht/yA8cmac6eaLNE5ilu
+xQEas07TiY5zMyYhg9zcEb1mJvA9SprY7Osd5MPFsbJ5FucXFwJDYmLMp+wEJIWe
+9fjkd3XM15p/32REjoCXrzbrWOeZ5UURfzKwVvZjcomV295jlNt5MsxdMzDdQ71t
+9rWh3apgOVLEXLofsyIg4j0U1sz1st4/3stJUKo3UwP+aUJRfdaVASbGh/92ratM
+77M8l0sszWIsOGlHrpW5HRN5LsCN8CRkC0NFuTyx2foCdzbzF31buUHr5i1dIXUt
+/fAp/Xi37OoNElEyIyvor6jqH1J+Y/M5iJOqt4tAF2wbQxM/9zlYv/y1aPTLpxD8
+/uNd88jMLE4b+Bjk3yEJHLLpRCPXafMw7yNJgJZxG4Wog3WZosqTVy3i2K1eRNNT
+vbHhC1/Dci5r9ITPAiJd
+=BTMV
 -----END PGP SIGNATURE-----
diff --git a/dev-util/insight/files/insight-6.6-DESTDIR.patch b/dev-util/insight/files/insight-6.6-DESTDIR.patch
deleted file mode 100644
index 50db957f54e6..000000000000
--- a/dev-util/insight/files/insight-6.6-DESTDIR.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-Index: itcl/itcl/Makefile.in
-===================================================================
-RCS file: /cvs/src/src/itcl/itcl/Makefile.in,v
-retrieving revision 1.5
-diff -u -p -r1.5 Makefile.in
---- itcl/itcl/Makefile.in	1 Sep 2005 05:32:08 -0000	1.5
-+++ itcl/itcl/Makefile.in	7 Mar 2007 23:26:29 -0000
-@@ -272,16 +272,16 @@ install-binaries: binaries install-lib-b
- #========================================================================
- 
- install-libraries: libraries
--	$(mkinstalldirs) $(includedir)
--	@echo "Installing header files in $(includedir)"
-+	$(mkinstalldirs) $(DESTDIR)$(includedir)
-+	@echo "Installing header files in $(DESTDIR)$(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)"
-+	@echo "Installing library files in $(DESTDIR)$(ITCL_LIBRARY)"
- 	@for i in $(srcdir)/library/*.tcl ; do \
- 	    echo "Installing $$i" ; \
--	    $(INSTALL_DATA) $$i $(ITCL_LIBRARY) ; \
-+	    $(INSTALL_DATA) $$i $(DESTDIR)$(ITCL_LIBRARY) ; \
- 	done;
- 
- #========================================================================
-@@ -290,14 +290,14 @@ install-libraries: libraries
- #========================================================================
- 
- install-doc: doc
--	$(mkinstalldirs) $(mandir)/mann
--	@echo "Installing man pages in $(mandir)"
-+	$(mkinstalldirs) $(DESTDIR)$(mandir)/mann
-+	@echo "Installing man pages in $(DESTDIR)$(mandir)"
- 	@cd $(srcdir)/doc; for i in *.n; \
- 	    do \
- 	    echo "Installing $$i"; \
- 	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
--		$$i > $(mandir)/mann/$$i; \
--	    chmod 444 $(mandir)/mann/$$i; \
-+		$$i > $(DESTDIR)$(mandir)/mann/$$i; \
-+	    chmod 444 $(DESTDIR)$(mandir)/mann/$$i; \
- 	    done
- 
- test: $(TCLSH_PROG)
-@@ -447,7 +447,7 @@ install-lib-binaries: installdirs
- 	    $(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)
-@@ -485,7 +485,7 @@ installdirs:
- 	$(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
-Index: itcl/itk/Makefile.in
-===================================================================
-RCS file: /cvs/src/src/itcl/itk/Makefile.in,v
-retrieving revision 1.5
-diff -u -p -r1.5 Makefile.in
---- itcl/itk/Makefile.in	1 Sep 2005 05:32:09 -0000	1.5
-+++ itcl/itk/Makefile.in	7 Mar 2007 23:26:29 -0000
-@@ -267,16 +267,16 @@ install-binaries: binaries install-lib-b
- #========================================================================
- 
- install-libraries: libraries
--	$(mkinstalldirs) $(includedir)
--	@echo "Installing header files in $(includedir)"
-+	$(mkinstalldirs) $(DESTDIR)$(includedir)
-+	@echo "Installing header files in $(DESTDIR)$(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)"
-+	@echo "Installing library files in $(DESTDIR)$(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;
- 
- #========================================================================
-@@ -285,14 +285,14 @@ install-libraries: libraries
- #========================================================================
- 
- install-doc: doc
--	$(mkinstalldirs) $(mandir)/mann
--	@echo "Installing man pages in $(mandir)"
-+	$(mkinstalldirs) $(DESTDIR)$(mandir)/mann
-+	@echo "Installing man pages in $(DESTDIR)$(mandir)"
- 	@cd $(srcdir)/doc; for i in *.n; \
- 	    do \
- 	    echo "Installing $$i info $(mandir)/mann"; \
- 	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
--		$$i > $(mandir)/mann/$$i; \
--	    chmod 444 $(mandir)/mann/$$i; \
-+		$$i > $(DESTDIR)$(mandir)/mann/$$i; \
-+	    chmod 444 $(DESTDIR)$(mandir)/mann/$$i; \
- 	    done
- 
- test: $(TCLSH_PROG)
-@@ -421,7 +421,7 @@ install-lib-binaries: installdirs
- 	    $(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)
-@@ -459,7 +459,7 @@ installdirs:
- 	$(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
-Index: itcl/iwidgets/Makefile.in
-===================================================================
-RCS file: /cvs/src/src/itcl/iwidgets/Makefile.in,v
-retrieving revision 1.2
-diff -u -p -r1.2 Makefile.in
---- itcl/iwidgets/Makefile.in	25 Feb 2003 00:42:12 -0000	1.2
-+++ itcl/iwidgets/Makefile.in	7 Mar 2007 23:26:29 -0000
-@@ -36,13 +36,13 @@ bindir = @bindir@
- # to be different than those used for actually reference files at
- # run-time.  INSTALL_ROOT is prepended to $prefix and $exec_prefix
- # when installing files.
--INSTALL_ROOT =
-+INSTALL_ROOT = $(DESTDIR)
- 
- # Path name to use when installing library scripts:
- 
- # REDHAT LOCAL
- #SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/lib/iwidgets$(IWIDGETS_VERSION)
--SCRIPT_INSTALL_DIR = @datadir@/iwidgets$(IWIDGETS_VERSION)
-+SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)@datadir@/iwidgets$(IWIDGETS_VERSION)
- # END REDHAT LOCAL
- 
- # Directory in which to install the archive libtcl.a:
-Index: tcl/unix/Makefile.in
-===================================================================
-RCS file: /cvs/src/src/tcl/unix/Makefile.in,v
-retrieving revision 1.7
-diff -u -p -r1.7 Makefile.in
---- tcl/unix/Makefile.in	21 Jan 2003 19:40:18 -0000	1.7
-+++ tcl/unix/Makefile.in	7 Mar 2007 23:26:29 -0000
-@@ -38,7 +38,7 @@ mandir			= @mandir@
- # to be different than those used for actually reference files at
- # run-time.  INSTALL_ROOT is prepended to $prefix and $exec_prefix
- # when installing files.
--INSTALL_ROOT		=
-+INSTALL_ROOT		= $(DESTDIR)
- 
- # Path for the platform independent Tcl scripting libraries:
- # REDHAT LOCAL
-Index: tk/unix/Makefile.in
-===================================================================
-RCS file: /cvs/src/src/tk/unix/Makefile.in,v
-retrieving revision 1.8
-diff -u -p -r1.8 Makefile.in
---- tk/unix/Makefile.in	21 Jan 2003 20:24:51 -0000	1.8
-+++ tk/unix/Makefile.in	7 Mar 2007 23:26:30 -0000
-@@ -41,7 +41,7 @@ mandir			= @mandir@
- # to be different than those used for actually reference files at
- # run-time.  INSTALL_ROOT is prepended to $prefix and $exec_prefix
- # when installing files.
--INSTALL_ROOT		=
-+INSTALL_ROOT		= $(DESTDIR)
- 
- # Directory from which applications will reference the library of Tcl
- # scripts (note: you can set the TK_LIBRARY environment variable at
diff --git a/dev-util/insight/files/insight-6.6-burn-paths.patch b/dev-util/insight/files/insight-6.6-burn-paths.patch
deleted file mode 100644
index 261370640b16..000000000000
--- a/dev-util/insight/files/insight-6.6-burn-paths.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tcl/unix/Makefile.in.orig	2007-03-07 19:36:22.000000000 -0500
-+++ tcl/unix/Makefile.in	2007-03-07 19:36:36.000000000 -0500
-@@ -1051,7 +1051,7 @@
- # END REDHAT LOCAL
- 
- tclUnixInit.o: $(UNIX_DIR)/tclUnixInit.c $(GENERIC_DIR)/tclInitScript.h tclConfig.sh
--	$(CC) -c $(CC_SWITCHES) -DTCL_LIBRARY=\"\" \
-+	$(CC) -c $(CC_SWITCHES) -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
- 		-DTCL_PACKAGE_PATH="\"${TCL_PACKAGE_PATH}\"" \
- 		$(UNIX_DIR)/tclUnixInit.c
- 
diff --git a/dev-util/insight/files/tkImgGIF.patch b/dev-util/insight/files/tkImgGIF.patch
deleted file mode 100644
index e8a81f384f28..000000000000
--- a/dev-util/insight/files/tkImgGIF.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: generic/tkImgGIF.c
-===================================================================
-RCS file: /cvsroot/tktoolkit/tk/generic/tkImgGIF.c,v
-retrieving revision 1.24.2.5
-diff -u -r1.24.2.5 tkImgGIF.c
---- generic/tkImgGIF.c	11 Sep 2007 18:01:45 -0000	1.24.2.5
-+++ generic/tkImgGIF.c	25 Jan 2008 19:23:01 -0000
-@@ -826,6 +826,12 @@
- 		Tcl_PosixError(interp), (char *) NULL);
- 	return TCL_ERROR;
-     }
-+
-+    if (initialCodeSize > MAX_LWZ_BITS) {
-+	Tcl_SetResult(interp, "malformed image", TCL_STATIC);
-+	return TCL_ERROR;
-+    }
-+
-     if (transparent != -1) {
- 	cmap[transparent][CM_RED] = 0;
- 	cmap[transparent][CM_GREEN] = 0;
-Index: tests/imgPhoto.test
-===================================================================
-RCS file: /cvsroot/tktoolkit/tk/tests/imgPhoto.test,v
-retrieving revision 1.15.2.5
-diff -u -r1.15.2.5 imgPhoto.test
---- tests/imgPhoto.test	11 Sep 2007 18:01:46 -0000	1.15.2.5
-+++ tests/imgPhoto.test	25 Jan 2008 19:23:01 -0000
-@@ -681,6 +681,35 @@
-     image delete $i
- }
- 
-+test imgPhoto-14.4 {GIF buffer overflow} -setup {
-+    set i [image create photo]
-+} -body {
-+    # This crashes Tk up to 8.4.17 and 8.5.0
-+    $i configure -data {
-+	R0lGODlhCgAKAPcAAAAAAIAAAACAAICAAAAAgIAAgACAgICAgMDAwP8AAAD/
-+	AP//AAAA//8A/wD//////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-+	AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-+	AAAAMwAAZgAAmQAAzAAA/wAzAAAzMwAzZgAzmQAzzAAz/wBmAABmMwBmZgBm
-+	mQBmzABm/wCZAACZMwCZZgCZmQCZzACZ/wDMAADMMwDMZgDMmQDMzADM/wD/
-+	AAD/MwD/ZgD/mQD/zAD//zMAADMAMzMAZjMAmTMAzDMA/zMzADMzMzMzZjMz
-+	mTMzzDMz/zNmADNmMzNmZjNmmTNmzDNm/zOZADOZMzOZZjOZmTOZzDOZ/zPM
-+	ADPMMzPMZjPMmTPMzDPM/zP/ADP/MzP/ZjP/mTP/zDP//2YAAGYAM2YAZmYA
-+	mWYAzGYA/2YzAGYzM2YzZmYzmWYzzGYz/2ZmAGZmM2ZmZmZmmWZmzGZm/2aZ
-+	AGaZM2aZZmaZmWaZzGaZ/2bMAGbMM2bMZmbMmWbMzGbM/2b/AGb/M2b/Zmb/
-+	mWb/zGb//5kAAJkAM5kAZpkAmZkAzJkA/5kzAJkzM5kzZpkzmZkzzJkz/5lm
-+	AJlmM5lmZplmmZlmzJlm/5mZAJmZM5mZZpmZmZmZzJmZ/5nMAJnMM5nMZpnM
-+	mZnMzJnM/5n/AJn/M5n/Zpn/mZn/zJn//8wAAMwAM8wAZswAmcwAzMwA/8wz
-+	AMwzM8wzZswzmcwzzMwz/8xmAMxmM8xmZsxmmcxmzMxm/8yZAMyZM8yZZsyZ
-+	mcyZzMyZ/8zMAMzMM8zMZszMmczMzMzM/8z/AMz/M8z/Zsz/mcz/zMz///8A
-+	AP8AM/8AZv8Amf8AzP8A//8zAP8zM/8zZv8zmf8zzP8z//9mAP9mM/9mZv9m
-+	mf9mzP9m//+ZAP+ZM/+ZZv+Zmf+ZzP+Z///MAP/MM//MZv/Mmf/MzP/M////
-+	AP//M///Zv//mf//zP///yH5BAEAABAALAAAAAAKAAoAABUSAAD/HEiwoMGD
-+	CBMqXMiwYcKAADs=
-+    } 
-+} -cleanup {
-+    image delete $i
-+} -returnCodes error -result {malformed image}
-+
- test imgPhoto-15.1 {photo images can fail to allocate memory gracefully} \
- 	{nonPortable} {
-     # This is not portable to very large machines with more around
diff --git a/dev-util/insight/insight-6.7.1-r1.ebuild b/dev-util/insight/insight-6.7.1-r1.ebuild
deleted file mode 100644
index 10329c1382a8..000000000000
--- a/dev-util/insight/insight-6.7.1-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/insight-6.7.1-r1.ebuild,v 1.6 2012/07/29 16:27:39 armin76 Exp $
-
-inherit eutils flag-o-matic
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-
-DESCRIPTION="A graphical interface to the GNU debugger"
-HOMEPAGE="http://sourceware.org/insight/"
-SRC_URI="ftp://sources.redhat.com/pub/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-[[ ${CTARGET} != ${CHOST} ]] \
-	&& SLOT="${CTARGET}" \
-	|| SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls"
-
-RDEPEND="sys-libs/ncurses
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-6.6-DESTDIR.patch
-	epatch "${FILESDIR}"/${PN}-6.6-burn-paths.patch
-
-	cd "${S}/tk"
-	epatch "${FILESDIR}"/tkImgGIF.patch
-}
-
-src_compile() {
-	append-flags -fno-strict-aliasing # tcl code sucks
-	strip-linguas -u bfd/po opcodes/po
-	econf \
-		--disable-werror \
-		$(use_enable nls) \
-		--enable-gdbtk \
-		--disable-tui \
-		--datadir=/usr/share/${PN} \
-		|| die
-	emake || die
-}
-
-src_install() {
-	# the tcl-related subdirs are not parallel safe
-	emake -j1 DESTDIR="${D}" install || die
-
-	# Don't install docs when building a cross-insight
-	if [[ ${CTARGET} == ${CHOST} ]] ; then
-		dodoc gdb/gdbtk/{README,TODO}
-	fi
-
-	# the gui tcl code does not consider any of the configure
-	# options given it ... instead, it requires the path to
-	# be /usr/share/redhat/...
-	mv "${D}"/usr/share/${PN}/redhat "${D}"/usr/share/ || die
-
-	# scrub all the cruft we dont want
-	local x
-	cd "${D}"/usr/bin
-	for x in * ; do
-		[[ ${x} != *insight ]] && rm -f ${x}
-	done
-	cd "${D}"
-	rm -rf usr/{include,man,share/{info,locale,man}}
-	rm -rf usr/lib*
-}
diff --git a/dev-util/insight/insight-6.8.1-r1.ebuild b/dev-util/insight/insight-6.8.1-r1.ebuild
new file mode 100644
index 000000000000..21f21334c5cf
--- /dev/null
+++ b/dev-util/insight/insight-6.8.1-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/insight-6.8.1-r1.ebuild,v 1.1 2013/02/04 07:16:04 xarthisius Exp $
+
+EAPI=4
+
+inherit eutils autotools versionator
+
+MY_P="${PN}-$(replace_version_separator 2 -)"
+
+DESCRIPTION="A graphical interface to the GNU debugger"
+HOMEPAGE="http://sourceware.org/insight/"
+SRC_URI="ftp://sources.redhat.com/pub/${PN}/releases/${MY_P}a.tar.bz2
+	http://dev.gentoo.org/~xarthisius/distfiles/${P}-patchset-02.tar.xz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+RDEPEND="
+	dev-libs/expat
+	dev-tcltk/iwidgets
+	sys-libs/ncurses
+	sys-libs/readline
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	dev-lang/tcl
+	dev-lang/tk
+	dev-tcltk/itcl
+	dev-tcltk/itk
+	sys-devel/bison
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	local location
+
+	EPATCH_FORCE="yes" \
+	EPATCH_SOURCE="${WORKDIR}/patches" \
+	EPATCH_SUFFIX="patch" \
+	epatch
+
+	# remove bundled stuff
+	rm -rf "${S}"/{itcl,tcl,tk,readline} || die
+
+	for location in gdb/gdbtk/plugins libgui; do
+		pushd ${location} > /dev/null
+		eautoreconf
+		popd > /dev/null
+	done
+
+	cd gdb
+	eautoconf
+
+	sed -i \
+		-e 's:tk.h:tkInt.h:g' \
+		-e 's:ITCL_BUILD_LIB_SPEC:ITCL_LIB_SPEC:g' \
+		-e 's:ITK_BUILD_LIB_SPEC:ITK_LIB_SPEC:g' \
+		"${S}/gdb/configure" || die
+}
+
+src_configure() {
+	export ac_cv_c_itclh="${EPREFIX}/usr/include/"
+	export ac_cv_c_itkh="${EPREFIX}/usr/include/"
+
+	. "${EPREFIX}/usr/$(get_libdir)/tclConfig.sh"
+	. "${EPREFIX}/usr/$(get_libdir)/tkConfig.sh"
+	. "${EPREFIX}/usr/$(get_libdir)/itclConfig.sh"
+
+	# there will be warning about undefined options
+	# because it is passed only to some subdir configures
+	econf \
+		--disable-static \
+		--with-system-readline \
+		--disable-rpath \
+		--disable-werror \
+		$(use_enable nls) \
+		--enable-gdbtk \
+		--enable-sim \
+		--with-expat \
+		--datadir=/usr/share \
+		--with-tclinclude="${TCL_SRC_DIR}" \
+		--with-tkinclude="${TK_SRC_DIR}"
+}
+
+src_install() {
+	# the tcl-related subdirs are not parallel safe
+	emake -j1 DESTDIR="${D}" install
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	dodoc gdb/gdbtk/{README,TODO}
+
+	# scrub all the cruft we dont want
+	rm -f "${ED}"/usr/bin/{gdb,gdbtui,gdbserver} || die
+	rm -f "${ED}"/usr/$(get_libdir)/*.a || die
+	rm -f "${ED}"/usr/$(get_libdir)/*.sh || die
+	rm -rf "${ED}"/usr/include || die
+	rm -rf "${ED}"/usr/man || die
+	rm -rf "${ED}"/usr/share/{man,info,locale} || die
+
+	# regen pkgIndex.tcl
+	echo "pkg_mkIndex \"${ED}/usr/share/${PN}/gui\"" | tclsh
+}