Version bump. Pruned old ebuilds. Migrated 1.5.4-r1 to modular X dependencies, so repoman doesn't complain (although it is utterly useless).

(Portage version: 2.1_pre4-r1)

7 files changed, 23 insertions, 94 deletions

diff --git a/mail-client/xfmail/ChangeLog b/mail-client/xfmail/ChangeLog
index cfc7c71d9a8c..058c9f2b19d9 100644
--- a/mail-client/xfmail/ChangeLog
+++ b/mail-client/xfmail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/xfmail
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/xfmail/ChangeLog,v 1.5 2006/01/27 17:09:00 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/xfmail/ChangeLog,v 1.6 2006/02/25 12:11:56 ticho Exp $
+
+  25 Feb 2006; Andrej Kacian <ticho@gentoo.org> -xfmail-1.5.3.ebuild,
+  -xfmail-1.5.4.ebuild, xfmail-1.5.4-r1.ebuild, xfmail-1.5.5.ebuild:
+  Version bump. Pruned old ebuilds. Migrated 1.5.4-r1 to modular X
+  dependencies, so repoman doesn't complain (although it is utterly useless).
 
   27 Jan 2006; Andrej Kacian <ticho@gentoo.org> xfmail-1.5.5.ebuild:
   Fix modular X deps.
diff --git a/mail-client/xfmail/files/digest-xfmail-1.5.3 b/mail-client/xfmail/files/digest-xfmail-1.5.3
deleted file mode 100644
index 9432c24aabcc..000000000000
--- a/mail-client/xfmail/files/digest-xfmail-1.5.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ce7fb31306642ba336f41ac2e0e9738f xfmail-1.5.3.tar.bz2 799591
diff --git a/mail-client/xfmail/files/digest-xfmail-1.5.4 b/mail-client/xfmail/files/digest-xfmail-1.5.4
deleted file mode 100644
index e715bb3103ef..000000000000
--- a/mail-client/xfmail/files/digest-xfmail-1.5.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2921b249238a4223259b1037dd12082e xfmail-1.5.4.tar.bz2 816116
diff --git a/mail-client/xfmail/xfmail-1.5.3.ebuild b/mail-client/xfmail/xfmail-1.5.3.ebuild
deleted file mode 100644
index a1cb975601d3..000000000000
--- a/mail-client/xfmail/xfmail-1.5.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/xfmail/xfmail-1.5.3.ebuild,v 1.3 2004/07/14 16:34:20 agriffis Exp $
-
-IUSE="ldap"
-
-DESCRIPTION="A full-featured mail program using XForms"
-SRC_URI="ftp://ftp.xfmail.org/pub/${PN}/release/1.5.3/source/${P}.tar.bz2"
-HOMEPAGE="http://www.xfmail.org"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc"
-
-DEPEND="virtual/x11
-	>=x11-libs/xforms-1.0_rc4
-	ldap? ( >=net-nds/openldap-2.0.11 )"
-
-
-RDEPEND="virtual/x11
-	>=x11-libs/xforms-1.0_rc4
-	ldap? ( >=net-nds/openldap-2.0.11 )"
-
-src_compile() {
-
-	local myconf
-
-	use ldap && myconf="$myconf --with-ldap"
-
-	./autogen.sh \
-		--host=${CHOST}  \
-		--prefix=/usr \
-		--with-faces $myconf || die
-	emake || die
-}
-
-src_install () {
-
-	make prefix=${D}/usr \
-		manualdir=${D}/usr/share/doc/${PF}/html \
-		install || die
-
-	dodoc AUTHORS ChangeLog* NEWS README* TODO*
-
-}
diff --git a/mail-client/xfmail/xfmail-1.5.4-r1.ebuild b/mail-client/xfmail/xfmail-1.5.4-r1.ebuild
index 5734d6d23beb..794b03b4a5d0 100644
--- a/mail-client/xfmail/xfmail-1.5.4-r1.ebuild
+++ b/mail-client/xfmail/xfmail-1.5.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/xfmail/xfmail-1.5.4-r1.ebuild,v 1.4 2004/10/04 23:32:05 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/xfmail/xfmail-1.5.4-r1.ebuild,v 1.5 2006/02/25 12:11:56 ticho Exp $
 
 IUSE="ldap"
 DESCRIPTION="A full-featured mail program using XForms"
