subversion snapshot bump and removed embedded system libs (patch inspired from fedora)

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.25-gentoo-r7 x86_64

4 files changed, 253 insertions, 12 deletions

diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog
index 296c60eb5171..4d780a387cdf 100644
--- a/dev-tcltk/tkimg/ChangeLog
+++ b/dev-tcltk/tkimg/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-tcltk/tkimg
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.4 2008/11/05 19:54:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.5 2008/12/03 11:26:01 bicatali Exp $
+
+*tkimg-1.3.20081202 (03 Dec 2008)
+
+  03 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/tkimg-1.3.20081202-systemlibs.patch, -tkimg-1.3.20081104.ebuild,
+  +tkimg-1.3.20081202.ebuild:
+  subversion snapshot bump and removed embedded system libs (patch inspired
+  from fedora)
 
 *tkimg-1.3.20081104 (05 Nov 2008)
 
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 78a521941bf3..7f141cb9c333 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -5,16 +5,17 @@ AUX tkimg-1.3-m4.patch 9543 RMD160 e3a156f8a87a6f6f7967b81e73a0bb98a78176c3 SHA1
 AUX tkimg-1.3-makedeps.patch 3022 RMD160 f04e0912380e2669f0221e6eae1372b886dd3c9b SHA1 229b69285bb035e4bc0dc8b4d9d059cf139668ff SHA256 5b359d562d793e65791ae6dceb7eeae0d740b471b8362bc02515c9fa0ad19bd6
 AUX tkimg-1.3-syslibs.patch 12672 RMD160 c5f5f9a8275d92afaeb40f1a7584a0102d12ee08 SHA1 fde468d011e576854354a805ff5603df53a4042e SHA256 fcac1bf27bfb7e1adb8bbdb503c7449533c29de91bf5cfe1333dbea7017936a0
 AUX tkimg-1.3-warnings.patch 833 RMD160 80f45f8d830a3b69dfd983a098ec000d48bbedf9 SHA1 fdb6f263416d0cefccbc5c2c5f3067c1753efd52 SHA256 51b907379959ccf6d474300ba801c722b0d316e88bf5b1c033049b554b3700c1
-DIST tkimg-1.3.20081104.tar.bz2 4545902 RMD160 449046f8986272c8922bc83e7f4293306c45c616 SHA1 23fab58287e19d528fa5691aa0cf6187fb0d244e SHA256 727f5720eadbf5bac264134e65f172d7a1f9880eb15f2e3359fa97a4e5201533
+AUX tkimg-1.3.20081202-systemlibs.patch 9637 RMD160 fc6a94501654307bae837731f18e8a827eb21db4 SHA1 87e9d8a3d60da0a42b92d9a1c35ab989452b4645 SHA256 29608daf79cca4a6b1292d1875ebd7d5f07ad60d4e09098ea5b8ece801da1983
+DIST tkimg-1.3.20081202.tar.bz2 4543694 RMD160 00f4dc4d8da53c7acaab68565f58ffc42f8151af SHA1 01acba5ad79f12e7d5ce511d35a9829424afa8ec SHA256 4e94f709fb471ec70398c1d4565fbec5869d0a521c7de5292484deeafc727625
 DIST tkimg1.3.tar.bz2 2924740 RMD160 fb0992c72faeb80fc6aaa2ccb1f632087235ea9d SHA1 b2d97cf80f9cd457a194b0d2c4bd549a66783895 SHA256 3daebe7c4a3d15e175a0203ada94adc2b78403d164d9fe9797e274e6256fcf33
-EBUILD tkimg-1.3.20081104.ebuild 926 RMD160 7b5de862a71c9f4ef2443cf6383c48221ec4f777 SHA1 b30bfb888e5c0c0f9bcfb113b213e4791dd77d23 SHA256 7ffa02e01a01c3d50b546e8c6aae2158eee1df2f60659605eed2af7611adf6e1
+EBUILD tkimg-1.3.20081202.ebuild 1227 RMD160 b693fa317ba1452173636a4d834f35557fc8e80b SHA1 812b8814ece22ddb15392f821d392fe6d3f40213 SHA256 5d9f74515a24df3d816c03bc5fef0b4ad8adcb507ce304f2ccf84e5a7e76215b
 EBUILD tkimg-1.3.ebuild 1167 RMD160 2f423aaabfbdd03e60daf6f663d6aeb781847f7e SHA1 c5a23b6d7048e36597481fdd5efacb0980b1c638 SHA256 a08db713dad830f42c5c43559c1b69a7923fb6d4eab3a17be7e4c8ca1f182c1d
