old

Package-Manager: portage-2.1.4

7 files changed, 17 insertions, 288 deletions

diff --git a/media-gfx/jhead/ChangeLog b/media-gfx/jhead/ChangeLog
index 07388b5d758a..93f8f206c867 100644
--- a/media-gfx/jhead/ChangeLog
+++ b/media-gfx/jhead/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/jhead
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/ChangeLog,v 1.62 2008/01/27 16:03:45 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/ChangeLog,v 1.63 2008/02/02 10:14:26 maekke Exp $
+
+  02 Feb 2008; Markus Meier <maekke@gentoo.org> -files/jhead-2.4-gcc4.diff,
+  -files/jhead-2.5-gcc4.diff, -jhead-2.4.ebuild, -jhead-2.5.ebuild,
+  -jhead-2.6.ebuild:
+  old
 
   27 Jan 2008; Christoph Mende <angelos@gentoo.org> jhead-2.7.ebuild:
   Stable on amd64, bug #206182
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index 5f60a3e37ce3..701da4c8d85a 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -1,12 +1,14 @@
-AUX jhead-2.4-gcc4.diff 5559 RMD160 7c31aac50ad585b2e643ca6a8ef69221e7f42a42 SHA1 d2f373748ceb859a1c8de9de3e264fdca0d13d75 SHA256 2afa384798e7d10bb2e258eda27a8e97a11caec4f4730c04ce4b5bc6170c5370
-AUX jhead-2.5-gcc4.diff 1492 RMD160 0ab05ab15db552d1324e19b0c81624c284c36281 SHA1 bdc8c49535bbaec389cab4dc1d3457c13f938178 SHA256 e47004c4ce179b098585f13e0f3bb510427e353e5539d6077828e64dd0af68c5
-DIST jhead-2.4.tar.gz 52289 RMD160 b39bf02d2a1e8808798f98e8cdd28a53572b9b5c SHA1 8e484aa7a0a1f6216e28ae81c86f186ef5a13ba1 SHA256 9cf9426aa13cc6a4dd1cbaca532c063f17389f33fd837af8bb1510fbf04d3810
-DIST jhead-2.5.tar.gz 55793 RMD160 f7d43a6ceac1e17cd6cfe86da2926878e214ca14 SHA1 90ca1ac63ed7cc625ffd593295b96c2b882d668e SHA256 b732a78dd7b5d424d25ece7d596ce083ac1fa230a3a277ef318ec78a1a22fb65
-DIST jhead-2.6.tar.gz 56574 RMD160 99fd992212063311a3cae4a05d6eeac7b7946fbc SHA1 88fb03f34ebd97bdc8d1d91e3633efa0c8a4ed98 SHA256 55a65214c19f9a61265fdef21ae4d7f59b725248d06c0595152c14774bd31065
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST jhead-2.7.tar.gz 58957 RMD160 fa7ba376e9443dd1d8d3bddce0ed2c67af31f36a SHA1 978a70e8abcf275b39c8ccb27893962b5c4dff4a SHA256 899f8957514669492e98e192994f4300c4503617c6a00a257d5dffe7864e79e4
-EBUILD jhead-2.4.ebuild 871 RMD160 841ccdc2a2f4650262e1cb17af9c5e6fa139b9f1 SHA1 8996bd1d16cd2fce86dd6d9e611ff8266a47df60 SHA256 78a74069b9fe30d55e151cdb2b1227b0919fc5b0be8bfad2588096eeba9fca8e
-EBUILD jhead-2.5.ebuild 891 RMD160 3dda7e5bb4947b594128a111a77f146eb7bbbf53 SHA1 f39bbce3d489bd50f01e4a69eab566b000f918ae SHA256 d7fb65ebe07a6ebaa9a78bd4d0b6fe9d20df9c2523913767bd7ae8abe7e18e4e
-EBUILD jhead-2.6.ebuild 851 RMD160 03365462405ab05fbc9c022d58f43b2ce96289eb SHA1 38021c9b0ff847215bdb555785b607fd804fb30b SHA256 c6a93adf8c93cd5e41e7a9acc11b4edf94993286821438556f81166344cc7091
 EBUILD jhead-2.7.ebuild 848 RMD160 34cc0fe72a2103518d4ed2492f6e4643cd9f1b7f SHA1 3f00f370a21f8a7995188a36f9d718f4ae0265b1 SHA256 0e7e95896fa60bfd619cc1f0688b3259a01ad869c9f1b15216e51e838a5b353b
-MISC ChangeLog 6793 RMD160 7b7c6770b1549da9dd0490c466049ef0912a4cdd SHA1 7587a34a39d915ef9838ecd295d1d9af4ae0a100 SHA256 ab491befe0b4a519b53ea5e01480042803313d9dc54302fd834c30a397dbff13
+MISC ChangeLog 6964 RMD160 e12ea85801636ae3ba0a5de1297e91b9bea8a213 SHA1 a7b1bcd26bfa4b34b2754152ab7ade3feb0c4ddc SHA256 e0bbc629f76e02dcc1e24b45695ee622c38c24739d0b3113bd072fc715aa65b3
 MISC metadata.xml 227 RMD160 e1ab24e5aae2199305750580205194b20071be60 SHA1 95d0602c6bd3ca036ca5c87a48130a7c6bda9dcb SHA256 98c6fc5ae01a9eb624c22cd78347eeb8cf84db19737690c37f232b0b7000930c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHpELLkKaRLQcq0GIRAokWAKCXrpbJjFAV22wrBvEdFXr1AJv6bACgqY/Q
