Marked 2.8 stable for amd64 wrt #216570. Modified 2.82 so it doesn't dep. on media-libs/jpeg because it doesn't use it as per NEEDED entries, makefile and headers. Use toolchain-funcs correctly and stop inheriting unused eutils.

Package-Manager: portage-2.1.4.4

4 files changed, 32 insertions, 28 deletions

diff --git a/media-gfx/jhead/ChangeLog b/media-gfx/jhead/ChangeLog
index 1ac54efd4d8e..2d1fe4e08e68 100644
--- a/media-gfx/jhead/ChangeLog
+++ b/media-gfx/jhead/ChangeLog
@@ -1,6 +1,13 @@
 # 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.67 2008/04/07 14:27:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/ChangeLog,v 1.68 2008/04/07 14:40:59 drac Exp $
+
+  07 Apr 2008; Samuli Suominen <drac@gentoo.org> jhead-2.8.ebuild,
+  jhead-2.82.ebuild:
+  Marked 2.8 stable for amd64 wrt #216570. Modified 2.82 so it doesn't dep. on
+  media-libs/jpeg because it doesn't use it as per NEEDED entries, makefile
+  and headers. Use toolchain-funcs correctly and stop inheriting unused
+  eutils.
 
   07 Apr 2008; Jeroen Roovers <jer@gentoo.org> jhead-2.8.ebuild:
   Stable for HPPA (bug #216570).
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index d94fca22ea70..37029f0352ee 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -2,7 +2,7 @@ DIST jhead-2.7.tar.gz 58957 RMD160 fa7ba376e9443dd1d8d3bddce0ed2c67af31f36a SHA1
 DIST jhead-2.8.tar.gz 61685 RMD160 ccbc84df3f4470986270d7b2ab3e32bb03edfa07 SHA1 01eae6ffe4eed325fd561ddb8cfa46ff4a3d1afa SHA256 9270fa4025779b43dd27f4a78021207a195bb312ee0b69d53e00c00df93485a2
 DIST jhead-2.82.tar.gz 62383 RMD160 76560c4dc786b2ef55109b58fcfd8e44da64a2d4 SHA1 816c2216b04cbb84cd0939427b111377d9da045a SHA256 9c1ed61a40682ec92f33694a77d4e929062a30e9f8a3c505b4ac03f9de950fee
 EBUILD jhead-2.7.ebuild 848 RMD160 34cc0fe72a2103518d4ed2492f6e4643cd9f1b7f SHA1 3f00f370a21f8a7995188a36f9d718f4ae0265b1 SHA256 0e7e95896fa60bfd619cc1f0688b3259a01ad869c9f1b15216e51e838a5b353b
-EBUILD jhead-2.8.ebuild 832 RMD160 99b4aa92dccf0392e8399b74437c5d6386c38506 SHA1 6a96b62e5d3ce5fc5e737761f2be17d1b9de42ff SHA256 a4c53223be2da397c4a345329419cc11b83ea8865d646421da833a20c9cf2358
-EBUILD jhead-2.82.ebuild 838 RMD160 133548dea83ca6285edf646e681621a8ee8d2551 SHA1 518c4f2bcae823f3043bc7d9e937f81b9dc0c9e7 SHA256 55ef04dc10ce69255adf7493a68f253c9fab0597e0b3f10661973c4fc26c23a6
-MISC ChangeLog 7429 RMD160 f4ad7ffbc8073fdc625e22e23990acafd2199974 SHA1 44290585d55f0c64aa8b75deeff202c8650eac29 SHA256 eb98a0cb81745afaaa1e77bb6859a0aeaa51883bf3e623568d5983fd38b2c385
+EBUILD jhead-2.8.ebuild 855 RMD160 3981189e911984d2e1436b96df8ee6efeab292bd SHA1 cff7126be1b103e7e5733fe69d10231d30b6805c SHA256 a08d32d14966171e0e5c5f9405abd02f1fcc32d75c158351e21db7745b11c8cd
+EBUILD jhead-2.82.ebuild 785 RMD160 5f5513d1b6b42a70fef5e581f899f9ec6d24ff61 SHA1 d5dbea4b83922cbf9dd62696612461b5dc12284e SHA256 1122aa8072339c3f30871dd33dc5bd0a3aa3eb49493dffbb295ff2ceafa924cd
+MISC ChangeLog 7756 RMD160 83a3e3443938682c65b943f4da80530c7dace3c6 SHA1 f8d009943c9c0e65e2328e09396335cb4a38711a SHA256 ea6ae89d8c563574e4951d113fb9112f64c9b174cb1338b06965ef678eed74fa
 MISC metadata.xml 227 RMD160 e1ab24e5aae2199305750580205194b20071be60 SHA1 95d0602c6bd3ca036ca5c87a48130a7c6bda9dcb SHA256 98c6fc5ae01a9eb624c22cd78347eeb8cf84db19737690c37f232b0b7000930c
diff --git a/media-gfx/jhead/jhead-2.8.ebuild b/media-gfx/jhead/jhead-2.8.ebuild
index a094d6eecba2..394057708d29 100644
--- a/media-gfx/jhead/jhead-2.8.ebuild
+++ b/media-gfx/jhead/jhead-2.8.ebuild
@@ -1,33 +1,33 @@
 # 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.8.ebuild,v 1.3 2008/04/07 14:27:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/jhead-2.8.ebuild,v 1.4 2008/04/07 14:40:59 drac 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"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
-DEPEND="virtual/libc"
-RDEPEND="virtual/libc
-	media-libs/jpeg"
+RDEPEND="media-libs/jpeg"
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
-	sed -i "s:-O3 -Wall:${CFLAGS}:" "${S}"/makefile || die
+	sed -i -e "s:-O3 -Wall:${CFLAGS}:" "${S}"/makefile || die "sed failed."
 }
 
 src_compile() {
-	export CC="$(tc-getCC)"
-	emake || die
+	tc-export CC
+	emake || die "emake failed."
 }
 
 src_install() {
-	dobin jhead || die
+	dobin jhead || die "dobin failed."
 	dodoc {readme,changes}.txt
 	dohtml usage.html
 	doman jhead.1.gz
diff --git a/media-gfx/jhead/jhead-2.82.ebuild b/media-gfx/jhead/jhead-2.82.ebuild
index f7cd98fcaed2..88ae29c74f28 100644
--- a/media-gfx/jhead/jhead-2.82.ebuild
+++ b/media-gfx/jhead/jhead-2.82.ebuild
@@ -1,34 +1,31 @@
 # 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.82.ebuild,v 1.1 2008/04/06 15:59:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/jhead-2.82.ebuild,v 1.2 2008/04/07 14:40:59 drac Exp $
 
-inherit eutils toolchain-funcs
+inherit 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"
+HOMEPAGE="http://www.sentex.net/~mwandel/jhead"
+SRC_URI="http://www.sentex.net/~mwandel/${PN}/${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}
-	sed -i "s:-O3 -Wall:${CFLAGS}:" "${S}"/makefile || die
+	sed -i -e "s:-O3 -Wall:${CFLAGS}:" "${S}"/makefile || die "sed failed."
 }
 
 src_compile() {
-	export CC="$(tc-getCC)"
-	emake || die
+	tc-export CC
+	emake || die "emake failed."
 }
 
 src_install() {
-	dobin jhead || die
-	dodoc {readme,changes}.txt
-	dohtml usage.html
-	doman jhead.1.gz
+	dobin ${PN} || die "dobin failed."
+	dodoc *.txt
+	dohtml *.html
+	doman ${PN}.1.gz
 }