Version Bump #312695

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 322 insertions, 5 deletions

diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog
index 98a7549d1fd4..dde924bbcf3e 100644
--- a/dev-tcltk/tkimg/ChangeLog
+++ b/dev-tcltk/tkimg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tkimg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.12 2010/04/01 19:58:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.13 2010/05/11 16:42:46 jlec Exp $
+
+*tkimg-1.3.20100510 (11 May 2010)
+
+  11 May 2010; Justin Lecher <jlec@gentoo.org> +tkimg-1.3.20100510.ebuild,
+  +files/tkimg-1.3.20100510-gentoo.patch:
+  Version Bump #312695
 
 *tkimg-1.3.20081202-r1 (01 Apr 2010)
 
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 00ca0d94622f..0b92b2f9b033 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -4,15 +4,18 @@ Hash: SHA1
 AUX tkimg-1.3.20081202-prefix.patch 1786 RMD160 ad867dde7d6e431caaee180093eac6bc0e5bb1f6 SHA1 c6eb5eadf43c455ae28335215393f9fdc3c23def SHA256 6f66f0d0b95e282a6ed082dac34db387aa4bbe13c2ab56f1baef6f66682574a5
 AUX tkimg-1.3.20081202-systemlibs.patch 9637 RMD160 fc6a94501654307bae837731f18e8a827eb21db4 SHA1 87e9d8a3d60da0a42b92d9a1c35ab989452b4645 SHA256 29608daf79cca4a6b1292d1875ebd7d5f07ad60d4e09098ea5b8ece801da1983
 AUX tkimg-1.3.20081202-tests.patch 982 RMD160 ae52f7b9eb1504c1c116fe384abe3db806523239 SHA1 decd791a9ac761bfee56a0114a407960976a2a52 SHA256 28bc15f436d73cbd7ae91dc480aacc51dbcf5f3fa7125640742cfea9aed964b6
+AUX tkimg-1.3.20100510-gentoo.patch 9029 RMD160 5f5a8b699959cffe480df693aded7a41417d2fc6 SHA1 43a5fa102e6d6b9c2813d75a7149bfc434fa4bd2 SHA256 61a2354408092d2e86e549e3e2f93d73d2b3ee2b18d4950a7a1f430b9121e17e
 DIST tkimg-1.3.20081202.tar.bz2 4543694 RMD160 00f4dc4d8da53c7acaab68565f58ffc42f8151af SHA1 01acba5ad79f12e7d5ce511d35a9829424afa8ec SHA256 4e94f709fb471ec70398c1d4565fbec5869d0a521c7de5292484deeafc727625
+DIST tkimg-1.3.20100510.tar.bz2 12449234 RMD160 d590495c26125baace8dbfecef49b286e38ca45d SHA1 4da4933ce3924a3513dd662d7b0240eb04617810 SHA256 cf3282bc8bc4250fada03bdd159ef20bd8c81a38b178937d8f4e844cb6089c8e
 EBUILD tkimg-1.3.20081202-r1.ebuild 1570 RMD160 87c956d43a5267d668465a4a1328188c5b2574d9 SHA1 b881032964098289e2ea4f4ca82b0c8c02ce0bfc SHA256 9398a9839f78c969f4eaffff947e87ae6f07e5157159b4a4a0059c2a8391c09c
 EBUILD tkimg-1.3.20081202.ebuild 1386 RMD160 bac7f154f05d43cde3144a67c3ac13412c454e60 SHA1 222e398598524eb2a42d864670a104021c32c1c1 SHA256 a5a07240aeb6d0aee29e8512f7be8a5e9f1b17fe0c650e4892b77f56325f3b66
