Adding upstream fix for building against libpng-1.5, EAPI=4 bump

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

7 files changed, 402 insertions, 27 deletions

diff --git a/media-libs/libharu/ChangeLog b/media-libs/libharu/ChangeLog
index e1011d30817c..14f9a840d629 100644
--- a/media-libs/libharu/ChangeLog
+++ b/media-libs/libharu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libharu
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libharu/ChangeLog,v 1.3 2010/11/30 22:33:37 bicatali Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libharu/ChangeLog,v 1.4 2011/07/10 15:49:38 jlec Exp $
+
+  10 Jul 2011; Justin Lecher <jlec@gentoo.org> libharu-2.1.0.ebuild,
+  libharu-2.2.1.ebuild, +files/libharu-2.2.1-libpng-1.5.patch, metadata.xml:
+  Adding upstream fix for building against libpng-1.5, EAPI=4 bump
 
 *libharu-2.2.1 (30 Nov 2010)
 
diff --git a/media-libs/libharu/Manifest b/media-libs/libharu/Manifest
index f10742ae104d..4a9d2f925ebe 100644
--- a/media-libs/libharu/Manifest
+++ b/media-libs/libharu/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX libharu-2.2.1-libpng-1.5.patch 13383 RMD160 1de7814f24369b598acbb09cee66b3571326713a SHA1 463641d4570d59d632c1878597253db962129599 SHA256 da610b9ca069c23f7afe8b91e8e81ea50a490dadf67fea95aa0fc6b551613159
 DIST libharu-2.1.0.tar.bz2 1614433 RMD160 923684a2f127ef0a738d840bc50112f8eb829249 SHA1 1656f5ffeeb566240be2b24ade3849d22e2a0594 SHA256 399020bc016cbb38fbac8140354de763957c654123422e11bb2a731908dfab1e
 DIST libharu-2.2.1.tar.bz2 792180 RMD160 2f5b66b5e63d15039940fa9a38630b06e74a1360 SHA1 bfea7d9df3fb6a112340d0d54731f62f53b26d2f SHA256 9240f2f0860d7827d15d6dd5e1ff068b3c7891f276cb392e010e7db2641e8910
