Stable on x86 and ebuild cleanup.

4 files changed, 19 insertions, 82 deletions

diff --git a/net-im/silky/ChangeLog b/net-im/silky/ChangeLog
index bd2cc6ea1a88..2f3b67db22b5 100644
--- a/net-im/silky/ChangeLog
+++ b/net-im/silky/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/silky
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silky/ChangeLog,v 1.7 2004/07/01 22:19:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silky/ChangeLog,v 1.8 2004/07/07 22:23:01 swegener Exp $
+
+  08 Jul 2004; Sven Wegener <swegener@gentoo.org> -silky-0.5.0.ebuild,
+  silky-0.5.1.ebuild:
+  Stable on x86 and ebuild cleanup.
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> silky-0.5.0.ebuild,
   silky-0.5.1.ebuild:
diff --git a/net-im/silky/files/digest-silky-0.5.0 b/net-im/silky/files/digest-silky-0.5.0
deleted file mode 100644
index e71418a1a64f..000000000000
--- a/net-im/silky/files/digest-silky-0.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0533ac8b2972c4006efd5fe45a369394 silky-0.5.0.tar.gz 708648
diff --git a/net-im/silky/silky-0.5.0.ebuild b/net-im/silky/silky-0.5.0.ebuild
deleted file mode 100644
index c7bc29907481..000000000000
--- a/net-im/silky/silky-0.5.0.ebuild
+++ /dev/null
@@ -1,51 +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/silky/silky-0.5.0.ebuild,v 1.7 2004/07/01 22:19:30 eradicator Exp $
-
-IUSE="debug"
-
-DESCRIPTION="Simple and easy to use GTK+ based os-independent SILC client."
-HOMEPAGE="http://silky.sourceforge.net"
-SRC_URI="mirror://sourceforge/silky/silky-${PV}.tar.gz"
-KEYWORDS="x86 ~ppc ~sparc"
-LICENSE="GPL-2"
-
-SLOT="0"
-
-# Silky currently does not work with silc-toolkit newer than 0.9.11. This bug
-# is to be addressed in next release of Silky.
-DEPEND="sys-libs/glibc
-	sys-libs/zlib
-	>=gnome-base/libglade-2
-	>=x11-libs/gtk+-2.2
-	x11-libs/pango
-	dev-libs/atk
-	>=dev-libs/glib-2.2
-	dev-libs/libxml2
-	app-misc/mime-types
-	=net-im/silc-toolkit-0.9.11"
-RDEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_compile() {
-	local myconf
-
-	myconf="${myconf} --with-silc-includes=/usr/include/silc-toolkit "
-	myconf="${myconf} --with-silc-libs=/usr/lib "
-
-	if [ "${DEBUG}" ]
-	then
-		einfo "debugging"
-		myconf="${myconf} --enable-debug"
-	fi
-
-	econf ${myconf} || die "./configure failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install
-}
diff --git a/net-im/silky/silky-0.5.1.ebuild b/net-im/silky/silky-0.5.1.ebuild
index 8feed3530a8d..d85a1b065d0f 100644
--- a/net-im/silky/silky-0.5.1.ebuild
+++ b/net-im/silky/silky-0.5.1.ebuild
@@ -1,20 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silky/silky-0.5.1.ebuild,v 1.3 2004/07/01 22:19:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silky/silky-0.5.1.ebuild,v 1.4 2004/07/07 22:23:01 swegener Exp $
 
-IUSE=""
+IUSE="debug"
 
 DESCRIPTION="Simple and easy to use GTK+ based os-independent SILC client."
-HOMEPAGE="http://silky.sourceforge.net"
-SRC_URI="mirror://sourceforge/silky/silky-${PV}.tar.gz"
-KEYWORDS="~x86 ~ppc ~sparc"
+HOMEPAGE="http://silky.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+KEYWORDS="x86 ~ppc ~sparc"
 LICENSE="GPL-2"
 
 SLOT="0"
 
-# Silky currently does not work with silc-toolkit newer than 0.9.11. This bug
-# is to be addressed in next release of Silky.
-DEPEND="sys-libs/glibc
+DEPEND="virtual/libc
 	sys-libs/zlib
 	>=gnome-base/libglade-2
 	>=x11-libs/gtk+-2.2
@@ -23,30 +21,17 @@ DEPEND="sys-libs/glibc
 	>=dev-libs/glib-2.2
 	dev-libs/libxml2
 	app-misc/mime-types
-	net-im/silc-toolkit"
-
-RDEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-}
+	>=net-im/silc-toolkit-0.9.12-r2"
 
 src_compile() {
-	local myconf
-
-	myconf="${myconf} --with-silc-includes=/usr/include/silc-toolkit "
-	myconf="${myconf} --with-silc-libs=/usr/lib "
-
-	if [ "${DEBUG}" ]
-	then
-		einfo "debugging"
-		myconf="${myconf} --enable-debug"
-	fi
-
-	econf ${myconf} || die "./configure failed"
-	emake || die
+	econf \
+		--with-silc-includes=/usr/include/silc-toolkit \
+		--with-silc-libs=/usr/lib \
+		$(use_enable debug) \
+		|| die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install
+	make DESTDIR=${D} install || die "make install failed"
 }