@@ -11,12 +11,19 @@ HOMEPAGE="http://www.xfmail.org"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc"
-DEPEND="virtual/x11
-	>=x11-libs/xforms-1.0_rc4
-	ldap? ( >=net-nds/openldap-2.0.11 )"
-RDEPEND="virtual/x11
-	>=x11-libs/xforms-1.0_rc4
-	ldap? ( >=net-nds/openldap-2.0.11 )"
+
+RDEPEND="|| ( ( x11-libs/libXpm
+				x11-libs/libSM )
+			virtual/x11 )
+		=dev-libs/glib-1.2*
+		sys-libs/gdbm
+		>=x11-libs/xforms-1.0_rc4
+		ldap? ( >=net-nds/openldap-2.0.11 )"
+DEPEND="${RDEPEND}
+		|| ( ( x11-proto/xextproto
+				x11-libs/libXt )
+			virtual/x11 )
+		sys-apps/sed"
 
 src_compile() {
 	local myconf
diff --git a/mail-client/xfmail/xfmail-1.5.4.ebuild b/mail-client/xfmail/xfmail-1.5.4.ebuild
deleted file mode 100644
index 0809dd0c9edf..000000000000
--- a/mail-client/xfmail/xfmail-1.5.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/xfmail/xfmail-1.5.4.ebuild,v 1.3 2004/07/14 16:34:20 agriffis Exp $
-
-IUSE="ldap"
-DESCRIPTION="A full-featured mail program using XForms"
-SRC_URI="http://xfmail.precision-eng.net/release/1.5.4/source/${P}.tar.bz2
-	http://xfmail.cfreeze.com/release/1.5.4/source/${P}.tar.bz2
-	ftp://ftp.xfmail.org/pub/${PN}/release/1.5.4/source/${P}.tar.bz2"
-HOMEPAGE="http://www.xfmail.org"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc"
-DEPEND="virtual/x11
-	>=x11-libs/xforms-1.0_rc4
-	ldap? ( >=net-nds/openldap-2.0.11 )"
-RDEPEND="virtual/x11
-	>=x11-libs/xforms-1.0_rc4
-	ldap? ( >=net-nds/openldap-2.0.11 )"
-
-src_compile() {
-	local myconf
-	use ldap && myconf="$myconf --with-ldap"
-	./autogen.sh \
-		--host=${CHOST}  \
-		--prefix=/usr \
-		--with-faces $myconf || die
-	emake || die
-}
-
-src_install () {
-	make prefix=${D}/usr \
-		manualdir=${D}/usr/share/doc/${PF}/html \
-		install || die
-	dodoc AUTHORS ChangeLog* NEWS README* TODO*
-}
diff --git a/mail-client/xfmail/xfmail-1.5.5.ebuild b/mail-client/xfmail/xfmail-1.5.5.ebuild
index 0dbc559121ec..582cab0ed38f 100644
--- a/mail-client/xfmail/xfmail-1.5.5.ebuild
+++ b/mail-client/xfmail/xfmail-1.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/xfmail/xfmail-1.5.5.ebuild,v 1.3 2006/01/27 21:56:13 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/xfmail/xfmail-1.5.5.ebuild,v 1.4 2006/02/25 12:11:56 ticho Exp $
 
 IUSE="ldap"
 DESCRIPTION="A full-featured mail program using XForms"
@@ -8,7 +8,7 @@ SRC_URI="ftp://ftp.welcomes-you.com/pub/${PN}/release/${PV}/source/${P}.tar.bz2"
 HOMEPAGE="http://www.xfmail.org"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="~ppc ~sparc x86"
 RDEPEND="|| ( ( x11-libs/libXpm
 				x11-libs/libSM )
 			virtual/x11 )