Version bump, ebuild clean upo

6 files changed, 15 insertions, 51 deletions

diff --git a/net-im/ekg2/ChangeLog b/net-im/ekg2/ChangeLog
index d95b3e8b7a9c..501e6317e3fe 100644
--- a/net-im/ekg2/ChangeLog
+++ b/net-im/ekg2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/ekg2
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ChangeLog,v 1.10 2004/11/18 19:30:29 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ChangeLog,v 1.11 2004/11/21 00:26:54 sekretarz Exp $
+
+*ekg2-20041118 (21 Nov 2004)
+
+  21 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org> -ekg2-20040928.ebuild,
+  -ekg2-20041019.ebuild, +ekg2-20041118.ebuild:
+  Version bump, ebuild clean up
 
   18 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org> ekg2-20041104.ebuild:
   Keyworded ~amd64
diff --git a/net-im/ekg2/ekg2-20041019.ebuild b/net-im/ekg2/ekg2-20041019.ebuild
deleted file mode 100644
index a66ff5b54c9a..000000000000
--- a/net-im/ekg2/ekg2-20041019.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-20041019.ebuild,v 1.1 2004/10/21 16:13:21 sekretarz Exp $
-
-DESCRIPTION="Text based Instant Messenger client that supports many protocols like Jabber and Gadu-Gadu"
-HOMEPAGE="http://www.ekg2.org/"
-SRC_URI="http://www.ekg2.org/archive/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~x86 ~ppc"
-
-IUSE="gpm ssl spell jpeg nogg gsm"
-
-DEPEND=">=dev-libs/expat-1.95.6
-	>=net-libs/gnutls-1.0.17
-	gpm? ( >=sys-libs/gpm-1.20.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6m )
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	spell? ( >=app-text/aspell-0.50.5 )
-	!nogg? ( >=net-libs/libgadu-20040820 )
-	gsm? ( >=media-sound/gsm-1.0.10 )"
-
-#RDEPEND=""
-
-S=${WORKDIR}/${P}
-
-src_compile() {
-
-	econf \
-	    --with-pthread \
-	    `use_with !nogg libgadu` \
-	    `use_with gpm gpm-mouse` \
-	    `use_with ssl openssl` \
-	    `use_with jpeg libjpeg` \
-	    `use_with spell aspell` \
-	    `use_with gsm libgsm` \
-	     || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || die
-	dodoc docs/*
-}
diff --git a/net-im/ekg2/ekg2-20040928.ebuild b/net-im/ekg2/ekg2-20041118.ebuild
index 012fd4878271..5cffd784d7a5 100644
--- a/net-im/ekg2/ekg2-20040928.ebuild
+++ b/net-im/ekg2/ekg2-20041118.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-20040928.ebuild,v 1.1 2004/09/28 23:24:06 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-20041118.ebuild,v 1.1 2004/11/21 00:26:54 sekretarz Exp $
 
 DESCRIPTION="Text based Instant Messenger client that supports many protocols like Jabber and Gadu-Gadu"
 HOMEPAGE="http://www.ekg2.org/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.ekg2.org/archive/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 
 IUSE="gpm ssl spell jpeg nogg gsm"
 
@@ -41,6 +41,11 @@ src_compile() {
 }
 
 src_install() {
+	# Install plugins into proper directory
+	if use amd64; then
+		CONF_LIBDIR=/usr/lib/ekg2/plugins
+	fi
+
 	einstall || die
 	dodoc docs/*
 }
diff --git a/net-im/ekg2/files/digest-ekg2-20040928 b/net-im/ekg2/files/digest-ekg2-20040928
deleted file mode 100644
index 234c2742e6a2..000000000000
--- a/net-im/ekg2/files/digest-ekg2-20040928
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3fd8b1333653046e8fb955de76641a78 ekg2-20040928.tar.gz 1088894
diff --git a/net-im/ekg2/files/digest-ekg2-20041019 b/net-im/ekg2/files/digest-ekg2-20041019
deleted file mode 100644
index 4b3b2df3128d..000000000000
--- a/net-im/ekg2/files/digest-ekg2-20041019
+++ /dev/null
@@ -1 +0,0 @@
-MD5 103037e094cad694759b2d8e441e37e3 ekg2-20041019.tar.gz 1090246
diff --git a/net-im/ekg2/files/digest-ekg2-20041118 b/net-im/ekg2/files/digest-ekg2-20041118
new file mode 100644
index 000000000000..7aa7e3e7d984
--- /dev/null
+++ b/net-im/ekg2/files/digest-ekg2-20041118
@@ -0,0 +1 @@
+MD5 4112f63335df29f9aa2e4ab6554c6221 ekg2-20041118.tar.gz 1109057