prune gtkhtml-3.0 from depends and fix style

Package-Manager: portage-2.1.3.11

3 files changed, 33 insertions, 22 deletions

diff --git a/net-misc/logjam/ChangeLog b/net-misc/logjam/ChangeLog
index 2b330e77a87b..4e38dfd1902d 100644
--- a/net-misc/logjam/ChangeLog
+++ b/net-misc/logjam/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/logjam
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/logjam/ChangeLog,v 1.36 2007/06/17 09:13:44 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/logjam/ChangeLog,v 1.37 2007/10/07 22:22:24 eva Exp $
+
+  07 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org> logjam-4.5.2.ebuild:
+  strip gtkhtml-3.0 dependency (bug #193496) and fix some quoting and style
 
   17 Jun 2007; Gilles Dartiguelongue <dartigug@esiee.fr>
   logjam-4.5.2.ebuild:
diff --git a/net-misc/logjam/Manifest b/net-misc/logjam/Manifest
index 1a5db2a8cc6b..a76de1cdb130 100644
--- a/net-misc/logjam/Manifest
+++ b/net-misc/logjam/Manifest
@@ -1,17 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST logjam-4.4.1.tar.bz2 715636 RMD160 91e28bedeed1b43f78d47116d432753d42dea60f SHA1 bad3485cb64a364d32f701ec69d7a0008254a89b SHA256 a4143ef49e6407222913e85a154b7f53af6ddefb333b2ae7b6ec95d898ee79d9
 DIST logjam-4.5.2.tar.bz2 748780 RMD160 bbc6a7a79d191ebb5ee1d97d44d408959c409cba SHA1 4c2ffd992379fd680e2a9e9cf926fcc896f01bc7 SHA256 00ba33099f7bb6b85f522c6c63ddb564314a5e78ac0a13100392fcb78a7a38e5
 EBUILD logjam-4.4.1.ebuild 1079 RMD160 9567fcb10003b10efdea81e84bed25405115bb55 SHA1 ed9e49be2af09e28e2b2242ca3172cc39e4aa804 SHA256 3705810831dec70d3980bc0d67a568f39e6b2ca77bdfa1236493ab5ecb14495f
 MD5 50a029e76dbfc28f3a89802daef15ab8 logjam-4.4.1.ebuild 1079
 RMD160 9567fcb10003b10efdea81e84bed25405115bb55 logjam-4.4.1.ebuild 1079
 SHA256 3705810831dec70d3980bc0d67a568f39e6b2ca77bdfa1236493ab5ecb14495f logjam-4.4.1.ebuild 1079
-EBUILD logjam-4.5.2.ebuild 1180 RMD160 72558d0871bbbf0c55bf69cae26a72e73984b5f7 SHA1 c5e9a71a0a9ac10f069781c07e8596a1a073f027 SHA256 d58e6d1c1c8adece5d131147ac391c90b9c0d3c695e202b9ca250e55dcb75f2f
-MD5 d15a5f793b090fa29bf35018bf97f918 logjam-4.5.2.ebuild 1180
-RMD160 72558d0871bbbf0c55bf69cae26a72e73984b5f7 logjam-4.5.2.ebuild 1180
-SHA256 d58e6d1c1c8adece5d131147ac391c90b9c0d3c695e202b9ca250e55dcb75f2f logjam-4.5.2.ebuild 1180
-MISC ChangeLog 4909 RMD160 82af9ffb0951bf59351a61e864ccedc3ccd54ad4 SHA1 528c36690019182a9c416568785d2413f1521e03 SHA256 9f375aa9e77bca8ed47f4c7c60aa785cccf16065bcf449c9b7a5f8a351537ad8
-MD5 b14dca7292d31b619eaa1b18bf762ae2 ChangeLog 4909
-RMD160 82af9ffb0951bf59351a61e864ccedc3ccd54ad4 ChangeLog 4909
-SHA256 9f375aa9e77bca8ed47f4c7c60aa785cccf16065bcf449c9b7a5f8a351537ad8 ChangeLog 4909
+EBUILD logjam-4.5.2.ebuild 1213 RMD160 a645e0ae41768625c76046d46d29f519eb551c9f SHA1 16078a76cdc41200514a553cd489f3f1171a92ec SHA256 25f455a2a10371e912b42580be787424709cf8e42018d350af89d4b356d07981
+MD5 b6c8e491871f65a0625448ed820d3b2f logjam-4.5.2.ebuild 1213
+RMD160 a645e0ae41768625c76046d46d29f519eb551c9f logjam-4.5.2.ebuild 1213
+SHA256 25f455a2a10371e912b42580be787424709cf8e42018d350af89d4b356d07981 logjam-4.5.2.ebuild 1213
+MISC ChangeLog 5061 RMD160 01746f7f009a03c80284e1d8494a43d781b202a7 SHA1 cc4723cef7b0fd7fb8244f4c4ff3f8ac10fde6a0 SHA256 507814f8069c0a2bdca5090fd45c598dc2c1b73fb9b5ccb3474a6306c1c061e9
+MD5 777d4f2aba6f322d1629fc74d290e7d5 ChangeLog 5061
+RMD160 01746f7f009a03c80284e1d8494a43d781b202a7 ChangeLog 5061
+SHA256 507814f8069c0a2bdca5090fd45c598dc2c1b73fb9b5ccb3474a6306c1c061e9 ChangeLog 5061
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -22,3 +25,10 @@ SHA256 d269a2ed92ffa563135f797a502c6ac0c91714ca111726a9c6b61e71363a9f8f files/di
 MD5 b5197ae678e0e1aa179cfcc1e291084d files/digest-logjam-4.5.2 241
 RMD160 a2d23f58eaac5f0c372ef79f78cbaa6ed74df73a files/digest-logjam-4.5.2 241
 SHA256 acb739769c89ae1a06bc18058b4e620c9bf106abb4241dbc066bc9c6b9233585 files/digest-logjam-4.5.2 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHCVwq1fmVwcYIWAYRAkjXAKC+kksKmdLBYL5JXGeWIxI2EgqmfwCgwey0
+BSfGcOLNR77em55JVP7/vdE=
+=LU6j
+-----END PGP SIGNATURE-----
diff --git a/net-misc/logjam/logjam-4.5.2.ebuild b/net-misc/logjam/logjam-4.5.2.ebuild
index 70977f1188d9..05fa668a906d 100644
--- a/net-misc/logjam/logjam-4.5.2.ebuild
+++ b/net-misc/logjam/logjam-4.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/logjam/logjam-4.5.2.ebuild,v 1.5 2007/06/17 09:13:44 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/logjam/logjam-4.5.2.ebuild,v 1.6 2007/10/07 22:22:24 eva Exp $
 
 IUSE="gtk gtkhtml spell sqlite svg"
 
@@ -18,9 +18,7 @@ RDEPEND=">=dev-libs/libxml2-2.0
 	net-misc/curl
 	>=dev-libs/glib-2
 	gtk? ( >=x11-libs/gtk+-2.4 )
-	gtkhtml? ( || (
-		=gnome-extra/gtkhtml-3.6*
-		=gnome-extra/gtkhtml-3.0* ) )
+	gtkhtml? ( =gnome-extra/gtkhtml-3.6* )
 	spell? ( app-text/gtkspell )
 	svg? ( >=gnome-base/librsvg-2.2.3 )
 	sqlite? ( >=dev-db/sqlite-3 )"
@@ -31,22 +29,22 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	sed -i -e s/logjam.png/logjam_pencil.png/ ${S}/data/logjam.desktop.in
+	sed -i -e s/logjam.png/logjam_pencil.png/ "${S}"/data/logjam.desktop.in
 }
 
 src_compile() {
 
 	econf \
-	`use_with gtk` \
-	`use_with gtkhtml` \
-	`use_with spell gtkspell` \
-	`use_with svg librsvg` \
-	`use_with sqlite sqlite3` \
-	--without-xmms || die
-	emake || die
+		$(use_with gtk) \
+		$(use_with gtkhtml) \
+		$(use_with spell gtkspell) \
+		$(use_with svg librsvg) \
+		$(use_with sqlite sqlite3) \
+		--without-xmms || die "configure failed"
+	emake || die "make failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc Changelog doc/README doc/TODO
 }