-MISC ChangeLog 2227 RMD160 75b4c66c3618e5a1d35d2173b6d7da8e9233c226 SHA1 1209b497e661182b44476ba474848157319ce9ce SHA256 132f0102d8efa1edf7c8a5fb186d8795ee5dba20ec6e059bb2c43d558d0ea7fd
+EBUILD tkimg-1.3.20100510.ebuild 1389 RMD160 39c9724a83cfdbbfba58b78d651060e2045cfebd SHA1 09a4cf48b6175d27ce1c4266cab80f70347b0bb5 SHA256 7e71b29abf81e200196d7eeaaf29d1c7c58e5d45a057f600678ab67bac918344
+MISC ChangeLog 2403 RMD160 46a81a5fcbdf24d01539e344f2a38c72c83c5571 SHA1 1fedb521567047f90f44ac93022bdb9cbccf996d SHA256 124ac8a536265ef26772e5f13731f549f8daa9993a5eff93a0eb17c58f46a520
 MISC metadata.xml 413 RMD160 1ac848d3c3c9bdc181eb74296bed320a04939230 SHA1 b87cf6e1539c38b9d47206b3de300d4d1b015e19 SHA256 e4be7858b69d8be49bd900961e05825edcacfb4c81b6f20ebc6afd65fb3b2fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAku0+wMACgkQgAnW8HDreRbjJgCdF8hWtFU/ULv4WkZH2Tce2L6x