+kSBtcoLLTOjfMAtpTkIux0Q=
+=6+d/
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/jhead/files/jhead-2.4-gcc4.diff b/media-gfx/jhead/files/jhead-2.4-gcc4.diff
deleted file mode 100644
index ec8e18915424..000000000000
--- a/media-gfx/jhead/files/jhead-2.4-gcc4.diff
+++ /dev/null
@@ -1,138 +0,0 @@
-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/files/jhead-2.5-gcc4.diff b/media-gfx/jhead/files/jhead-2.5-gcc4.diff
deleted file mode 100644
index 1ee3aec3b797..000000000000
--- a/media-gfx/jhead/files/jhead-2.5-gcc4.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur jhead-2.5.orig/exif.c jhead-2.5/exif.c
---- jhead-2.5.orig/exif.c	2006-01-11 22:55:20.000000000 +0100
-+++ jhead-2.5/exif.c	2006-01-11 22:59:36.000000000 +0100
-@@ -329,7 +329,7 @@
-         ByteCount -= s;
-         if (ByteCount <= 0) break;
-         printf(", ");
--        ((char *)ValuePtr) += s;
-+        ValuePtr = (char *)ValuePtr + s;
-     }
-     if (n >= 16) printf("...");
- }
-diff -Naur jhead-2.5.orig/jhead.c jhead-2.5/jhead.c
---- jhead-2.5.orig/jhead.c	2006-01-11 22:55:20.000000000 +0100
-+++ jhead-2.5/jhead.c	2006-01-11 22:58:51.000000000 +0100
-@@ -932,7 +932,7 @@
- 
-             for (a = 0; a < ImageInfo.numDateTimeTags; a++) {
-                 char * Pointer;
--                Pointer = ExifSection->Data+ImageInfo.DateTimeOffsets[a]+8;
-+                Pointer = (char *)ExifSection->Data+ImageInfo.DateTimeOffsets[a]+8;
-                 memcpy(Pointer, TempBuf, 19);
-             }
- 
-diff -Naur jhead-2.5.orig/jpgfile.c jhead-2.5/jpgfile.c
---- jhead-2.5.orig/jpgfile.c	2006-01-11 22:55:20.000000000 +0100
-+++ jhead-2.5/jpgfile.c	2006-01-11 22:58:07.000000000 +0100
-@@ -346,7 +346,7 @@
-         char * ThumbnailPointer;
-         Section_t * ExifSection;
-         ExifSection = FindSection(M_EXIF);
--        ThumbnailPointer = ExifSection->Data+ImageInfo.ThumbnailOffset+8;
-+        ThumbnailPointer = (char *)ExifSection->Data+ImageInfo.ThumbnailOffset+8;
- 
-         fwrite(ThumbnailPointer, ImageInfo.ThumbnailSize ,1, ThumbnailFile);
-         fclose(ThumbnailFile);
diff --git a/media-gfx/jhead/jhead-2.4.ebuild b/media-gfx/jhead/jhead-2.4.ebuild
deleted file mode 100644
index fb8739476537..000000000000
--- a/media-gfx/jhead/jhead-2.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2008 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.11 2008/01/15 18:15:51 grobian Exp $
-
-inherit eutils toolchain-funcs
-
-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="alpha amd64 hppa ~ia64 ppc 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() {
-	export CC="$(tc-getCC)"
-	emake || die
-}
-
-src_install() {
-	dobin jhead || die
-	dodoc {readme,changes}.txt
-	dohtml usage.html
-	doman jhead.1.gz
-}
diff --git a/media-gfx/jhead/jhead-2.5.ebuild b/media-gfx/jhead/jhead-2.5.ebuild
deleted file mode 100644
index bf0b426bc44e..000000000000
--- a/media-gfx/jhead/jhead-2.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/jhead-2.5.ebuild,v 1.11 2008/01/15 18:15:51 grobian Exp $
-
-inherit eutils toolchain-funcs
-
-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="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc"
-RDEPEND="virtual/libc
-	media-libs/jpeg"
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.5-gcc4.diff
-	sed -i "s:-O3 -Wall:${CFLAGS}:" makefile || die "sed failed"
-}
-
-src_compile() {
-	export CC="$(tc-getCC)"
-	emake || die
-}
-
-src_install() {
-	dobin jhead || die
-	dodoc {readme,changes}.txt
-	dohtml usage.html
-	doman jhead.1.gz
-}
diff --git a/media-gfx/jhead/jhead-2.6.ebuild b/media-gfx/jhead/jhead-2.6.ebuild
deleted file mode 100644
index 645fb41d76ba..000000000000
--- a/media-gfx/jhead/jhead-2.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/jhead-2.6.ebuild,v 1.6 2008/01/15 18:15:51 grobian Exp $
-
-inherit eutils toolchain-funcs
-
-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="~alpha ~amd64 hppa ~ia64 ppc ~ppc64 sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc"
-RDEPEND="virtual/libc
-	media-libs/jpeg"
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-	sed -i "s:-O3 -Wall:${CFLAGS}:" makefile || die "sed failed"
-}
-
-src_compile() {
-	export CC="$(tc-getCC)"
-	emake || die
-}
-
-src_install() {
-	dobin jhead || die
-	dodoc {readme,changes}.txt
-	dohtml usage.html
-	doman jhead.1.gz
-}