bug 105492

(Portage version: 2.0.51.22-r2)

9 files changed, 199 insertions, 39 deletions

diff --git a/media-gfx/jhead/ChangeLog b/media-gfx/jhead/ChangeLog
index 076bbf057750..04d6f4ba3564 100644
--- a/media-gfx/jhead/ChangeLog
+++ b/media-gfx/jhead/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/jhead
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/ChangeLog,v 1.22 2005/07/08 05:41:16 gongloo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/ChangeLog,v 1.23 2005/09/10 19:04:25 vanquirius Exp $
+
+*jhead-2.4 (10 Sep 2005)
+
+  10 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/jhead-2.4-gcc4.diff, +metadata.xml, -jhead-2.1.ebuild,
+  +jhead-2.4.ebuild:
+  Version bump for bug 105492, thanks to Jonathan Stimmel <jstimmel at gmail
+  dot com>. Adding gcc4 patch to avoid compile warnings, adding myself as a
+  maintainer and graphics as its herd.
 
   08 Jul 2005; <gongloo@gentoo.org> jhead-2.2.ebuild:
   Keyworded ~ppc-macos. Closes bug 93977.
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index 23cd7bb36f24..fc53147401fa 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -1,7 +1,9 @@
-MD5 02ca2d137729eeb251692761dd13382b ChangeLog 2341
-MD5 9238060ca0eb7f7ab03c4a4f6d2cc2bd jhead-2.0.ebuild 643
-MD5 fbd01d3715fb1113ad71df55a9f3fe1a jhead-2.1.ebuild 735
+MD5 a9c48545a57b8f77a4e6b98aecc9feb1 jhead-2.4.ebuild 724
+MD5 9c2d2ecb34a941d26fe6be9dd33475fb jhead-2.0.ebuild 643
 MD5 c475de02cd81f4ba7c0b1803dd399250 jhead-2.2.ebuild 750
+MD5 7d6b253a37fdf96b5fb590768fc786f6 ChangeLog 2697
+MD5 daf676490886bcebc03a96609cd21923 metadata.xml 227
+MD5 7b4626f3d33f81e78651e4e78cd6032c files/jhead-2.4-gcc4.diff 5559
 MD5 d2ee1c3e7a9ca19f96c0f78ee48cbc9a files/digest-jhead-2.0 60
-MD5 05bfa4603e3935f122b004caa9e805ad files/digest-jhead-2.1 60
 MD5 914162d5ed1fd8cf9f24104fff013410 files/digest-jhead-2.2 60
