Fixed gtk+ dep and some cleanup

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 33 insertions, 22 deletions

diff --git a/net-misc/jigdo/ChangeLog b/net-misc/jigdo/ChangeLog
index 2024e6c86585..0da668ba3dfc 100644
--- a/net-misc/jigdo/ChangeLog
+++ b/net-misc/jigdo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/jigdo
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/jigdo/ChangeLog,v 1.22 2009/09/04 15:49:34 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/jigdo/ChangeLog,v 1.23 2011/03/28 17:05:49 angelos Exp $
+
+  28 Mar 2011; Christoph Mende <angelos@gentoo.org> jigdo-0.7.3.ebuild,
+  jigdo-0.7.3-r1.ebuild:
+  Fixed gtk+ dep and some cleanup
 
 *jigdo-0.7.3-r1 (04 Sep 2009)
 
diff --git a/net-misc/jigdo/Manifest b/net-misc/jigdo/Manifest
index 8194da789ca3..6e0efcffba92 100644
--- a/net-misc/jigdo/Manifest
+++ b/net-misc/jigdo/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX jigdo-0.7.3-gcc43.patch 2650 RMD160 21683a2f2bdbfe007a6dd045b85e60334e93b2b7 SHA1 f1269455ba3300ec1738ee5ece9ff5e067eb6daf SHA256 57e13ca6c283cb086d1c5ceb5ed3562fab548fa19e1d14ecc045c3a23fa7d44a
 AUX jigdo-0.7.3-strip.patch 750 RMD160 6642c96dac0e30b9c3520b8a6a82c0ca2118224e SHA1 05723723763839f4bd5a946d67afd8816e9d151a SHA256 2790cb9cb9010ecdcbfe72048ea316be300619b4942a7612074a9868d9217c8c
 DIST jigdo-0.7.3.tar.bz2 644670 RMD160 545b4abbcb0a02636072e5acadeba7d99f59365f SHA1 7b83c35af71f908b31b9aa55b0dda9dfb4d224f0 SHA256 875c069abad67ce67d032a9479228acdb37c8162236c0e768369505f264827f0
-EBUILD jigdo-0.7.3-r1.ebuild 1138 RMD160 69b3c3cf4ab81f78a762e43adf7250249e050a7d SHA1 c62a309452d097f08936c538dd461e1ccb7b1241 SHA256 ace6f8064b177ccda2e0fb83473fc048c70c5d0c9f50ade41b5bdd45ea012242
-EBUILD jigdo-0.7.3.ebuild 1134 RMD160 0e3e46d43f7eea233bd34a26573bb8f0b56c213c SHA1 93f7d6248f809bd761e5b1be4ca2791bf378cc38 SHA256 6e95475af953fbd689148f2d08bbd8a2e8d80c68463d9894964191ddc0895be6
-MISC ChangeLog 3081 RMD160 cbb7bd1cf0d5098f189cd6c588ca0e8eca7496f3 SHA1 e2c0ed994ffb2b07a6e5449aa1998717662a77fc SHA256 c751a294a44f03bab8922bce2b02bf107e3e17f086ff4b3eb79ef9643736091e
+EBUILD jigdo-0.7.3-r1.ebuild 1133 RMD160 7db2bdcd6870677bc81b663cf127920eadf84977 SHA1 26a90f1cb6213fc181be60a8e849b1805cb1b9d8 SHA256 d4d01c1d2400454973b9db45275b71e0c193a40e5cb5e4f537429d13d23cccb7
+EBUILD jigdo-0.7.3.ebuild 1091 RMD160 355dc9049daf4af8e966316013d19f3139bac93e SHA1 b48238ce2c2da41d1372b9a01f9f2e6905cfa48f SHA256 94d8cf0ce4863c9cd7fe869247e655a24566c93cee15726cb2068fe1514224e8
+MISC ChangeLog 3217 RMD160 13396e9139e2f57cebbc92d7a74bdaae2986932a SHA1 147147595509dd5b1fb9d12e293f873131fa222b SHA256 bea2ba310aef871e20db78c3733698e64e5fef2478d9cf27a93710c22442f8a0
 MISC metadata.xml 643 RMD160 cfafe73c9affe9d45f6099edd0627ec2dbb74516 SHA1 9d4698043797510ff64452f11c4841a11f2b0b0c SHA256 87a52f72c9bb40669eaca322dfb8bd1112eb1477886fd57538a1a549a2c0b860
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk2Qsb8ACgkQmWq1bYTyC0MekgEAw9ZVSLL2FbVFD9rGA9YlbzRt
+TMoIZQLfzQitOcNFisEA/0C71xJMtlKSY2kaA0/Cts5C4xyW3yjLSaFQAUOVoYha
+=Z+8e
+-----END PGP SIGNATURE-----
diff --git a/net-misc/jigdo/jigdo-0.7.3-r1.ebuild b/net-misc/jigdo/jigdo-0.7.3-r1.ebuild
index f5c2f0ecef70..6807c3770866 100644
--- a/net-misc/jigdo/jigdo-0.7.3-r1.ebuild
+++ b/net-misc/jigdo/jigdo-0.7.3-r1.ebuild
@@ -1,29 +1,28 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/jigdo/jigdo-0.7.3-r1.ebuild,v 1.1 2009/09/04 15:49:34 jer Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/net-misc/jigdo/jigdo-0.7.3-r1.ebuild,v 1.2 2011/03/28 17:05:49 angelos Exp $
 
+EAPI=3
 inherit eutils
 
 DESCRIPTION="Jigsaw Download is a tool designed to ease the distribution of large files, for example DVD images."
 HOMEPAGE="http://atterer.net/jigdo/"
-SRC_URI="http://atterer.net/jigdo/${P}.tar.bz2"
+SRC_URI="http://atterer.net/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="gtk nls berkdb libwww"
 
-RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
+RDEPEND="gtk? ( x11-libs/gtk+:2 )
 	berkdb? ( >=sys-libs/db-3.2 )
 	libwww? ( >=net-libs/libwww-5.3.2 )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	epatch "${FILESDIR}"/${P}-strip.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-strip.patch
 }
 
 src_configure() {
diff --git a/net-misc/jigdo/jigdo-0.7.3.ebuild b/net-misc/jigdo/jigdo-0.7.3.ebuild
index 3bb31d5e595e..d847971b7c94 100644
--- a/net-misc/jigdo/jigdo-0.7.3.ebuild
+++ b/net-misc/jigdo/jigdo-0.7.3.ebuild
@@ -1,38 +1,36 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/jigdo/jigdo-0.7.3.ebuild,v 1.8 2008/04/29 19:15:09 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/jigdo/jigdo-0.7.3.ebuild,v 1.9 2011/03/28 17:05:49 angelos Exp $
 
+EAPI=3
 inherit eutils
 
 DESCRIPTION="Jigsaw Download is a tool designed to ease the distribution of large files, for example DVD images."
 HOMEPAGE="http://atterer.net/jigdo/"
-SRC_URI="http://atterer.net/jigdo/${P}.tar.bz2"
+SRC_URI="http://atterer.net/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE="gtk nls berkdb libwww"
 
-RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
+RDEPEND="gtk? ( x11-libs/gtk+:2 )
 	berkdb? ( >=sys-libs/db-3.2 )
 	libwww? ( >=net-libs/libwww-5.3.2 )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-gcc43.patch
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 
 	use gtk && use libwww || myconf="${myconf} --without-gui"
 	use berkdb || myconf="${myconf} --without-libdb"
 
 	econf $(use_enable nls) ${myconf}
-	emake || die "emake failed."
 }
 
 src_install() {