Version bump, added "crypt" USE support

6 files changed, 41 insertions, 37 deletions

diff --git a/x11-plugins/wmbiff/Manifest b/x11-plugins/wmbiff/Manifest
index 0110561f8618..fe89c22dfd61 100644
--- a/x11-plugins/wmbiff/Manifest
+++ b/x11-plugins/wmbiff/Manifest
@@ -1,8 +1,6 @@
-MD5 2766ab01aab790d5c269ec2043849a2c wmbiff-0.3.5.ebuild 816
-MD5 a38e5b8b480572ab0f945d3338aa36dd wmbiff-0.4.15.ebuild 635
-MD5 01d343a588a77689382025669255cfe1 wmbiff-0.4.17.ebuild 661
-MD5 95813545fd59bf1ba940b0111e71cfee ChangeLog 795
+MD5 882238df298c4558f6ddc20e4ba01976 wmbiff-0.4.15.ebuild 634
+MD5 a1bc1e3d8e259fe4678c36e590eab7d7 wmbiff-0.4.17.ebuild 1024
+MD5 7d6de108682cc0c4976f55c5dfe3b4b6 ChangeLog 1003
 MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
 MD5 8391e3fac11ce2c658e6c7b8803321de files/digest-wmbiff-0.4.15 65
 MD5 1c3db557c466c299ecf1fcf38194b155 files/digest-wmbiff-0.4.17 65
-MD5 37fd5d2ad6171a6e66365008a769a74c files/digest-wmbiff-0.3.5 63
diff --git a/x11-plugins/wmbiff/files/digest-wmbiff-0.3.5 b/x11-plugins/wmbiff/files/digest-wmbiff-0.3.5
deleted file mode 100644
index 2d8437ecf62d..000000000000
--- a/x11-plugins/wmbiff/files/digest-wmbiff-0.3.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c0138aa6f637ef7d89f5edb37df46308 wmbiff-0.3.5.tar.gz 43983
diff --git a/x11-plugins/wmbiff/files/digest-wmbiff-0.4.17 b/x11-plugins/wmbiff/files/digest-wmbiff-0.4.17
new file mode 100644
index 000000000000..8b1a2e9948ce
--- /dev/null
+++ b/x11-plugins/wmbiff/files/digest-wmbiff-0.4.17
@@ -0,0 +1 @@
+MD5 914820af94ee3221ad06683c99c16044 wmbiff-0.4.17.tar.gz 189615
diff --git a/x11-plugins/wmbiff/wmbiff-0.3.5.ebuild b/x11-plugins/wmbiff/wmbiff-0.3.5.ebuild
deleted file mode 100644
index 3e0e054b07ae..000000000000
--- a/x11-plugins/wmbiff/wmbiff-0.3.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.3.5.ebuild,v 1.5 2003/10/16 16:10:23 drobbins Exp $
-
-S=${WORKDIR}/${P}/wmbiff
-DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes."
-SRC_URI="mirror://sourceforge/wmbiff/${P}.tar.gz"
-HOMEPAGE="http://sourceforge.net/projects/wmbiff/"
-
-DEPEND="virtual/x11"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc amd64"
-
-src_compile() {
-	# disabling crypt for now, until I have time to
-	# spend.
-	mv Makefile Makefile.orig
-	grep -v TLS Makefile.orig | grep -v gnutls > Makefile
-	emake || die
-}
-
-src_install () {
-	dobin wmbiff
-	doman wmbiff.1 wmbiffrc.5
-	cd ..
-	dodoc ChangeLog  NEWS  README  README.licq  TODO
-}
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.15.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.15.ebuild
index 801c107e1da5..37ea5e84ca6f 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.15.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.15.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/x11-plugins/wmbiff/wmbiff-0.4.15.ebuild,v 1.5 2003/10/16 16:10:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.15.ebuild,v 1.6 2003/12/18 12:45:19 phosphan Exp $
 
 DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes."
 SRC_URI="mirror://sourceforge/wmbiff/${P}.tar.gz"
@@ -10,7 +10,7 @@ DEPEND="virtual/x11"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc amd64"
+KEYWORDS="x86 sparc amd64"
 
 
 src_compile() {
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.17.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.17.ebuild
new file mode 100644
index 000000000000..a7bf7ce583cf
--- /dev/null
+++ b/x11-plugins/wmbiff/wmbiff-0.4.17.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.17.ebuild,v 1.1 2003/12/18 12:45:19 phosphan Exp $
+
+DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes."
+SRC_URI="mirror://sourceforge/wmbiff/${P}.tar.gz"
+HOMEPAGE="http://sourceforge.net/projects/wmbiff/"
+
+DEPEND="virtual/x11
+		crypt? ( net-libs/gnutls
+			dev-libs/libgcrypt )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~amd64"
+IUSE="crypt"
+
+src_compile() {
+	local myconf
+	if ! use crypt; then # disabling does not work properly
+		if has_version net-libs/gnutls; then
+			myconf="--with-libgnutls-prefix=/this/does/not/exist"
+		fi
+		if has_version dev-libs/libgcrypt; then
+			myconf="${myconf} --with-libgcrypt-prefix=/this/does/not/exist"
+		fi
+	fi
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die
+	dodoc ChangeLog  FAQ NEWS  README  README.licq  TODO
+}