Version bump.

Package-Manager: portage-2.1.3.19

5 files changed, 105 insertions, 5 deletions

diff --git a/media-libs/giflib/ChangeLog b/media-libs/giflib/ChangeLog
index 432ef054b2dd..6cc9cc9504c4 100644
--- a/media-libs/giflib/ChangeLog
+++ b/media-libs/giflib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/giflib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v 1.44 2007/07/22 09:40:53 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v 1.45 2007/11/11 00:38:12 vapier Exp $
+
+*giflib-4.1.6 (11 Nov 2007)
+
+  11 Nov 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/giflib-4.1.6-gif2rle.patch, +giflib-4.1.6.ebuild:
+  Version bump.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; giflib-4.1.4.ebuild:
   Drop virtual/x11 references.
diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index 179538d5b8b1..046b45e74969 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -1,12 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX giflib-4.1.6-gif2rle.patch 763 RMD160 e76968075b101759d17f76b1048df42d19932723 SHA1 b22b9ea2fa36dac4061eefa1f82e1315de3be5af SHA256 f8345a380026827c10eca91ce391c51de0cccb74f1370a97671805e15304e1a5
+MD5 ee208179d1b5392c96b768d37d086e44 files/giflib-4.1.6-gif2rle.patch 763
+RMD160 e76968075b101759d17f76b1048df42d19932723 files/giflib-4.1.6-gif2rle.patch 763
+SHA256 f8345a380026827c10eca91ce391c51de0cccb74f1370a97671805e15304e1a5 files/giflib-4.1.6-gif2rle.patch 763
 DIST giflib-4.1.4.tar.gz 605811 RMD160 5736adf6b8640ca097a41d9abfe8ed8457f4f659 SHA1 95068775508599e61bfda1de255281440e11d763 SHA256 ecf6101d3b00e67cc8f9e7b1d40a507ab90403bb66997a4c53aa337865289846
+DIST giflib-4.1.6.tar.bz2 506050 RMD160 bdb99f7048a79b9e771b069f90ac151537011d19 SHA1 22680f604ec92065f04caf00b1c180ba74fb8562 SHA256 e1c1ced9c5bc8f93ef0faf0a8c7717abf784d10a7b270d2285e8e1f3b93f2bed
 EBUILD giflib-4.1.4.ebuild 1207 RMD160 bed432abf8ce8eeff7408430cf94369df248ed40 SHA1 0784ed1f57ee27ab849029737ccef6a1390a5c9f SHA256 964dd13cd9b107d9899ec8c37a5af1753e5f7266757ffd03eb820f483c882120
 MD5 37424ea4de1e890b98c0c31817f8b33a giflib-4.1.4.ebuild 1207
 RMD160 bed432abf8ce8eeff7408430cf94369df248ed40 giflib-4.1.4.ebuild 1207
 SHA256 964dd13cd9b107d9899ec8c37a5af1753e5f7266757ffd03eb820f483c882120 giflib-4.1.4.ebuild 1207
-MISC ChangeLog 5254 RMD160 6de026be1a09425945b922e4ed9dbcedba408a33 SHA1 eb166a54f53fc7ac47df812d2666db61f4104a93 SHA256 9020a6ea3541b355156a3114528700499fbf533f7820a2c4fa9b739b518343b5
-MD5 dc43b7bb103da36b23dbdc74717ad848 ChangeLog 5254
-RMD160 6de026be1a09425945b922e4ed9dbcedba408a33 ChangeLog 5254
-SHA256 9020a6ea3541b355156a3114528700499fbf533f7820a2c4fa9b739b518343b5 ChangeLog 5254
+EBUILD giflib-4.1.6.ebuild 1180 RMD160 de5afb170d6752c5c1524adc21e7e2eef643a575 SHA1 d1d089c1b7d0eda587ce7bfd69a8f7385af1fe7a SHA256 0babb94c8e3fe39d63c4b625449486c383c608aa263affbaaa29266508b13af1
+MD5 bc55656dff9f718ce41a73a3ac5b48cf giflib-4.1.6.ebuild 1180
+RMD160 de5afb170d6752c5c1524adc21e7e2eef643a575 giflib-4.1.6.ebuild 1180
+SHA256 0babb94c8e3fe39d63c4b625449486c383c608aa263affbaaa29266508b13af1 giflib-4.1.6.ebuild 1180
+MISC ChangeLog 5406 RMD160 bfbdc8220bc72a79157c80d289013498294aee85 SHA1 d1395f09106757d61ded18ae007538c90e30f4b9 SHA256 2c52fb902c72f015b1831995e0ac20238933691fc63a9cf7e11e6dfbe1cd0376
+MD5 e878c4112c915dd48cf0fbcb68fc0a8f ChangeLog 5406
+RMD160 bfbdc8220bc72a79157c80d289013498294aee85 ChangeLog 5406
+SHA256 2c52fb902c72f015b1831995e0ac20238933691fc63a9cf7e11e6dfbe1cd0376 ChangeLog 5406
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 metadata.xml 161
@@ -14,3 +26,13 @@ SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1 metadata
 MD5 7fdeda2addbb84b5a9b126797b40a2f2 files/digest-giflib-4.1.4 238
 RMD160 c223a6433035f896e15a665889367773c1ba2420 files/digest-giflib-4.1.4 238
 SHA256 1ae07d9ea5c4dd8405e70145dcd54d5bca0eed638f63d18a581e21133ae9bc31 files/digest-giflib-4.1.4 238