-+A0AoMDCIEgsGWPNqYNBU8EdEjEnR9ez
-=/RNP
+iEYEARECAAYFAkvpiQwACgkQgAnW8HDreRYN1QCffL3izCblD7L9dIZAniuNcli3
+FSYAoK85o1GdA75dGpEe3s8bta2xa5jX
+=mh/a
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tkimg/files/tkimg-1.3.20100510-gentoo.patch b/dev-tcltk/tkimg/files/tkimg-1.3.20100510-gentoo.patch
new file mode 100644
index 000000000000..7788e3f70e85
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.3.20100510-gentoo.patch
@@ -0,0 +1,254 @@
+diff --git a/jpeg/jpeg.c b/jpeg/jpeg.c
+index d687325..d6b876b 100644
+--- a/jpeg/jpeg.c
++++ b/jpeg/jpeg.c
+@@ -55,6 +55,7 @@
+ #include <stdio.h>
+ 
+ #include "tcl.h"
++#include "init.c"
+ #include "jpegtcl.h"
+ 
+ static int SetupJPegLibrary(Tcl_Interp *interp);
+@@ -62,7 +63,6 @@ static int SetupJPegLibrary(Tcl_Interp *interp);
+ #define MORE_INITIALIZATION \
+     if (SetupJPegLibrary (interp) != TCL_OK) { return TCL_ERROR; }
+ 
+-#include "init.c"
+ 
+ /* system includes */
+ #include <stdlib.h>
+diff --git a/libjpeg/Makefile.in b/libjpeg/Makefile.in
+index 411b309..a575177 100644
+--- a/libjpeg/Makefile.in
++++ b/libjpeg/Makefile.in
+@@ -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@
+@@ -107,7 +107,7 @@ RANLIB		= @RANLIB@
+ 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 --git a/libjpeg/jpegtclDecls.h b/libjpeg/jpegtclDecls.h
+index 9d2ae2e..0afc148 100644
+--- a/libjpeg/jpegtclDecls.h
++++ b/libjpeg/jpegtclDecls.h
+@@ -20,8 +20,8 @@
+ #undef EXTERN
+ 
+ #include "jpegtclDeclsMask.h"
+-#include "../compat/libjpeg/jpeglib.h"
+-#include "../compat/libjpeg/jerror.h"
++#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/jpeglib.h>
++#include <@GENTOO_PORTAGE_EPREFIX@/usr/include/jerror.h>
+ #include "jpegtclDeclsUnmask.h"
+ 
+ /*
+diff --git a/libpng/Makefile.in b/libpng/Makefile.in
+index b84c3c5..9078062 100644
+--- a/libpng/Makefile.in
++++ b/libpng/Makefile.in
+@@ -37,8 +37,8 @@ zlibtcl_VERSION		= @zlibtcl_VERSION@
+ # $(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@
+@@ -111,7 +111,7 @@ RANLIB		= @RANLIB@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+ SHLIB_LD	= @SHLIB_LD@
+-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
++SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -lpng
+ STLIB_LD	= @STLIB_LD@
+ TCL_DEFS	= @TCL_DEFS@
+ TCL_BIN_DIR	= @TCL_BIN_DIR@
+diff --git a/libpng/pngtclDecls.h b/libpng/pngtclDecls.h
+index 834bd23..259e069 100644
+--- a/libpng/pngtclDecls.h
++++ b/libpng/pngtclDecls.h
+@@ -16,7 +16,7 @@
+ 
+ #include "tcl.h"
+ #include "pngtclDeclsMask.h"
+-#include "../compat/libpng/png.h"
++#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/png.h"
+ #include "pngtclDeclsUnmask.h"
+ 
+ /* !BEGIN!: Do not edit below this line. */
+@@ -309,7 +309,7 @@ PNGTCLAPI void		png_data_freer(png_structp png_ptr,
+ 				png_uint_32 mask);
+ /* 98 */
+ PNGTCLAPI png_voidp	png_malloc_default(png_structp png_ptr,
+-				png_uint_32 size);
++				png_alloc_size_t size);
+ /* 99 */
+ PNGTCLAPI void		png_free_default(png_structp png_ptr, png_voidp ptr);
+ /* Slot 100 is reserved */
+@@ -1067,10 +1067,10 @@ typedef struct PngtclStubs {
+     void (*png_read_endPtr) (png_structp png_ptr, png_infop info_ptr); /* 59 */
+     void (*png_destroy_info_structPtr) (png_structp png_ptr, png_infopp info_ptr_ptr); /* 60 */
+     void (*png_destroy_read_structPtr) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr); /* 61 */
+-    void (*png_read_destroyPtr) (png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr); /* 62 */
++/*    void (*png_read_destroyPtr) (png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr); */ /* 62 */
+     void (*png_destroy_write_structPtr) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr); /* 63 */
+     void *reserved64;
+-    void (*png_write_destroyPtr) (png_structp png_ptr); /* 65 */
++/*    void (*png_write_destroyPtr) (png_structp png_ptr); */ /* 65 */
+     void (*png_set_crc_actionPtr) (png_structp png_ptr, int crit_action, int ancil_action); /* 66 */
+     void (*png_set_filterPtr) (png_structp png_ptr, int method, int filters); /* 67 */
+     void (*png_set_filter_heuristicsPtr) (png_structp png_ptr, int heuristic_method, int num_weights, png_doublep filter_weights, png_doublep filter_costs); /* 68 */
+diff --git a/libpng/pngtclStubInit.c b/libpng/pngtclStubInit.c
+index f8d2d9b..3309ee9 100644
+--- a/libpng/pngtclStubInit.c
++++ b/libpng/pngtclStubInit.c
+@@ -197,10 +197,10 @@ const PngtclStubs pngtclStubs = {
+     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 --git a/libtiff/Makefile.in b/libtiff/Makefile.in
+index 4592093..e32f5d2 100644
+--- a/libtiff/Makefile.in
++++ b/libtiff/Makefile.in
+@@ -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@
+@@ -109,7 +109,7 @@ RANLIB		= @RANLIB@
+ 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 --git a/libtiff/tifftclDecls.h b/libtiff/tifftclDecls.h
+index b30485d..7dd700b 100644
+--- a/libtiff/tifftclDecls.h
++++ b/libtiff/tifftclDecls.h
+@@ -24,8 +24,9 @@
+ #undef INLINE
+ 
+ #include "tifftclDeclsMask.h"
+-#include "../compat/libtiff/libtiff/tiffio.h"
+ #include "../compat/libtiff/libtiff/tiffiop.h"
++#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/tiff.h"
++#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/tiffio.h"
+ #include "../compat/libtiff/libtiff/tif_predict.h"
+ #include "tifftclDeclsUnmask.h"
+ 
+diff --git a/tiff/tiff.c b/tiff/tiff.c
+index a5d5949..826da9a 100644
+--- a/tiff/tiff.c
++++ b/tiff/tiff.c
+@@ -17,6 +17,7 @@
+ #include "tcl.h"
+ #include "tifftcl.h"
+ #include "zlibtcl.h"
++#include "init.c"
+ 
+ #ifdef HAVE_STDLIB_H
+ #undef HAVE_STDLIB_H
+@@ -29,7 +30,6 @@ static int SetupTiffLibrary(Tcl_Interp *interp);
+ #define MORE_INITIALIZATION \
+     if (SetupTiffLibrary (interp) != TCL_OK) { return TCL_ERROR; }
+ 
+-#include "init.c"
+ 
+ #include "tiffInt.h"
+ 
+diff --git a/zlib/Makefile.in b/zlib/Makefile.in
+index cb71481..eb51145 100644
+--- a/zlib/Makefile.in
++++ b/zlib/Makefile.in
+@@ -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@
+@@ -107,7 +107,7 @@ RANLIB		= @RANLIB@
+ 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 --git a/zlib/configure.in b/zlib/configure.in
+index 292d3aa..bc045d6 100644
+--- a/zlib/configure.in
++++ b/zlib/configure.in
+@@ -51,17 +51,12 @@ TEA_SETUP_COMPILER
+ #-----------------------------------------------------------------------
+ 
+ TEA_ADD_SOURCES([zlibtcl.c zlibtclStubInit.c])
+-TEA_ADD_SOURCES([../compat/zlib/adler32.c	../compat/zlib/compress.c	../compat/zlib/crc32.c])
+-TEA_ADD_SOURCES([../compat/zlib/deflate.c	../compat/zlib/gzclose.c	../compat/zlib/gzlib.c])
+-TEA_ADD_SOURCES([../compat/zlib/gzread.c	../compat/zlib/gzwrite.c	../compat/zlib/infback.c])
+-TEA_ADD_SOURCES([../compat/zlib/inffast.c	../compat/zlib/inflate.c	../compat/zlib/inftrees.c])
+-TEA_ADD_SOURCES([../compat/zlib/trees.c	../compat/zlib/uncompr.c	../compat/zlib/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 --git a/zlib/zlibtclDecls.h b/zlib/zlibtclDecls.h
+index c91496f..630abc7 100644
+--- a/zlib/zlibtclDecls.h
++++ b/zlib/zlibtclDecls.h
+@@ -16,7 +16,7 @@
+ 
+ #include "tcl.h"
+ #include "zlibtclDeclsMask.h"
+-#include "../compat/zlib/zlib.h"
++#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/zlib.h"
+ #include "zlibtclDeclsUnmask.h"
+ 
+ /* !BEGIN!: Do not edit below this line. */
diff --git a/dev-tcltk/tkimg/tkimg-1.3.20100510.ebuild b/dev-tcltk/tkimg/tkimg-1.3.20100510.ebuild
new file mode 100644
index 000000000000..a3ac880d655e
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.3.20100510.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.3.20100510.ebuild,v 1.1 2010/05/11 16:42:47 jlec Exp $
+
+EAPI="3"
+inherit eutils prefix
+
+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"
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="dev-lang/tk
+	>=dev-tcltk/tcllib-1.11
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/tiff"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	eprefixify \
+		libjpeg/jpegtclDecls.h \
+		libpng/pngtclDecls.h \
+		libtiff/tifftclDecls.h \
+		zlib/zlibtclDecls.h
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_ROOT="${D}" \
+		install || die "emake install failed"
+	# Make library links
+	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
+		bl=$(basename $l)
+		dosym Img1.4/${bl} /usr/$(get_libdir)/${bl}
+	done
+
+	dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE || die
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins demo.tcl || die
+		insinto /usr/share/doc/${PF}/html
+		doins -r doc/* || die
+	fi
+}