cleanup and rev bump for gtkhtml editing option

7 files changed, 14 insertions, 47 deletions

diff --git a/net-misc/logjam/Manifest b/net-misc/logjam/Manifest
index abfd8befcf42..dfbfe65656fb 100644
--- a/net-misc/logjam/Manifest
+++ b/net-misc/logjam/Manifest
@@ -1,7 +1,7 @@
-MD5 6104ab9ee5d07c727b640ec597848fc4 ChangeLog 1183
+MD5 bf890ef4fef5a21ea5a1ca2cddc3545c ChangeLog 1183
 MD5 1ebabd0e968c55acbce154f32778c1fe logjam-3.0.4-r1.ebuild 1404
-MD5 239d984cd6b75da4436c49ec0af87d3f logjam-4.1.2.ebuild 793
-MD5 2dcf459d000f951fae74a622b8b741e0 logjam-4.1.2-r1.ebuild 895
+MD5 d775ae96886a8b6cbff8dbfa5f8fd88c logjam-4.1.2.ebuild 793
+MD5 892a0631abdb4370dbf714fb4aed45d7 logjam-4.1.2-r1.ebuild 899
 MD5 97bfca114805fe0dc7ab4671b3e742d9 files/digest-logjam-3.0.4-r1 64
 MD5 05d8622e6a8d9f1ddb2a675857d34fad files/digest-logjam-4.1.2-r1 64
 MD5 05d8622e6a8d9f1ddb2a675857d34fad files/digest-logjam-4.1.2 64
diff --git a/net-misc/logjam/files/digest-logjam-3.0.4-r2 b/net-misc/logjam/files/digest-logjam-3.0.4-r2
deleted file mode 100644
index 000623c83017..000000000000
--- a/net-misc/logjam/files/digest-logjam-3.0.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0259029e23ca6a280c6cb6ff83603ac9 logjam-3.0.4.tar.gz 142048
diff --git a/net-misc/logjam/files/digest-logjam-4.0.0 b/net-misc/logjam/files/digest-logjam-4.0.0
deleted file mode 100644
index 73835d7c48e7..000000000000
--- a/net-misc/logjam/files/digest-logjam-4.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8bc409c821c08ed2955feb3423aed7d7 logjam-4.0.0.tar.gz 263272
diff --git a/net-misc/logjam/files/digest-logjam-4.1.2-r1 b/net-misc/logjam/files/digest-logjam-4.1.2-r1
new file mode 100644
index 000000000000..9a464d246e5d
--- /dev/null
+++ b/net-misc/logjam/files/digest-logjam-4.1.2-r1
@@ -0,0 +1 @@
+MD5 bc66aa66be412819bc862e58c11461ff logjam-4.1.2.tar.gz 422130
diff --git a/net-misc/logjam/logjam-3.0.4-r2.ebuild b/net-misc/logjam/logjam-3.0.4-r2.ebuild
deleted file mode 100644
index fece284bf8ed..000000000000
--- a/net-misc/logjam/logjam-3.0.4-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/logjam/logjam-3.0.4-r2.ebuild,v 1.4 2003/02/13 14:59:18 vapier Exp $
-
-IUSE="xmms gnome"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GTK-based LiveJournal client"
-HOMEPAGE="http://logjam.danga.com/"
-SRC_URI=http://logjam.danga.com/download/${P}.tar.gz
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-DEPEND=">=x11-libs/gtk+-1.2.10
-	net-ftp/curl
-	gnome?	( >=gnome-base/gnome-core-1.4.0 )
-	xmms? ( media-sound/xmms )"
-
-src_compile () {
-	local myconf
-
-	use gnome && myconf="${myconf} --with-gnome=yes"
-	use xmms && myconf="${myconf} --enable-xmms"
-	
-	econf ${myconf} || die "./configure failed"
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc README TODO ChangeLog COPYING AUTHORS
-}
diff --git a/net-misc/logjam/logjam-4.0.0.ebuild b/net-misc/logjam/logjam-4.1.2-r1.ebuild
index 9aee5e005fa0..61b82f06629e 100644
--- a/net-misc/logjam/logjam-4.0.0.ebuild
+++ b/net-misc/logjam/logjam-4.1.2-r1.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/logjam/logjam-4.0.0.ebuild,v 1.2 2003/02/13 14:59:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/logjam/logjam-4.1.2-r1.ebuild,v 1.1 2003/06/19 08:27:11 liquidx Exp $
 
-IUSE="xmms spell"
+IUSE="xmms spell gtkhtml"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="GTK2-based LiveJournal client"
 HOMEPAGE="http://logjam.danga.com/"
-SRC_URI=http://logjam.danga.com/download/${P}.tar.gz
+SRC_URI="http://logjam.danga.com/download/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~x86 ~ppc"
 
-DEPEND="=x11-libs/gtk+-2*
+DEPEND=">=x11-libs/gtk+-2
+	>=dev-libs/libxml2-2.0
 	net-ftp/curl
+	gtkhtml? ( >=gnome-extra/libgtkhtml-3.0 )	
 	spell? ( app-text/gtkspell )
 	xmms? ( media-sound/xmms )"
 
@@ -22,6 +23,7 @@ src_compile () {
 	local myconf
 
 	use xmms && myconf="${myconf} --enable-xmms"
+	use gtkhtml && myconf="${myconf} --with-gtkhtml"
 	
 	econf ${myconf} || die "./configure failed"
 	emake || die
diff --git a/net-misc/logjam/logjam-4.1.2.ebuild b/net-misc/logjam/logjam-4.1.2.ebuild
index d3bee63c688b..2b8cc1f49a35 100644
--- a/net-misc/logjam/logjam-4.1.2.ebuild
+++ b/net-misc/logjam/logjam-4.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/logjam/logjam-4.1.2.ebuild,v 1.2 2003/05/10 23:04:43 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/logjam/logjam-4.1.2.ebuild,v 1.3 2003/06/19 08:27:11 liquidx Exp $
 
 IUSE="xmms spell"
 
@@ -10,7 +10,7 @@ SRC_URI="http://logjam.danga.com/download/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 DEPEND=">=x11-libs/gtk+-2
 	>=dev-libs/libxml2-2.5