-EBUILD libharu-2.1.0.ebuild 834 RMD160 aa28e86c761417104a94d04f1f88e07ab586a6f2 SHA1 98ec477cfc0ff7807ae0bf512b090c1e973ba83d SHA256 75e0101de2c4680f18ebcbbd785890c3d779d4ca60d642ed367d72c693e9924e
-EBUILD libharu-2.2.1.ebuild 755 RMD160 147eea82720c0932f993ce3f7e93dc679d1bbbd5 SHA1 bac7478e35d88874dbbf88e3fccc75cb24b70237 SHA256 c9ffc7b2ba96f8cc136ed45c7bd274672e4f5759dc9c9432c43ef530e87169e6
-MISC ChangeLog 642 RMD160 8a7084bf23617962585e2b4ca3db236f7ab431bd SHA1 2c4350641e2de025e22856de81860200a153c276 SHA256 7d3bd2c7b7ccb106127f94ac1eac2abac2bd91c6a5b2df259950f27511f14038
-MISC metadata.xml 708 RMD160 a9df106784d48e375086fb1d95d6ad5c5b416a0e SHA1 543c0fb517d574437ea005f6c047f540fef92439 SHA256 df7490d5da793d856d60459cb09a5ddf18342cd5653da06dd938909ae5597784
+EBUILD libharu-2.1.0.ebuild 831 RMD160 1ab0b7a853d427c670f8472228f5ba1f070d830e SHA1 36e28345bf874b2c1dc565c6cb3109e315f056c8 SHA256 9f644fdca762b9a8b88f69ecdd0dbc9ed7a1cc550f9fec253bbd75c3a36404be
+EBUILD libharu-2.2.1.ebuild 801 RMD160 eaec33db3fd4cf78cb8c13a486b8b9c81578a88f SHA1 7b0e2005512e70407a555aacc3a932783f31e84e SHA256 a88694df5ad35b6ef6db6c734446d6d0b43cb94da6a5f14f6830d03951161cd3
+MISC ChangeLog 852 RMD160 572f72c78b96c681927e22fc01eddcde102c543d SHA1 c9e0b29f8dd6f36cbf4178d2b174676f431fcf12 SHA256 083cbdc06cda562cda401d3fac39a29a6cb35a26dd368c8c64f566ac3f3f8bab
+MISC metadata.xml 712 RMD160 c8c1e7078ecaf71b37ed930c92f5ad3976873e60 SHA1 f6e0417f9a14783588b904d30f0b294d7dd343c6 SHA256 48ce876903fc0b63a1dc4e9989910a716bfb5e3e9768a528308b72de801e1adf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkz1fFAACgkQ1ycZbhPLE2BeqACgmXGRZlDQCI9bqC6V1d4wVJX3
-jbQAniuktZ2G4/SykkFOA2pFpbhcE1/e
-=6e61
+iEYEAREKAAYFAk4ZyiEACgkQgAnW8HDreRaKXQCgwUtdH5T+GlbV25fTVcoTjPQV
+oecAoMn7XUYK71SkT+0rroyB3GHD036M
+=XfRH
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libharu/files/libharu-2.2.1-libpng-1.5.patch b/media-libs/libharu/files/libharu-2.2.1-libpng-1.5.patch
new file mode 100644
index 000000000000..d59f78f8ecf1
--- /dev/null
+++ b/media-libs/libharu/files/libharu-2.2.1-libpng-1.5.patch
@@ -0,0 +1,344 @@
+diff --git a/src/hpdf_image_png.c b/src/hpdf_image_png.c
+index b8f831e..85bd29f 100644
+--- a/src/hpdf_image_png.c
++++ b/src/hpdf_image_png.c
+@@ -109,14 +109,15 @@ ReadPngData_Interlaced  (HPDF_Dict    image,
+                          png_infop    info_ptr)
+ {
+     png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr);
++    png_uint_32 height = png_get_image_height(png_ptr, info_ptr);
+     png_bytep* row_pointers = HPDF_GetMem (image->mmgr,
+-                info_ptr->height * sizeof (png_bytep));
++                height * sizeof (png_bytep));
+ 
+     if (row_pointers) {
+         HPDF_UINT i;
+ 
+-        HPDF_MemSet (row_pointers, 0, info_ptr->height * sizeof (png_bytep));
+-        for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
++        HPDF_MemSet (row_pointers, 0, height * sizeof (png_bytep));
++        for (i = 0; i < (HPDF_UINT)height; i++) {
+             row_pointers[i] = HPDF_GetMem (image->mmgr, len);
+ 
+             if (image->error->error_no != HPDF_OK)
+@@ -126,7 +127,7 @@ ReadPngData_Interlaced  (HPDF_Dict    image,
+         if (image->error->error_no == HPDF_OK) {
+             png_read_image(png_ptr, row_pointers);
+             if (image->error->error_no == HPDF_OK) {       /* add this line */
+-                for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
++                for (i = 0; i < (HPDF_UINT)height; i++) {
+                     if (HPDF_Stream_Write (image->stream, row_pointers[i], len) !=
+                             HPDF_OK)
+                         break;
+@@ -135,7 +136,7 @@ ReadPngData_Interlaced  (HPDF_Dict    image,
+         }
+ 
+         /* clean up */
+-        for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
++        for (i = 0; i < (HPDF_UINT)height; i++) {
+             HPDF_FreeMem (image->mmgr, row_pointers[i]);
+         }
+ 
+@@ -151,12 +152,13 @@ ReadPngData  (HPDF_Dict    image,
+               png_infop    info_ptr)
+ {
+     png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr);
++    png_uint_32 height = png_get_image_height(png_ptr, info_ptr);
+     png_bytep buf_ptr = HPDF_GetMem (image->mmgr, len);
+ 
+     if (buf_ptr) {
+         HPDF_UINT i;
+ 
+-        for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
++        for (i = 0; i < (HPDF_UINT)height; i++) {
+             png_read_rows(png_ptr, (png_byte**)&buf_ptr, NULL, 1);
+             if (image->error->error_no != HPDF_OK)
+                 break;
+@@ -182,17 +184,19 @@ ReadTransparentPaletteData  (HPDF_Dict    image,
+ 	HPDF_STATUS ret = HPDF_OK;
+ 	HPDF_UINT i, j;
+ 	png_bytep *row_ptr;
++	png_uint_32 height = png_get_image_height(png_ptr, info_ptr);
++	png_uint_32 width = png_get_image_width(png_ptr, info_ptr);
+ 
+-	row_ptr = HPDF_GetMem (image->mmgr, info_ptr->height * sizeof(png_bytep));
++	row_ptr = HPDF_GetMem (image->mmgr, height * sizeof(png_bytep));
+ 	if (!row_ptr) {
+ 		return HPDF_FAILD_TO_ALLOC_MEM;
+ 	} else {
+ 		png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr);
+ 
+-		for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
++		for (i = 0; i < (HPDF_UINT)height; i++) {
+ 			row_ptr[i] = HPDF_GetMem(image->mmgr, len);
+ 			if (!row_ptr[i]) {
+-				for (; i >= 0; i--) {
++				for (; i > 0; i--) {
+ 					HPDF_FreeMem (image->mmgr, row_ptr[i]);
+ 				}
+ 				HPDF_FreeMem (image->mmgr, row_ptr);
+@@ -207,19 +211,19 @@ ReadTransparentPaletteData  (HPDF_Dict    image,
+ 		goto Error;
+ 	}
+ 
+-	for (j = 0; j < info_ptr->height; j++) {
+-		for (i = 0; i < info_ptr->width; i++) {
+-			smask_data[info_ptr->width * j + i] = (row_ptr[j][i] < num_trans) ? trans[row_ptr[j][i]] : 0xFF;
++	for (j = 0; j < height; j++) {
++		for (i = 0; i < width; i++) {
++			smask_data[width * j + i] = (row_ptr[j][i] < num_trans) ? trans[row_ptr[j][i]] : 0xFF;
+ 		}
+ 
+-		if (HPDF_Stream_Write (image->stream, row_ptr[j], info_ptr->width) != HPDF_OK) {
++		if (HPDF_Stream_Write (image->stream, row_ptr[j], width) != HPDF_OK) {
+ 			ret = HPDF_FILE_IO_ERROR;
+ 			goto Error;
+ 		}
+ 	}
+ 
+ Error:
+-	for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
++	for (i = 0; i < (HPDF_UINT)height; i++) {
+ 		HPDF_FreeMem (image->mmgr, row_ptr[i]);
+ 	}
+ 
+@@ -238,6 +242,8 @@ ReadTransparentPngData  (HPDF_Dict    image,
+ 	HPDF_UINT i, j;
+ 	png_bytep *row_ptr, row;
+ 	png_byte color_type;
++	png_uint_32 height = png_get_image_height(png_ptr, info_ptr);
++	png_uint_32 width = png_get_image_width(png_ptr, info_ptr);
+ 
+ 	color_type = png_get_color_type(png_ptr, info_ptr);
+ 
+@@ -245,16 +251,16 @@ ReadTransparentPngData  (HPDF_Dict    image,
+ 		return HPDF_INVALID_PNG_IMAGE;
+ 	}
+ 
+-	row_ptr = HPDF_GetMem (image->mmgr, info_ptr->height * sizeof(png_bytep));
++	row_ptr = HPDF_GetMem (image->mmgr, height * sizeof(png_bytep));
+ 	if (!row_ptr) {
+ 		return HPDF_FAILD_TO_ALLOC_MEM;
+ 	} else {
+ 		png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr);
+ 
+-		for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
++		for (i = 0; i < (HPDF_UINT)height; i++) {
+ 			row_ptr[i] = HPDF_GetMem(image->mmgr, len);
+ 			if (!row_ptr[i]) {
+-				for (; i >= 0; i--) {
++				for (; i > 0; i--) {
+ 					HPDF_FreeMem (image->mmgr, row_ptr[i]);
+ 				}
+ 				HPDF_FreeMem (image->mmgr, row_ptr);
+@@ -271,12 +277,12 @@ ReadTransparentPngData  (HPDF_Dict    image,
+ 
+ 	switch (color_type) {
+ 		case PNG_COLOR_TYPE_RGB_ALPHA:
+-			row_len = 3 * info_ptr->width * sizeof(png_byte);
+-			for (j = 0; j < info_ptr->height; j++) {
+-				for (i = 0; i < info_ptr->width; i++) {
++			row_len = 3 * width * sizeof(png_byte);
++			for (j = 0; j < height; j++) {
++				for (i = 0; i < width; i++) {
+ 					row = row_ptr[j];
+ 					memmove(row + (3 * i), row + (4*i), 3);
+-					smask_data[info_ptr->width * j + i] = row[4 * i + 3];
++					smask_data[width * j + i] = row[4 * i + 3];
+ 				}
+ 
+ 				if (HPDF_Stream_Write (image->stream, row, row_len) != HPDF_OK) {
+@@ -286,12 +292,12 @@ ReadTransparentPngData  (HPDF_Dict    image,
+ 			}
+ 			break;
+ 		case PNG_COLOR_TYPE_GRAY_ALPHA:
+-			row_len = info_ptr->width * sizeof(png_byte);
+-			for (j = 0; j < info_ptr->height; j++) {
+-				for (i = 0; i < info_ptr->width; i++) {
++			row_len = width * sizeof(png_byte);
++			for (j = 0; j < height; j++) {
++				for (i = 0; i < width; i++) {
+ 					row = row_ptr[j];
+ 					row[i] = row[2 * i];
+-					smask_data[info_ptr->width * j + i] = row[2 * i + 1];
++					smask_data[width * j + i] = row[2 * i + 1];
+ 				}
+ 
+ 				if (HPDF_Stream_Write (image->stream, row, row_len) != HPDF_OK) {
+@@ -306,7 +312,7 @@ ReadTransparentPngData  (HPDF_Dict    image,
+ 	}
+ 
+ Error:
+-	for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
++	for (i = 0; i < (HPDF_UINT)height; i++) {
+ 		HPDF_FreeMem (image->mmgr, row_ptr[i]);
+ 	}
+ 
+@@ -415,7 +421,8 @@ LoadPngData  (HPDF_Dict     image,
+ 
+ {
+ 	HPDF_STATUS ret = HPDF_OK;
+-
++	png_uint_32 width, height;
++	int bit_depth, color_type;
+ 	png_structp png_ptr = NULL;
+ 	png_infop info_ptr = NULL;
+ 
+@@ -447,8 +454,10 @@ LoadPngData  (HPDF_Dict     image,
+ 		goto Exit;
+ 	}
+ 
++	png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, NULL, NULL, NULL);
++
+ 	/* 16bit images are not supported. */
+-	if (info_ptr->bit_depth == 16) {
++	if (bit_depth == 16) {
+ 		png_set_strip_16(png_ptr);
+ 	}
+ 
+@@ -458,7 +467,7 @@ LoadPngData  (HPDF_Dict     image,
+ 	}
+ 
+ 	/* check palette-based images for transparent areas and load them immediately if found */
+-	if (xref && PNG_COLOR_TYPE_PALETTE & info_ptr->color_type) {
++	if (xref && PNG_COLOR_TYPE_PALETTE & color_type) {
+ 		png_bytep trans;
+ 		int num_trans;
+ 		HPDF_Dict smask;
+@@ -478,10 +487,10 @@ LoadPngData  (HPDF_Dict     image,
+ 		smask->header.obj_class |= HPDF_OSUBCLASS_XOBJECT;
+ 		ret = HPDF_Dict_AddName (smask, "Type", "XObject");
+ 		ret += HPDF_Dict_AddName (smask, "Subtype", "Image");
+-		ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)info_ptr->width);
+-		ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)info_ptr->height);
++		ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)width);
++		ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)height);
+ 		ret += HPDF_Dict_AddName (smask, "ColorSpace", "DeviceGray");
+-		ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)info_ptr->bit_depth);
++		ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)bit_depth);
+ 
+ 		if (ret != HPDF_OK) {
+ 			HPDF_Dict_Free(smask);
+@@ -489,7 +498,7 @@ LoadPngData  (HPDF_Dict     image,
+ 			goto Exit;
+ 		}
+ 
+-		smask_data = HPDF_GetMem(image->mmgr, info_ptr->width * info_ptr->height);
++		smask_data = HPDF_GetMem(image->mmgr, width * height);
+ 		if (!smask_data) {
+ 			HPDF_Dict_Free(smask);
+ 			ret = HPDF_FAILD_TO_ALLOC_MEM;
+@@ -503,7 +512,7 @@ LoadPngData  (HPDF_Dict     image,
+ 			goto Exit;
+ 		}
+ 
+-		if (HPDF_Stream_Write(smask->stream, smask_data, info_ptr->width * info_ptr->height) != HPDF_OK) {
++		if (HPDF_Stream_Write(smask->stream, smask_data, width * height) != HPDF_OK) {
+ 			HPDF_FreeMem(image->mmgr, smask_data);
+ 			HPDF_Dict_Free(smask);
+ 			ret = HPDF_FILE_IO_ERROR;
+@@ -513,9 +522,9 @@ LoadPngData  (HPDF_Dict     image,
+ 
+ 
+ 		ret += CreatePallet(image, png_ptr, info_ptr);
+-		ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)info_ptr->width);
+-		ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)info_ptr->height);
+-		ret += HPDF_Dict_AddNumber (image, "BitsPerComponent",	(HPDF_UINT)info_ptr->bit_depth);
++		ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)width);
++		ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)height);
++		ret += HPDF_Dict_AddNumber (image, "BitsPerComponent",	(HPDF_UINT)bit_depth);
+ 		ret += HPDF_Dict_Add (image, "SMask", smask);
+ 
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+@@ -526,7 +535,7 @@ no_transparent_color_in_palette:
+ 
+ 	/* read images with alpha channel right away 
+ 	   we have to do this because image transparent mask must be added to the Xref */
+-	if (xref && PNG_COLOR_MASK_ALPHA & info_ptr->color_type) {
++	if (xref && PNG_COLOR_MASK_ALPHA & color_type) {
+ 		HPDF_Dict smask;
+ 		png_bytep smask_data;
+ 
+@@ -539,10 +548,10 @@ no_transparent_color_in_palette:
+ 		smask->header.obj_class |= HPDF_OSUBCLASS_XOBJECT;
+ 		ret = HPDF_Dict_AddName (smask, "Type", "XObject");
+ 		ret += HPDF_Dict_AddName (smask, "Subtype", "Image");
+-		ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)info_ptr->width);
+-		ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)info_ptr->height);
++		ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)width);
++		ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)height);
+ 		ret += HPDF_Dict_AddName (smask, "ColorSpace", "DeviceGray");
+-		ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)info_ptr->bit_depth);
++		ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)bit_depth);
+ 
+ 		if (ret != HPDF_OK) {
+ 			HPDF_Dict_Free(smask);
+@@ -550,7 +559,7 @@ no_transparent_color_in_palette:
+ 			goto Exit;
+ 		}
+ 
+-		smask_data = HPDF_GetMem(image->mmgr, info_ptr->width * info_ptr->height);
++		smask_data = HPDF_GetMem(image->mmgr, width * height);
+ 		if (!smask_data) {
+ 			HPDF_Dict_Free(smask);
+ 			ret = HPDF_FAILD_TO_ALLOC_MEM;
+@@ -564,7 +573,7 @@ no_transparent_color_in_palette:
+ 			goto Exit;
+ 		}
+ 
+-		if (HPDF_Stream_Write(smask->stream, smask_data, info_ptr->width * info_ptr->height) != HPDF_OK) {
++		if (HPDF_Stream_Write(smask->stream, smask_data, width * height) != HPDF_OK) {
+ 			HPDF_FreeMem(image->mmgr, smask_data);
+ 			HPDF_Dict_Free(smask);
+ 			ret = HPDF_FILE_IO_ERROR;
+@@ -572,14 +581,14 @@ no_transparent_color_in_palette:
+ 		}
+ 		HPDF_FreeMem(image->mmgr, smask_data);
+ 
+-		if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
++		if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
+ 			ret += HPDF_Dict_AddName (image, "ColorSpace", "DeviceGray");
+ 		} else {
+ 			ret += HPDF_Dict_AddName (image, "ColorSpace", "DeviceRGB");
+ 		}
+-		ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)info_ptr->width);
+-		ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)info_ptr->height);
+-		ret += HPDF_Dict_AddNumber (image, "BitsPerComponent",	(HPDF_UINT)info_ptr->bit_depth);
++		ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)width);
++		ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)height);
++		ret += HPDF_Dict_AddNumber (image, "BitsPerComponent",	(HPDF_UINT)bit_depth);
+ 		ret += HPDF_Dict_Add (image, "SMask", smask);
+ 
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+@@ -589,9 +598,9 @@ no_transparent_color_in_palette:
+ 	/* if the image has color palette, copy the pallet of the image to
+ 	 * create color map.
+ 	 */
+-	if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
++	if (color_type == PNG_COLOR_TYPE_PALETTE)
+ 		ret = CreatePallet(image, png_ptr, info_ptr);
+-	else if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
++	else if (color_type == PNG_COLOR_TYPE_GRAY)
+ 		ret = HPDF_Dict_AddName (image, "ColorSpace", "DeviceGray");
+ 	else
+ 		ret = HPDF_Dict_AddName (image, "ColorSpace", "DeviceRGB");
+@@ -617,16 +626,16 @@ no_transparent_color_in_palette:
+ 	}
+ 
+ 	/* setting the info of the image. */
+-	if (HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)info_ptr->width)
++	if (HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)width)
+ 			!= HPDF_OK)
+ 		goto Exit;
+ 
+-	if (HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)info_ptr->height)
++	if (HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)height)
+ 			!= HPDF_OK)
+ 		goto Exit;
+ 
+ 	if (HPDF_Dict_AddNumber (image, "BitsPerComponent",
+-				(HPDF_UINT)info_ptr->bit_depth) != HPDF_OK)
++				(HPDF_UINT)bit_depth) != HPDF_OK)
+ 		goto Exit;
+ 
+ 	/* clean up */
diff --git a/media-libs/libharu/libharu-2.1.0.ebuild b/media-libs/libharu/libharu-2.1.0.ebuild
index b5d7ce6de47d..492e2af8611b 100644
--- a/media-libs/libharu/libharu-2.1.0.ebuild
+++ b/media-libs/libharu/libharu-2.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libharu/libharu-2.1.0.ebuild,v 1.2 2008/10/25 22:33:38 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libharu/libharu-2.1.0.ebuild,v 1.3 2011/07/10 15:49:38 jlec Exp $
 
 DESCRIPTION="C/C++ library for PDF generation"
 HOMEPAGE="http://www.libharu.org/"