-MISC ChangeLog 909 RMD160 dca9c682472e47f5e43c940b3f04e24d2872a2f4 SHA1 92569e5fd8a930ee39c6f6ecc29c9c954737b09c SHA256 d8d6081c3f4b00c122323ab9d9476b56af4382f5387bec104345005ee2e6ea63
+MISC ChangeLog 1195 RMD160 c8fd99c2ab463e89d7f2a19565aa075fee5ca8ea SHA1 c105709949650c2259cae89ac6fe7466e45b946c SHA256 21349017f5650247bbd49398fe04e0bace7eb450bd095b772b095fe0826d7a83
 MISC metadata.xml 413 RMD160 1ac848d3c3c9bdc181eb74296bed320a04939230 SHA1 b87cf6e1539c38b9d47206b3de300d4d1b015e19 SHA256 e4be7858b69d8be49bd900961e05825edcacfb4c81b6f20ebc6afd65fb3b2fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkR+foACgkQ1ycZbhPLE2ATigCfWXS99adM6qfoAGPo486VcG/D
-AeIAoIreQOA7+bmZSjmgeAd9jLAZ/pB4
-=tFZd
+iEYEARECAAYFAkk2bNUACgkQ1ycZbhPLE2Ak5ACfUujqNe6v70FGL0OUGpfQ4Rtu
+b88AnjWPzLNL822D6ww/sf0OovomFz2h
+=XRCz
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tkimg/files/tkimg-1.3.20081202-systemlibs.patch b/dev-tcltk/tkimg/files/tkimg-1.3.20081202-systemlibs.patch
new file mode 100644
index 000000000000..183ce94fb442
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.3.20081202-systemlibs.patch
@@ -0,0 +1,221 @@
+diff -Nur tkimg-1.3.20081202.orig/libjpeg/tcl/jpegtclDecls.h tkimg-1.3.20081202/libjpeg/tcl/jpegtclDecls.h
+--- tkimg-1.3.20081202.orig/libjpeg/tcl/jpegtclDecls.h	2008-10-22 11:55:37.933226000 +0100
++++ tkimg-1.3.20081202/libjpeg/tcl/jpegtclDecls.h	2008-12-02 19:54:15.180187733 +0000
+@@ -19,10 +19,10 @@
+ /* undef Tcl macros that conflict with libjpeg stuff (sigh) */
+ #undef EXTERN
+ 
+-#include <jpegtclDeclsMask.h>
+-#include <../jpeglib.h>
+-#include <../jerror.h>
+-#include <jpegtclDeclsUnmask.h>
++#include "jpegtclDeclsMask.h"
++#include </usr/include/jpeglib.h>
++#include </usr/include/jerror.h>
++#include "jpegtclDeclsUnmask.h"
+ 
+ /*
+  * And recreate the definition of "tcl.h", we need it below.
+diff -Nur tkimg-1.3.20081202.orig/libjpeg/tcl/Makefile.in tkimg-1.3.20081202/libjpeg/tcl/Makefile.in
+--- tkimg-1.3.20081202.orig/libjpeg/tcl/Makefile.in	2008-10-23 17:09:37.830043000 +0100
++++ tkimg-1.3.20081202/libjpeg/tcl/Makefile.in	2008-12-02 19:54:15.180187733 +0000
+@@ -33,8 +33,8 @@
+ # $(srcdir) or in the generic, win or unix subdirectory.
+ #========================================================================
+ 
+-PKG_SOURCES	= @PKG_SOURCES@
+-PKG_OBJECTS	= @PKG_OBJECTS@
++PKG_SOURCES	= jpegtcl.c jpegtclStubInit.c
++PKG_OBJECTS	= jpegtcl.o jpegtclStubInit.o
+ 
+ PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
+ PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
+@@ -106,7 +106,7 @@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+ SHLIB_LD	= @SHLIB_LD@
+-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
++SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -ljpeg
+ STLIB_LD	= @STLIB_LD@
+ TCL_DEFS	= @TCL_DEFS@
+ TCL_BIN_DIR	= @TCL_BIN_DIR@
+diff -Nur tkimg-1.3.20081202.orig/libpng/tcl/Makefile.in tkimg-1.3.20081202/libpng/tcl/Makefile.in
+--- tkimg-1.3.20081202.orig/libpng/tcl/Makefile.in	2008-10-23 17:09:37.830043000 +0100
++++ tkimg-1.3.20081202/libpng/tcl/Makefile.in	2008-12-02 19:54:19.759763931 +0000
+@@ -37,8 +37,8 @@
+ # $(srcdir) or in the generic, win or unix subdirectory.
+ #========================================================================
+ 
+-PKG_SOURCES	= @PKG_SOURCES@
+-PKG_OBJECTS	= @PKG_OBJECTS@
++PKG_SOURCES	= pngtcl.c pngtclStubInit.c
++PKG_OBJECTS	= pngtcl.o pngtclStubInit.o
+ 
+ PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
+ PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
+@@ -110,7 +110,7 @@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+ SHLIB_LD	= @SHLIB_LD@
+-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
++SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -lpng12
+ STLIB_LD	= @STLIB_LD@
+ TCL_DEFS	= @TCL_DEFS@
+ TCL_BIN_DIR	= @TCL_BIN_DIR@
+diff -Nur tkimg-1.3.20081202.orig/libpng/tcl/pngtclDecls.h tkimg-1.3.20081202/libpng/tcl/pngtclDecls.h
+--- tkimg-1.3.20081202.orig/libpng/tcl/pngtclDecls.h	2008-10-22 11:55:37.933226000 +0100
++++ tkimg-1.3.20081202/libpng/tcl/pngtclDecls.h	2008-12-02 19:54:19.763764769 +0000
+@@ -16,7 +16,7 @@
+ 
+ #include <tcl.h>
+ #include <pngtclDeclsMask.h>
+-#include <../png.h>
++#include </usr/include/libpng12/png.h>
+ #include <pngtclDeclsUnmask.h>
+ 
+ /* !BEGIN!: Do not edit below this line. */
+@@ -221,15 +221,15 @@
+ 				png_infopp info_ptr_ptr,
+ 				png_infopp end_info_ptr_ptr));
+ /* 62 */
+-EXTERN void		png_read_destroy _ANSI_ARGS_((png_structp png_ptr,
+-				png_infop info_ptr, png_infop end_info_ptr));
++/*EXTERN void		png_read_destroy _ANSI_ARGS_((png_structp png_ptr,
++				png_infop info_ptr, png_infop end_info_ptr));*/
+ /* 63 */
+ EXTERN void		png_destroy_write_struct _ANSI_ARGS_((
+ 				png_structpp png_ptr_ptr,
+ 				png_infopp info_ptr_ptr));
+ /* Slot 64 is reserved */
+ /* 65 */
+-EXTERN void		png_write_destroy _ANSI_ARGS_((png_structp png_ptr));
++/*EXTERN void		png_write_destroy _ANSI_ARGS_((png_structp png_ptr));*/
+ /* 66 */
+ EXTERN void		png_set_crc_action _ANSI_ARGS_((png_structp png_ptr,
+ 				int crit_action, int ancil_action));
+@@ -1171,10 +1171,10 @@
+     void (*png_read_end) _ANSI_ARGS_((png_structp png_ptr, png_infop info_ptr)); /* 59 */
+     void (*png_destroy_info_struct) _ANSI_ARGS_((png_structp png_ptr, png_infopp info_ptr_ptr)); /* 60 */
+     void (*png_destroy_read_struct) _ANSI_ARGS_((png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr)); /* 61 */
+-    void (*png_read_destroy) _ANSI_ARGS_((png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr)); /* 62 */
++/*    void (*png_read_destroy) _ANSI_ARGS_((png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr)); */ /* 62 */
+     void (*png_destroy_write_struct) _ANSI_ARGS_((png_structpp png_ptr_ptr, png_infopp info_ptr_ptr)); /* 63 */
+     void *reserved64;
+-    void (*png_write_destroy) _ANSI_ARGS_((png_structp png_ptr)); /* 65 */
++/*    void (*png_write_destroy) _ANSI_ARGS_((png_structp png_ptr)); */ /* 65 */
+     void (*png_set_crc_action) _ANSI_ARGS_((png_structp png_ptr, int crit_action, int ancil_action)); /* 66 */
+     void (*png_set_filter) _ANSI_ARGS_((png_structp png_ptr, int method, int filters)); /* 67 */
+     void (*png_set_filter_heuristics) _ANSI_ARGS_((png_structp png_ptr, int heuristic_method, int num_weights, png_doublep filter_weights, png_doublep filter_costs)); /* 68 */
+diff -Nur tkimg-1.3.20081202.orig/libpng/tcl/pngtclStubInit.c tkimg-1.3.20081202/libpng/tcl/pngtclStubInit.c
+--- tkimg-1.3.20081202.orig/libpng/tcl/pngtclStubInit.c	2008-10-22 13:06:38.458408000 +0100
++++ tkimg-1.3.20081202/libpng/tcl/pngtclStubInit.c	2008-12-02 19:54:19.763764769 +0000
+@@ -205,10 +205,10 @@
+     png_read_end, /* 59 */
+     png_destroy_info_struct, /* 60 */
+     png_destroy_read_struct, /* 61 */
+-    png_read_destroy, /* 62 */
++/*    png_read_destroy, */ /* 62 */
+     png_destroy_write_struct, /* 63 */
+     NULL, /* 64 */
+-    png_write_destroy, /* 65 */
++/*    png_write_destroy, */ /* 65 */
+     png_set_crc_action, /* 66 */
+     png_set_filter, /* 67 */
+ #if !defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED) || !defined(PNG_FLOATING_POINT_SUPPORTED)
+diff -Nur tkimg-1.3.20081202.orig/libtiff/tcl/Makefile.in tkimg-1.3.20081202/libtiff/tcl/Makefile.in
+--- tkimg-1.3.20081202.orig/libtiff/tcl/Makefile.in	2008-10-23 17:09:37.830043000 +0100
++++ tkimg-1.3.20081202/libtiff/tcl/Makefile.in	2008-12-02 19:54:28.771023604 +0000
+@@ -35,8 +35,8 @@
+ 
+ # tif_fax3sm is special. It is generated.
+ 
+-PKG_SOURCES	= @PKG_SOURCES@ tif_fax3sm.c
+-PKG_OBJECTS	= @PKG_OBJECTS@ tif_fax3sm.$(OBJEXT)
++PKG_SOURCES	= tifftcl.c tifftclStubInit.c 
++PKG_OBJECTS	= tifftcl.o tifftclStubInit.o 
+ 
+ PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
+ PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
+@@ -108,7 +108,7 @@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+ SHLIB_LD	= @SHLIB_LD@
+-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
++SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -ltiff
+ STLIB_LD	= @STLIB_LD@
+ TCL_DEFS	= @TCL_DEFS@
+ TCL_BIN_DIR	= @TCL_BIN_DIR@
+diff -Nur tkimg-1.3.20081202.orig/libtiff/tcl/tifftclDecls.h tkimg-1.3.20081202/libtiff/tcl/tifftclDecls.h
+--- tkimg-1.3.20081202.orig/libtiff/tcl/tifftclDecls.h	2008-10-22 11:55:37.933226000 +0100
++++ tkimg-1.3.20081202/libtiff/tcl/tifftclDecls.h	2008-12-02 19:54:28.775023325 +0000
+@@ -24,9 +24,11 @@
+ #undef INLINE
+ 
+ #include <tifftclDeclsMask.h>
+-#include <../libtiff/tiffio.h>
+-#include <../libtiff/tiffiop.h>
+-#include <../libtiff/tif_predict.h>
++#include "../libtiff/tiffiop.h"
++#include </usr/include/tiff.h>
++#include </usr/include/tiffio.h>
++#include "../libtiff/tiffiop.h"
++#include "../libtiff/tif_predict.h"
+ #include <tifftclDeclsUnmask.h>
+ 
+ /* !BEGIN!: Do not edit below this line. */
+diff -Nur tkimg-1.3.20081202.orig/libz/tcl/configure.in tkimg-1.3.20081202/libz/tcl/configure.in
+--- tkimg-1.3.20081202.orig/libz/tcl/configure.in	2007-10-13 00:39:51.771426000 +0100
++++ tkimg-1.3.20081202/libz/tcl/configure.in	2008-12-02 19:54:25.307377006 +0000
+@@ -47,16 +47,12 @@
+ #-----------------------------------------------------------------------
+ 
+ TEA_ADD_SOURCES([zlibtcl.c zlibtclStubInit.c])
+-TEA_ADD_SOURCES([../adler32.c	../compress.c	../crc32.c])
+-TEA_ADD_SOURCES([../deflate.c	../gzio.c	../infback.c])
+-TEA_ADD_SOURCES([../inffast.c	../inflate.c	../inftrees.c])
+-TEA_ADD_SOURCES([../trees.c	../uncompr.c	../zutil.c])
+ 
+ TEA_ADD_HEADERS([zlibtcl.h zlibtclDecls.h])
+ TEA_ADD_HEADERS([zlibtclDeclsMask.h zlibtclDeclsUnmask.h])
+ 
+ TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${srcdir}`\"])
+-TEA_ADD_LIBS([])
++TEA_ADD_LIBS([-lz])
+ TEA_ADD_CFLAGS([])
+ TEA_ADD_STUB_SOURCES([zlibtclStubLib.c])
+ TEA_ADD_SOURCES([zlibtclStubLib.c])
+diff -Nur tkimg-1.3.20081202.orig/libz/tcl/Makefile.in tkimg-1.3.20081202/libz/tcl/Makefile.in
+--- tkimg-1.3.20081202.orig/libz/tcl/Makefile.in	2008-10-23 17:09:37.830043000 +0100
++++ tkimg-1.3.20081202/libz/tcl/Makefile.in	2008-12-02 19:54:25.307377006 +0000
+@@ -33,8 +33,8 @@
+ # $(srcdir) or in the generic, win or unix subdirectory.
+ #========================================================================
+ 
+-PKG_SOURCES	= @PKG_SOURCES@
+-PKG_OBJECTS	= @PKG_OBJECTS@
++PKG_SOURCES	= zlibtcl.c zlibtclStubInit.c
++PKG_OBJECTS	= zlibtcl.o zlibtclStubInit.o
+ 
+ PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
+ PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
+@@ -106,7 +106,7 @@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+ SHLIB_LD	= @SHLIB_LD@
+-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
++SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -lz
+ STLIB_LD	= @STLIB_LD@
+ TCL_DEFS	= @TCL_DEFS@
+ TCL_BIN_DIR	= @TCL_BIN_DIR@
+diff -Nur tkimg-1.3.20081202.orig/libz/tcl/zlibtclDecls.h tkimg-1.3.20081202/libz/tcl/zlibtclDecls.h
+--- tkimg-1.3.20081202.orig/libz/tcl/zlibtclDecls.h	2008-10-22 11:55:37.933226000 +0100
++++ tkimg-1.3.20081202/libz/tcl/zlibtclDecls.h	2008-12-02 19:54:25.307377006 +0000
+@@ -17,7 +17,7 @@
+ 
+ #include <tcl.h>
+ #include <zlibtclDeclsMask.h>
+-#include <../zlib.h>
++#include </usr/include/zlib.h>
+ #include <zlibtclDeclsUnmask.h>
+ 
+ /* !BEGIN!: Do not edit below this line. */
diff --git a/dev-tcltk/tkimg/tkimg-1.3.20081104.ebuild b/dev-tcltk/tkimg/tkimg-1.3.20081202.ebuild
index 12cd194adff8..fef339efcdfd 100644
--- a/dev-tcltk/tkimg/tkimg-1.3.20081104.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.3.20081202.ebuild
@@ -1,11 +1,14 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.3.20081104.ebuild,v 1.1 2008/11/05 19:54:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.3.20081202.ebuild,v 1.1 2008/12/03 11:26:01 bicatali Exp $
 
 inherit eutils
 
 DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
 HOMEPAGE="http://sourceforge.net/projects/tkimg/"
+# src built with:
+# svn export https://tkimg.svn.sourceforge.net/svnroot/tkimg/trunk tkimg-1.3.YYYYMMDD
+# tar cvfj tkimg-1.3.YYYYMMDD.tar.bz2  tkimg-1.3.YYYYMMDD
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 IUSE="doc"
@@ -15,8 +18,14 @@ KEYWORDS="~alpha ~amd64 ~sparc ~x86"
 
 DEPEND="dev-lang/tk
 	media-libs/libpng
+	media-libs/jpeg
 	media-libs/tiff"
 
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-systemlibs.patch
+}
+
 src_install() {
 	emake \
 		DESTDIR="${D}" \
@@ -28,9 +37,11 @@ src_install() {
 		dosym Img1.3/${bl} /usr/$(get_libdir)/${bl}
 	done
 
-	doman doc/man/*
 	dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE || die
-	insinto /usr/share/doc/${PF}
-	doins -r demo
-	use doc && dohtml doc/html
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins demo.tcl || die
+		insinto /usr/share/doc/${PF}/html
+		doins -r doc/* || die
+	fi
 }