+MD5 89f78d6efa8594f34ceb1a4a20b61803 files/digest-jhead-2.4 60
diff --git a/media-gfx/jhead/files/digest-jhead-2.1 b/media-gfx/jhead/files/digest-jhead-2.1
deleted file mode 100644
index 3979fbbefa8d..000000000000
--- a/media-gfx/jhead/files/digest-jhead-2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 882081eb1f41cb3d3791f8dc87a27e0f jhead-2.1.tar.gz 43680
diff --git a/media-gfx/jhead/files/digest-jhead-2.4 b/media-gfx/jhead/files/digest-jhead-2.4
new file mode 100644
index 000000000000..899dfd24b99c
--- /dev/null
+++ b/media-gfx/jhead/files/digest-jhead-2.4
@@ -0,0 +1 @@
+MD5 410d01fd323ce8733480816de3621cc0 jhead-2.4.tar.gz 52289
diff --git a/media-gfx/jhead/files/jhead-2.4-gcc4.diff b/media-gfx/jhead/files/jhead-2.4-gcc4.diff
new file mode 100644
index 000000000000..ec8e18915424
--- /dev/null
+++ b/media-gfx/jhead/files/jhead-2.4-gcc4.diff
@@ -0,0 +1,138 @@
+diff --exclude='*~' -Naur jhead-2.4.orig/exif.c jhead-2.4/exif.c
+--- jhead-2.4.orig/exif.c	2005-09-10 15:38:49.000000000 -0300
++++ jhead-2.4/exif.c	2005-09-10 15:51:45.000000000 -0300
+@@ -395,7 +395,7 @@
+         unsigned char * ValuePtr;
+         int ByteCount;
+         char * DirEntry;
+-        DirEntry = DIR_ENTRY_ADDR(DirStart, de);
++        DirEntry = (char *)DIR_ENTRY_ADDR(DirStart, de);
+ 
+         Tag = Get16u(DirEntry);
+         Format = Get16u(DirEntry+2);
+@@ -421,7 +421,7 @@
+             ValuePtr = OffsetBase+OffsetVal;
+         }else{
+             // 4 bytes or less and value is in the dir entry itself
+-            ValuePtr = DirEntry+8;
++            ValuePtr = (uchar *)DirEntry+8;
+         }
+ 
+         if (LastExifRefd < ValuePtr+ByteCount){
+@@ -493,17 +493,17 @@
+         switch(Tag){
+ 
+             case TAG_MAKE:
+-                strncpy(ImageInfo.CameraMake, ValuePtr, 31);
++                strncpy(ImageInfo.CameraMake, (char *)ValuePtr, 31);
+                 break;
+ 
+             case TAG_MODEL:
+-                strncpy(ImageInfo.CameraModel, ValuePtr, 39);
++                strncpy(ImageInfo.CameraModel, (char *)ValuePtr, 39);
+                 break;
+ 
+ 
+             case TAG_DATETIME_ORIGINAL:
+                 // If we get a DATETIME_ORIGINAL, we use that one.
+-                strncpy(ImageInfo.DateTime, ValuePtr, 19);
++                strncpy(ImageInfo.DateTime, (char *)ValuePtr, 19);
+                 // Fallthru...
+ 
+             case TAG_DATETIME_DIGITIZED:
+@@ -511,14 +511,14 @@
+                 if (!isdigit(ImageInfo.DateTime[0])){
+                     // If we don't already have a DATETIME_ORIGINAL, use whatever
+                     // time fields we may have.
+-                    strncpy(ImageInfo.DateTime, ValuePtr, 19);
++                    strncpy(ImageInfo.DateTime, (char *)ValuePtr, 19);
+                 }
+ 
+                 if (ImageInfo.numDateTimeTags >= MAX_DATE_COPIES){
+                     ErrNonfatal("More than %d date fields!  This is nuts", MAX_DATE_COPIES, 0);
+                     break;
+                 }
+-                ImageInfo.DateTimePointers[ImageInfo.numDateTimeTags++] = ValuePtr;
++                ImageInfo.DateTimePointers[ImageInfo.numDateTimeTags++] = (char *)ValuePtr;
+                 break;
+ 
+ 
+@@ -540,13 +540,13 @@
+                         int c;
+                         c = (ValuePtr)[a];
+                         if (c != '\0' && c != ' '){
+-                            strncpy(ImageInfo.Comments, a+ValuePtr, 199);
++                            strncpy(ImageInfo.Comments, (char *)(a+ValuePtr), 199);
+                             break;
+                         }
+                     }
+                     
+                 }else{
+-                    strncpy(ImageInfo.Comments, ValuePtr, 199);
++                    strncpy(ImageInfo.Comments, (char *)ValuePtr, 199);
+                 }
+                 break;
+ 
+@@ -927,7 +927,7 @@
+         for (de=0;de<NumDirEntries;de++){
+             int Tag;
+             char * DirEntry;
+-            DirEntry = DIR_ENTRY_ADDR(DirWithThumbnailPtrs, de);
++            DirEntry = (char *)DIR_ENTRY_ADDR(DirWithThumbnailPtrs, de);
+             Tag = Get16u(DirEntry);
+             if (Tag == TAG_THUMBNAIL_OFFSET || Tag == TAG_THUMBNAIL_LENGTH){
+                 // We remove data out of the exif directory by doing a memmove on the rest
+diff --exclude='*~' -Naur jhead-2.4.orig/gpsinfo.c jhead-2.4/gpsinfo.c
+--- jhead-2.4.orig/gpsinfo.c	2005-09-10 15:38:49.000000000 -0300
++++ jhead-2.4/gpsinfo.c	2005-09-10 15:48:24.000000000 -0300
+@@ -84,7 +84,7 @@
+         int ComponentSize;
+         unsigned ByteCount;
+         char * DirEntry;
+-        DirEntry = DIR_ENTRY_ADDR(DirStart, de);
++        DirEntry = (char *)DIR_ENTRY_ADDR(DirStart, de);
+ 
+         Tag = Get16u(DirEntry);
+         Format = Get16u(DirEntry+2);
+@@ -111,7 +111,7 @@
+             ValuePtr = OffsetBase+OffsetVal;
+         }else{
+             // 4 bytes or less and value is in the dir entry itself
+-            ValuePtr = DirEntry+8;
++            ValuePtr = (uchar *)DirEntry+8;
+         }
+ 
+         switch(Tag){
+diff --exclude='*~' -Naur jhead-2.4.orig/jpgfile.c jhead-2.4/jpgfile.c
+--- jhead-2.4.orig/jpgfile.c	2005-09-10 15:38:49.000000000 -0300
++++ jhead-2.4/jpgfile.c	2005-09-10 15:41:41.000000000 -0300
+@@ -245,7 +245,7 @@
+                 // that uses marker 31 for non exif stuff.  Thus make sure 
+                 // it says 'Exif' in the section before treating it as exif.
+                 if ((ReadMode & READ_EXIF) && memcmp(Data+2, "Exif", 4) == 0){
+-                    process_EXIF((char *)Data, itemlen);
++                    process_EXIF(Data, itemlen);
+                 }else{
+                     // Discard this section.
+                     free(Sections[--SectionsRead].Data);
+diff --exclude='*~' -Naur jhead-2.4.orig/makernote.c jhead-2.4/makernote.c
+--- jhead-2.4.orig/makernote.c	2005-09-10 15:38:49.000000000 -0300
++++ jhead-2.4/makernote.c	2005-09-10 15:49:28.000000000 -0300
+@@ -48,7 +48,7 @@
+         unsigned char * ValuePtr;
+         int ByteCount;
+         char * DirEntry;
+-        DirEntry = DIR_ENTRY_ADDR(DirStart, de);
++        DirEntry = (char *)DIR_ENTRY_ADDR(DirStart, de);
+ 
+         Tag = Get16u(DirEntry);
+         Format = Get16u(DirEntry+2);
+@@ -74,7 +74,7 @@
+             ValuePtr = OffsetBase+OffsetVal;
+         }else{
+             // 4 bytes or less and value is in the dir entry itself
+-            ValuePtr = DirEntry+8;
++            ValuePtr = (uchar *)DirEntry+8;
+         }
+ 
+         if (ShowTags){
diff --git a/media-gfx/jhead/jhead-2.0.ebuild b/media-gfx/jhead/jhead-2.0.ebuild
index 3f3164a9cda9..9e64a9e7f0e7 100644
--- a/media-gfx/jhead/jhead-2.0.ebuild
+++ b/media-gfx/jhead/jhead-2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/jhead-2.0.ebuild,v 1.13 2004/11/10 06:11:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/jhead-2.0.ebuild,v 1.14 2005/09/10 19:04:25 vanquirius Exp $
 
 DESCRIPTION="Exif Jpeg camera setting parser and thumbnail remover"
 HOMEPAGE="http://www.sentex.net/~mwandel/jhead/"
diff --git a/media-gfx/jhead/jhead-2.1.ebuild b/media-gfx/jhead/jhead-2.1.ebuild
deleted file mode 100644
index 42bd985cb4f4..000000000000
--- a/media-gfx/jhead/jhead-2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/jhead-2.1.ebuild,v 1.5 2004/07/14 17:45:40 agriffis Exp $
-
-DESCRIPTION="Exif Jpeg camera setting parser and thumbnail remover"
-HOMEPAGE="http://www.sentex.net/~mwandel/jhead/"
-SRC_URI="http://www.sentex.net/~mwandel/jhead/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~ia64 ~hppa"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	sed -i "s:-O3 -Wall:${CFLAGS}:" makefile
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dobin jhead || die
-	dodoc readme.txt changes.txt
-	dohtml usage.html
-	doman jhead.1.gz
-}
diff --git a/media-gfx/jhead/jhead-2.4.ebuild b/media-gfx/jhead/jhead-2.4.ebuild
new file mode 100644
index 000000000000..9dca654feb85
--- /dev/null
+++ b/media-gfx/jhead/jhead-2.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/jhead-2.4.ebuild,v 1.1 2005/09/10 19:04:25 vanquirius Exp $
+
+inherit eutils
+
+DESCRIPTION="Exif Jpeg camera setting parser and thumbnail remover"
+HOMEPAGE="http://www.sentex.net/~mwandel/jhead/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/libc"
+RDEPEND="virtual/libc
+	media-libs/jpeg"
+
+src_unpack() {
+	unpack ${A}; cd ${S}
+	epatch ${FILESDIR}/${P}-gcc4.diff
+	sed -i "s:-O3 -Wall:${CFLAGS}:" makefile || die
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	dobin jhead || die
+	dodoc {readme,changes}.txt
+	dohtml usage.html
+	doman jhead.1.gz
+}
diff --git a/media-gfx/jhead/metadata.xml b/media-gfx/jhead/metadata.xml
new file mode 100644
index 000000000000..029210fc70b7
--- /dev/null
+++ b/media-gfx/jhead/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>graphics</herd>
+<maintainer>
+  <email>vanquirius@gentoo.org</email>
+</maintainer>
+</pkgmetadata>