Remove old, use slot dep for gtk+, and other cleanups.

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

3 files changed, 17 insertions, 40 deletions

diff --git a/mail-client/gbuffy/ChangeLog b/mail-client/gbuffy/ChangeLog
index 46877993ed6a..de7b8b452d65 100644
--- a/mail-client/gbuffy/ChangeLog
+++ b/mail-client/gbuffy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/gbuffy
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/gbuffy/ChangeLog,v 1.5 2008/10/06 19:47:50 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/gbuffy/ChangeLog,v 1.6 2011/03/23 20:52:08 radhermit Exp $
+
+  23 Mar 2011; Tim Harder <radhermit@gentoo.org> -gbuffy-0.2.6.ebuild,
+  gbuffy-0.2.6-r1.ebuild:
+  Remove old, use slot dep for gtk+, and other cleanups.
 
   29 Aug 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing agriffis from metadata due to his retirement (see #182294 for
diff --git a/mail-client/gbuffy/gbuffy-0.2.6-r1.ebuild b/mail-client/gbuffy/gbuffy-0.2.6-r1.ebuild
index ba3d99b265bc..a69e180af8ea 100644
--- a/mail-client/gbuffy/gbuffy-0.2.6-r1.ebuild
+++ b/mail-client/gbuffy/gbuffy-0.2.6-r1.ebuild
@@ -1,28 +1,31 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/gbuffy/gbuffy-0.2.6-r1.ebuild,v 1.2 2006/11/18 02:26:12 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/gbuffy/gbuffy-0.2.6-r1.ebuild,v 1.3 2011/03/23 20:52:08 radhermit Exp $
+
+EAPI=1
 
 inherit eutils
 
 DESCRIPTION="A multi-mailbox biff-like monitor"
 HOMEPAGE="http://www.fiction.net/blong/programs/gbuffy/"
 SRC_URI="http://www.fiction.net/blong/programs/${PN}/${P}/${P}.tar.gz"
+
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~x86"
-
 IUSE="ssl"
 
 DEPEND="x11-libs/libPropList
 	media-libs/compface
-	>=x11-libs/gtk+-1.1.11
+	>=x11-libs/gtk+-1.1.11:1
 	ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/gbuffy-1.patch
-	epatch ${FILESDIR}/gbuffy-search-3.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/gbuffy-1.patch
+	epatch "${FILESDIR}"/gbuffy-search-3.patch
 }
 
 src_compile() {
@@ -32,6 +35,6 @@ src_compile() {
 
 src_install() {
 	einstall || die
-	dodoc ChangeLog CHANGES GBuffy LICENSE README ToDo
+	dodoc ChangeLog CHANGES GBuffy README ToDo
 	doman gbuffy.1
 }
diff --git a/mail-client/gbuffy/gbuffy-0.2.6.ebuild b/mail-client/gbuffy/gbuffy-0.2.6.ebuild
deleted file mode 100644
index eb2ebc00b7b4..000000000000
--- a/mail-client/gbuffy/gbuffy-0.2.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/gbuffy/gbuffy-0.2.6.ebuild,v 1.4 2006/11/18 02:26:12 compnerd Exp $
-
-inherit eutils
-
-DESCRIPTION="A multi-mailbox biff-like monitor"
-HOMEPAGE="http://www.fiction.net/blong/programs/gbuffy/"
-SRC_URI="http://www.fiction.net/blong/programs/${PN}/${P}/${P}.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE="ssl"
-
-DEPEND="x11-libs/libPropList
-	media-libs/compface
-	>=x11-libs/gtk+-1.1.11
-	ssl? ( dev-libs/openssl )"
-
-src_compile() {
-	econf --disable-applet || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	dodoc ChangeLog CHANGES GBuffy LICENSE README ToDo
-	doman gbuffy.1
-}