Ebuild cleanup. Version bump

7 files changed, 25 insertions, 43 deletions

diff --git a/media-gfx/jhead/ChangeLog b/media-gfx/jhead/ChangeLog
index 17bf754925af..c95dc547358f 100644
--- a/media-gfx/jhead/ChangeLog
+++ b/media-gfx/jhead/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/jhead
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/ChangeLog,v 1.17 2004/07/01 10:49:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/ChangeLog,v 1.18 2004/09/23 17:03:42 sekretarz Exp $
+
+*jhead-2.2 (23 Sep 2004)
+
+  23 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org> -jhead-1.6.ebuild,
+  -jhead-1.9.ebuild, +jhead-2.2.ebuild:
+  Ebuild cleanup. Version bump
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> jhead-1.6.ebuild,
   jhead-1.9.ebuild, jhead-2.0.ebuild, jhead-2.1.ebuild:
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index ee6ac4a5e7ea..8ff54780f2b6 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -2,8 +2,10 @@ MD5 70f854a7443f55e55fa5ebe5eaaaedfe jhead-1.6.ebuild 629
 MD5 fbd01d3715fb1113ad71df55a9f3fe1a jhead-2.1.ebuild 735
 MD5 41d83df6902a0f579f5c2814a52ef468 jhead-2.0.ebuild 646
 MD5 cde36d6afab265d5dca48a1c51496998 jhead-1.9.ebuild 596
+MD5 fbd01d3715fb1113ad71df55a9f3fe1a jhead-2.2.ebuild 735
 MD5 5844bbd13824c8138f63513a60b6d57c ChangeLog 1794
 MD5 53c498eb15e277939736724aafb212b4 files/digest-jhead-1.6 119
 MD5 50904b71e701083233ee536befdada4e files/digest-jhead-1.9 60
 MD5 d2ee1c3e7a9ca19f96c0f78ee48cbc9a files/digest-jhead-2.0 60
 MD5 05bfa4603e3935f122b004caa9e805ad files/digest-jhead-2.1 60
+MD5 914162d5ed1fd8cf9f24104fff013410 files/digest-jhead-2.2 60
diff --git a/media-gfx/jhead/files/digest-jhead-1.6 b/media-gfx/jhead/files/digest-jhead-1.6
deleted file mode 100644
index 4d5d2884b93e..000000000000
--- a/media-gfx/jhead/files/digest-jhead-1.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9228ba808f6c1d0512a40db3fa11811e /jhead-1.6.ebuild 620
-MD5 987f19803edc669b3b095d6fa0323f73 jhead-1.6.tar.gz 32951
diff --git a/media-gfx/jhead/files/digest-jhead-1.9 b/media-gfx/jhead/files/digest-jhead-1.9
deleted file mode 100644
index b53631935dea..000000000000
--- a/media-gfx/jhead/files/digest-jhead-1.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d07137edfae49c62ed384b6c1075d802 jhead-1.9.tar.gz 36480
diff --git a/media-gfx/jhead/files/digest-jhead-2.2 b/media-gfx/jhead/files/digest-jhead-2.2
new file mode 100644
index 000000000000..d4ec66f40b90
--- /dev/null
+++ b/media-gfx/jhead/files/digest-jhead-2.2
@@ -0,0 +1 @@
+MD5 ba88cad2deaa40d7c1caadc518bcb7e7 jhead-2.2.tar.gz 47203
diff --git a/media-gfx/jhead/jhead-1.6.ebuild b/media-gfx/jhead/jhead-1.6.ebuild
deleted file mode 100644
index 095cfce2b721..000000000000
--- a/media-gfx/jhead/jhead-1.6.ebuild
+++ /dev/null
@@ -1,28 +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-1.6.ebuild,v 1.11 2004/07/14 17:45:40 agriffis Exp $
-
-S=${WORKDIR}/${PN}1.6
-DESCRIPTION="a program for making thumbnails for websites."
-SRC_URI="http://www.sentex.net/~mwandel/jhead/${P}.tar.gz"
-HOMEPAGE="http://www.sentex.net/~mwandel/jhead/"
-
-SLOT="0"
-LICENSE="BSD | GPL-2"
-KEYWORDS="x86 ~ppc ~sparc hppa"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_compile() {
-
-	cd ${S}
-	emake || die
-}
-
-src_install () {
-
-	dobin jhead
-	dodoc readme.txt changes.txt
-	dohtml usage.html
-}
diff --git a/media-gfx/jhead/jhead-1.9.ebuild b/media-gfx/jhead/jhead-2.2.ebuild
index 9131c475c63c..d67c7cd143f8 100644
--- a/media-gfx/jhead/jhead-1.9.ebuild
+++ b/media-gfx/jhead/jhead-2.2.ebuild
@@ -1,27 +1,31 @@
 # 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-1.9.ebuild,v 1.7 2004/07/14 17:45:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/jhead-2.2.ebuild,v 1.1 2004/09/23 17:03:42 sekretarz Exp $
 
-IUSE=""
-DESCRIPTION="a program for making thumbnails for websites."
-SRC_URI="http://www.sentex.net/~mwandel/jhead/${P}.tar.gz"
+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"
 
-SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="x86 ~ppc"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~ia64 ~hppa"
+IUSE=""
 
 DEPEND="virtual/libc"
 
-src_compile() {
+src_unpack() {
+	unpack ${A} ; cd ${S}
 
-	cd ${S}
-	emake || die
+	sed -i "s:-O3 -Wall:${CFLAGS}:" makefile
 }
 
-src_install () {
+src_compile() {
+	emake || die
+}
 
-	dobin jhead
+src_install() {
+	dobin jhead || die
 	dodoc readme.txt changes.txt
 	dohtml usage.html
+	doman jhead.1.gz
 }