added gcc 4.3 patch (see bug #214814)

Package-Manager: portage-2.1.4.4

4 files changed, 138 insertions, 2 deletions

diff --git a/media-gfx/exiv2/ChangeLog b/media-gfx/exiv2/ChangeLog
index 896aff7e4114..3184029f66bc 100644
--- a/media-gfx/exiv2/ChangeLog
+++ b/media-gfx/exiv2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/exiv2
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.43 2008/02/10 01:08:33 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.44 2008/03/26 23:49:00 sbriesen Exp $
+
+*exiv2-0.16-r1 (26 Mar 2008)
+
+  26 Mar 2008; Stefan Briesenick <sbriesen@gentoo.org>
+  +files/exiv2-0.16-gcc43.diff, +exiv2-0.16-r1.ebuild:
+  added gcc 4.3 patch (see bug #214814)
 
   10 Feb 2008; Wulf C. Krueger <philantrop@gentoo.org> exiv2-0.15-r1.ebuild:
   Marked stable on amd64.
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 8a11e4e2ae6a..a409f382a2a7 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,10 +1,12 @@
 AUX CVE-2007-6353.diff 3735 RMD160 fb914dea4d60071a60c10839d1f86b3b17aecd68 SHA1 6db8d981bd1f504110387cd3478fe47b4a305fbf SHA256 db0fe8f38eab154ab442f684992cdbf16e88d8f3850b83a94122617edfde6749
+AUX exiv2-0.16-gcc43.diff 1483 RMD160 2e0392b7f49e550bd34ecdd0c060472e0a6dda05 SHA1 4ac0abe4363f9f59c7ea4f04145a833463adf2da SHA256 a76bc62e70bd41a74d6a5f5fadd9ea5f08c9f29ed3001f82d671489d39be9d29
 DIST exiv2-0.13.tar.gz 2841724 RMD160 e06de2dfeb6941b1fd501bff258763f2f13f98b9 SHA1 3abf440af8d3df0025bc767fc7e6cc170adc50e6 SHA256 f1d38ed31bdb54f6c5c80f7cd6765025cac535883b24e630f5bbe5c63e5cff75
 DIST exiv2-0.15.tar.gz 1133249 RMD160 b879bcbe8255ae83af7d1cfadb84b01dbc5e97f2 SHA1 db5b0da39c5d2a736cecf4800f83639f841af5cc SHA256 b72d82e9117308063471993f3832e58064c0599dec3df2bf2a7ce54450984a3e
 DIST exiv2-0.16.tar.gz 1591822 RMD160 b0a67bbf3e9367b58b75170899b5820afed42d33 SHA1 fd5cdec6b60fd52a15c73c30760e099bbfa3cf50 SHA256 d407bd0f9b06d68940ae1a73b226ca234cd9a19ea65eab108746b69ac7ce0afb
 EBUILD exiv2-0.13-r1.ebuild 1646 RMD160 7e00b36004fca4164cc67af0047abbb71043bc57 SHA1 deaf1dbef691e7a6b5fecf85ee4629a5120f1b43 SHA256 6bb29ab566db580ec6683d202341d684b689679eb422dd2deb6afd76990f1e4f
 EBUILD exiv2-0.13.ebuild 1586 RMD160 04ed95f8c4a9186cf7cd48d551367e5a52172e6c SHA1 19aa4ab5ff4c3cbf487598480c86fee69686e557 SHA256 c503d6bf9f33db4f5f6ff6ad5a6cf8fd9f01bb1e33bf23cd4fe9a87b1305b759
 EBUILD exiv2-0.15-r1.ebuild 1851 RMD160 3880c5dfe60b2c0578208d0ed3811f00646136e7 SHA1 f6fabfd080a554df6f3b41e514d203ee21272011 SHA256 211125c7c2c361271dc5287a019572a740c1d98a1b99c4b01dddbd48440c3614
+EBUILD exiv2-0.16-r1.ebuild 2074 RMD160 272cd96b293d600bc7fe28ce6e69feaf9e0373d9 SHA1 226cbeab9a67d5754bf39ad3d8fb6f4b01c1ec02 SHA256 9a3b79ee2cb6d34acac929832b13c0b5e1bcef3c85225c0612d61459103875f5
 EBUILD exiv2-0.16.ebuild 1995 RMD160 130e9d1280d9d48918db1c2a3b767de717409c2b SHA1 8ecc7a22949969c263cd4f2cf78314ed186cc69f SHA256 28ea93191046979fba575d07dea125db28e961fd34e7029149ec8f348f1ff5de
-MISC ChangeLog 5358 RMD160 c0128aad99421be55abcab1e4f67a2eb53253cf0 SHA1 e23292b8d385cda3345da9b852eee61764c1d40a SHA256 6a1e1ddf0b5685b8ae108eb277d1eaffe4c3d19715021a34ac2dd04f8eb16a85
+MISC ChangeLog 5537 RMD160 18fbda062c91e38db624d1b2133f3f57e8386f9e SHA1 074805ee1538cca2d5ffafe78d520eb6dd009d3e SHA256 8b3b7fb92b360645f05a0abcf66cebcd1d8cebaeeacfe2511a0abf81f6881d32
 MISC metadata.xml 411 RMD160 ab7786ee2861ee2755a46d5b9d61c05aac3bdcde SHA1 89236e5947f0926012908a274251edc319d4ac3d SHA256 69be80b32baabd40e8ae03cc8a4b8403fc00200f64005c5e11fea69d7fd4cee5
diff --git a/media-gfx/exiv2/exiv2-0.16-r1.ebuild b/media-gfx/exiv2/exiv2-0.16-r1.ebuild
new file mode 100644
index 000000000000..893e07fda4f7
--- /dev/null
+++ b/media-gfx/exiv2/exiv2-0.16-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.16-r1.ebuild,v 1.1 2008/03/26 23:49:00 sbriesen Exp $
+
+inherit eutils
+
+DESCRIPTION="EXIF and IPTC metadata C++ library and command line utility"
+HOMEPAGE="http://www.exiv2.org/"
+SRC_URI="http://www.exiv2.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+
+IUSE="doc nls zlib xmp examples unicode"
+IUSE_LINGUAS="de es fi fr pl ru"
+
+for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
+
+RDEPEND="zlib? ( sys-libs/zlib )
+	xmp? ( dev-libs/expat )
+	nls? ( virtual/libintl )
+	virtual/libiconv"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# gcc 4.3 patch (see bug #214814)
+	epatch "${FILESDIR}/${P}-gcc43.diff"
+
+	if use unicode; then
+		for i in doc/cmd.txt; do
+			echo ">>> Converting "${i}" to UTF-8"
+			iconv -f LATIN1 -t UTF-8 "${i}" > "${i}~" && mv -f "${i}~" "${i}" || rm -f "${i}~"
+		done
+	fi
+
+	if use doc; then
+		echo ">>> Updating doxygen config"
+		doxygen &>/dev/null -u config/Doxyfile
+	fi
+}
+
+src_compile() {
+	local myconf="$(use_enable nls) $(use_enable xmp)"
+	use zlib || myconf="${myconf} --without-zlib"  # plain 'use_with' fails
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+	if use doc; then
+		emake doc || die "emake doc failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README doc/{ChangeLog,cmd.txt}
+	use xmp && dodoc doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt}
+	use doc && dohtml -r doc/html/.
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins samples/*.cpp
+	fi
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "PLEASE PLEASE take note of this:"
+	ewarn "Please make *sure* to run revdep-rebuild now"
+	ewarn "Certain things on your system may have linked against a"
+	ewarn "different version of exiv2 -- those things need to be"
+	ewarn "recompiled. Sorry for the inconvenience!"
+	ewarn
+}
diff --git a/media-gfx/exiv2/files/exiv2-0.16-gcc43.diff b/media-gfx/exiv2/files/exiv2-0.16-gcc43.diff
new file mode 100644
index 000000000000..2b8e251158a5
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.16-gcc43.diff
@@ -0,0 +1,50 @@
+--- a/src/basicio.cpp
++++ b/src/basicio.cpp
+@@ -428,7 +428,7 @@
+             // Minimum size for 1st block is 32kB
+             long size  = std::max(32768 * (1 + need / 32768), size_);
+             byte* data = (byte*)std::malloc(size);
+-            std::memcpy(data, data_, size_);
++            memcpy(data, data_, size_);
+             data_ = data;
+             sizeAlloced_ = size;
+             isMalloced_ = true;
+--- a/xmpsdk/src/XMPCore_Impl.hpp
++++ b/xmpsdk/src/XMPCore_Impl.hpp
+@@ -24,6 +24,7 @@
+ #include <map>
+ 
+ #include <cassert>
++#include <cstring>
+ 
+ #if XMP_MacBuild
+ 	#include <Multiprocessing.h>
+@@ -89,7 +90,7 @@
+ #define kHexDigits "0123456789ABCDEF"
+ 
+ #define XMP_LitMatch(s,l)		(std::strcmp((s),(l)) == 0)
+-#define XMP_LitNMatch(s,l,n)	(std::strncmp((s),(l),(n)) == 0)
++#define XMP_LitNMatch(s,l,n)	(strncmp((s),(l),(n)) == 0)
+ 	// *** Use the above macros!
+ 
+ #define kTab ((char)0x09)
+@@ -369,7 +370,7 @@
+ IsPathPrefix ( XMP_StringPtr fullPath, XMP_StringPtr prefix )
+ {
+ 	bool isPrefix = false;
+-	XMP_StringLen prefixLen = std::strlen(prefix);
++	XMP_StringLen prefixLen = strlen(prefix);
+ 	if ( XMP_LitNMatch ( prefix, fullPath, prefixLen ) ) {
+ 		char separator = fullPath[prefixLen];
+ 		if ( (separator == 0) || (separator == '/') ||
+--- a/xmpsdk/src/XMPMeta.cpp
++++ b/xmpsdk/src/XMPMeta.cpp
+@@ -20,6 +20,8 @@
+ #include "UnicodeInlines.incl_cpp"
+ #include "UnicodeConversions.hpp"
+ 
++#include <cstring>
++
+ #if XMP_DebugBuild
+ 	#include <iostream>
+ #endif