@@ -9,10 +9,10 @@ SRC_URI="http://libharu.org/files/${P}.tar.bz2"
 LICENSE="ZLIB"
 SLOT="2"
 KEYWORDS="~amd64 ~ppc ~x86"
-
 IUSE="png zlib examples"
 
-DEPEND="png? ( media-libs/libpng )
+DEPEND="
+	png? ( media-libs/libpng )
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
 
diff --git a/media-libs/libharu/libharu-2.2.1.ebuild b/media-libs/libharu/libharu-2.2.1.ebuild
index ad087685a46a..c24e81919e38 100644
--- a/media-libs/libharu/libharu-2.2.1.ebuild
+++ b/media-libs/libharu/libharu-2.2.1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libharu/libharu-2.2.1.ebuild,v 1.1 2010/11/30 22:33:37 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libharu/libharu-2.2.1.ebuild,v 1.2 2011/07/10 15:49:38 jlec Exp $
 
-EAPI=2
+EAPI=4
+
+inherit eutils
 
 DESCRIPTION="C/C++ library for PDF generation"
 HOMEPAGE="http://www.libharu.org/"
@@ -11,13 +13,17 @@ SRC_URI="http://libharu.org/files/${P}.tar.bz2"
 LICENSE="ZLIB"
 SLOT="2"
 KEYWORDS="~amd64 ~ppc ~x86"