+MD5 711f27e01757b55a6120713eb63aa491 files/digest-giflib-4.1.6 241
+RMD160 3839cfe03ae13983be60c7aa7401528222117411 files/digest-giflib-4.1.6 241
+SHA256 c28ef35740c38db16c96ba4682fc58cbc3d1bace138fe2476a18d04e82155bb1 files/digest-giflib-4.1.6 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHNk77p/wUKkr7RBoRAmZsAJ9GOrzJMbOj1ARraw/FkvvD3jxf8ACeJPbp
+VSsFT+tkjLR4sk1Cr7jiLd0=
+=7cTO
+-----END PGP SIGNATURE-----
diff --git a/media-libs/giflib/files/digest-giflib-4.1.6 b/media-libs/giflib/files/digest-giflib-4.1.6
new file mode 100644
index 000000000000..f8a2a2092725
--- /dev/null
+++ b/media-libs/giflib/files/digest-giflib-4.1.6
@@ -0,0 +1,3 @@
+MD5 7125644155ae6ad33dbc9fc15a14735f giflib-4.1.6.tar.bz2 506050
+RMD160 bdb99f7048a79b9e771b069f90ac151537011d19 giflib-4.1.6.tar.bz2 506050
+SHA256 e1c1ced9c5bc8f93ef0faf0a8c7717abf784d10a7b270d2285e8e1f3b93f2bed giflib-4.1.6.tar.bz2 506050
diff --git a/media-libs/giflib/files/giflib-4.1.6-gif2rle.patch b/media-libs/giflib/files/giflib-4.1.6-gif2rle.patch
new file mode 100644
index 000000000000..f36b6b41fcc2
--- /dev/null
+++ b/media-libs/giflib/files/giflib-4.1.6-gif2rle.patch
@@ -0,0 +1,18 @@
+http://sourceforge.net/tracker/index.php?func=detail&aid=1829712&group_id=102202&atid=631304
+
+--- giflib/util/gif2rle.c
++++ giflib/util/gif2rle.c
+@@ -222,11 +222,8 @@
+     ColorMap = (GifFile->Image.ColorMap ?
+                     GifFile->Image.ColorMap->Colors :
+                     GifFile->SColorMap->Colors);
+-    if (ColorMap == NULL) {
+-        fprintf(stderr, "Gif Image does not have a colormap\n");
+-        exit(EXIT_FAILURE);
+-    }
+-    ColorMapSize = 1 << ColorMap->BitsPerPixel;
++    ColorMapSize = 1 << (GifFile->Image.ColorMap ? GifFile->Image.ColorMap->BitsPerPixel :
++				                GifFile->SColorMap->BitsPerPixel);
+     DumpScreen2Rle(ScreenBuffer, GifFile->SWidth, GifFile->SHeight);
+ 
+     if (DGifCloseFile(GifFile) == GIF_ERROR) {
diff --git a/media-libs/giflib/giflib-4.1.6.ebuild b/media-libs/giflib/giflib-4.1.6.ebuild
new file mode 100644
index 000000000000..2e2f4e353850
--- /dev/null
+++ b/media-libs/giflib/giflib-4.1.6.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.6.ebuild,v 1.1 2007/11/11 00:38:12 vapier Exp $
+
+inherit eutils libtool
+
+DESCRIPTION="Library to handle, display and manipulate GIF images"
+HOMEPAGE="http://sourceforge.net/projects/giflib/"
+SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="rle X"
+
+DEPEND="!media-libs/libungif
+	X? (
+		x11-libs/libXt
+		x11-libs/libX11
+		x11-libs/libICE
+		x11-libs/libSM
+	)
+	rle? ( media-libs/urt )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gif2rle.patch
+	elibtoolize
+	epunt_cxx
+}
+
+src_compile() {
+	econf \
+		$(use_enable X x11) \
+		$(
+			# prevent circular depend #111455
+			has_version media-libs/urt \
+				|| --disable-rle \
+				&& use_enable rle \
+		) \
+		--disable-gl \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS BUGS ChangeLog NEWS ONEWS README TODO doc/*.txt
+	dohtml -r doc
+}