-
 IUSE="png zlib static-libs"
 
-DEPEND="png? ( media-libs/libpng )
+DEPEND="
+	png? ( media-libs/libpng )
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng-1.5.patch
+}
+
 src_configure() {
 	econf \
 		$(use_enable static-libs static) \
@@ -28,6 +34,6 @@ src_configure() {
 src_install() {
 	emake \
 		INSTALL_STRIP_FLAG="" \
-		DESTDIR="${D}" install || die "emake install failed"
+		DESTDIR="${D}" install
 	dodoc README
 }
diff --git a/media-libs/libharu/metadata.xml b/media-libs/libharu/metadata.xml
index b6ee600301c6..f1bac7ae21cd 100644
--- a/media-libs/libharu/metadata.xml
+++ b/media-libs/libharu/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<herd>graphics</herd>
-<longdescription lang="en">
+	<herd>sci</herd>
+	<herd>graphics</herd>
+	<longdescription lang="en">
   Haru PDF library is a ANSI/C library for generating PDF files.
   It supports the following features:
    1. Generating PDF files with lines, text, images.
@@ -14,5 +14,5 @@
    6. Creating encrypted PDF files.
    7. Using various character sets (ISO8859-1~16, MSCP1250~8, KOI8-R).
    8. Supporting CJK fonts and encodings. 
-</longdescription>
+	</longdescription>
 </pkgmetadata>
diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest
index fa786c5ee1be..d7edc384a81d 100644
--- a/media-libs/libwmf/Manifest
+++ b/media-libs/libwmf/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX libwmf-0.2.8.4-build.patch 1340 RMD160 d0ee933b7bd3d3b299859c8c36e542298049343b SHA1 81e1f460c426c3db37606ec3cc8da66b52c11fa3 SHA256 e12d0cd079b70fc83f87f09d262eee901707f27fe5f509e65ff108aa8cdccadb
 AUX libwmf-0.2.8.4-gdk-pixbuf.patch 1037 RMD160 a26cd1d8b59d17347e2c0b7cc49fac6b85206aa7 SHA1 5430f72c608c983ba3946ba7171bf3a6a5119a87 SHA256 fcfbc4ae5bc086c934fbe785ca21dacad90ef58e56aa52a58f3d29931b21c839
 AUX libwmf-0.2.8.4-intoverflow.patch 971 RMD160 4b5c414021a2b663032aa90e9f40f05e1389b503 SHA1 6f130ea9f639ccf88fef0fda74cf9fa3956f81b5 SHA256 b19f80f742c22138beb6d1943f6cbedc0db2a8c72419bf8bf9216e1f806d4690
@@ -6,6 +9,23 @@ AUX libwmf-0.2.8.4-pngfix.patch 582 RMD160 1a723c2e0d1dd16b6788f0ead2277e8996ab8
 AUX libwmf-0.2.8.4-use-system-fonts.patch 840 RMD160 28ff35be124c3070836e5d4e93772892b395931e SHA1 3936dda44d1d09e272346d9ae8d2fd9b90fe775e SHA256 b99aea69f5c83ccecaca0f74c7d5bbdac2bb7c6c7991bf30d8c64616edddc469
 DIST libwmf-0.2.8.4.tar.gz 2169375 RMD160 98cd631adb5bb332d9224d04bc8a265c105435f2 SHA1 822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89 SHA256 5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8
 EBUILD libwmf-0.2.8.4-r3.ebuild 2726 RMD160 ad8ef0107be4257d80ea3ab439bd4a1d8d73f42a SHA1 086381cc2f53e3a221897b90d3d2fdacc6e47529 SHA256 e9701604e1774d87560ace7a9f30885f51c061ca878f368da49f35baad46b572
-EBUILD libwmf-0.2.8.4-r4.ebuild 2364 RMD160 6c55c3d206455ff5bfb0dd1f6793500e8e5c3e33 SHA1 70cb37d163e3099dc3ad7d2beb2d06145916dfcc SHA256 44e1dd2309a5c2872cb6cb6671fd3b2d5f71391adb0674cba565d7ecb10158bb
-MISC ChangeLog 10363 RMD160 45a7ee8dccd82ee1213e29e929dbc02cc463eef0 SHA1 8512ddae77b210c954490558c7d9cf784e6bbb26 SHA256 9c358258237cfa295cc02115c5c4e94ef35c8d0aae4b8562a12db1993b3f6da9
+EBUILD libwmf-0.2.8.4-r4.ebuild 2362 RMD160 11d2d296be75051122ab5793f04a0eb4a0cea3de SHA1 401a3824138772192b7cf4d0413202e458f26f01 SHA256 739d17055bfba5200807baec315f02b788b21e4d561e889bacfbf4aa12e8e657
+MISC ChangeLog 10476 RMD160 8228eb89e59d961d4cdd9545b4d7902eb0e6194d SHA1 b57b9b4d179439e97a30a417774b66d34baa737f SHA256 39df10bb19d9d261dd667cd8de9d525e2b9a4d03251c303f7bce20a25cca9a13
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOGcstAAoJEPqDWhW0r/LCtSQP/3IJlOXoJcPGY1PajuEOJxiD
+gKvyGMuUVvaFHbrHxtFW05Q3YkoqxI7HXNfagF/gmD1s8DkfEOnOfIR0yaD6rX6L
+dKelKIaTKETn4q8H8s/xYZ9XJqNGECczSkvXLVsEo5juG4mrAmmr+b+cxA08hDgD
+I86AoyWWjWSglpGf8BY3BUnOPzJiV+uADDOkn673XA4JhXx2os+bR24JGtRJ+09x
+TuqW85CW4p4kNFBnwzTgftg84MA2rZ2qLYzvNO3w3XvaxSUewTmuRICM1YRSUzlK
+E23QZcIn8N0OuzvKi7bDrwpakdPiXoYWuUJGQWBfLK5VOXL+aFlRkwzMInBsd32U
+RC7/Boh9Slw0QJhsc7pz1t1oIhiEd+8zNnXSJBhzMr6dLN7EU+EqA6d9XUEYMCGI
+JLriQNI5uLGqEUcYOmEkbRRl6jEiilbnW4pThGIia5fc+2ypk9RQMfSuq9n2XS0x
+BxVoEI8b7yqNzYmYEPE5RdK9hogeBlOPmTyPPz3F0CTojipkX4HKIaYnlUpcK6C5
+bjLIJhp/6jp46ovcYVlxhEbcXNl0lXAQWfbHOxlENf/dMLaFBJkMyLZI+sDTFHoG
+suSatW9bayh5cT6m7SYIalDjAQ9X3QZeinVD+TYPUcreg2kF7gp+ePFIIFwg1YbG
+1P8BE/VXiMtCKnjwecPZ
+=SwpF
+-----END PGP SIGNATURE-----