Bump x11-plugins/wmbiff version to 0.4.25, closing #57965. Wipe out older ebuilds.

7 files changed, 31 insertions, 45 deletions

diff --git a/x11-plugins/wmbiff/ChangeLog b/x11-plugins/wmbiff/ChangeLog
index f61958a0957c..10cb6de70fd6 100644
--- a/x11-plugins/wmbiff/ChangeLog
+++ b/x11-plugins/wmbiff/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-plugins/wmbiff
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/ChangeLog,v 1.11 2004/06/24 23:05:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/ChangeLog,v 1.12 2004/07/25 20:50:51 s4t4n Exp $
+
+*wmbiff-0.4.25 (25 Jul 2004)
+
+  25 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmbiff-0.4.25.ebuild:
+  Version bump, closes #57965. Update ebuild not to install the gnutls/libgcrypt
+  patch as the issue has been solved upstream. Also install a sample .wmbiffrc file.
+  wmbiff-0.4.15.ebuild, wmbiff-0.4.17.ebuild:
+  Wipe out old ebuilds.
 
   26 Apr 2004; Aron Griffis <agriffis@gentoo.org> wmbiff-0.4.15.ebuild:
   Add die following econf for bug 48950
diff --git a/x11-plugins/wmbiff/Manifest b/x11-plugins/wmbiff/Manifest
index f10a682b0625..2974e9bea7a3 100644
--- a/x11-plugins/wmbiff/Manifest
+++ b/x11-plugins/wmbiff/Manifest
@@ -1,9 +1,7 @@
-MD5 4d4ff3b715ee244e69683959ba049d23 wmbiff-0.4.15.ebuild 659
-MD5 b2870f7a68691c5ea80b7328d6e52d15 wmbiff-0.4.17.ebuild 1019
-MD5 41857a159b96df7f787c7d8507116e8c ChangeLog 1417
+MD5 010c940635f2c2c046f9d5a171b8e475 ChangeLog 1755
 MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
+MD5 fc704e0bbbaba31f7248150b738a540b wmbiff-0.4.25.ebuild 1045
 MD5 27138b124416b5509df89292bb40c892 wmbiff-0.4.20.ebuild 980
-MD5 8391e3fac11ce2c658e6c7b8803321de files/digest-wmbiff-0.4.15 65
-MD5 1c3db557c466c299ecf1fcf38194b155 files/digest-wmbiff-0.4.17 65
 MD5 218b9bd8a41dfb0bcf674649d9fbc46e files/digest-wmbiff-0.4.20 65
+MD5 e84517c77095652edc87803d423092d1 files/digest-wmbiff-0.4.25 65
 MD5 08fb71973cf15498b2586af8e4c5656e files/wmbiff-0.4.20-crypto-api-fix.patch 3547
diff --git a/x11-plugins/wmbiff/files/digest-wmbiff-0.4.15 b/x11-plugins/wmbiff/files/digest-wmbiff-0.4.15
deleted file mode 100644
index 67e813e1dca3..000000000000
--- a/x11-plugins/wmbiff/files/digest-wmbiff-0.4.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0da40f7826b864dab1f4e9e4a9c0d216 wmbiff-0.4.15.tar.gz 179058
diff --git a/x11-plugins/wmbiff/files/digest-wmbiff-0.4.17 b/x11-plugins/wmbiff/files/digest-wmbiff-0.4.17
deleted file mode 100644
index 8b1a2e9948ce..000000000000
--- a/x11-plugins/wmbiff/files/digest-wmbiff-0.4.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 914820af94ee3221ad06683c99c16044 wmbiff-0.4.17.tar.gz 189615
diff --git a/x11-plugins/wmbiff/files/digest-wmbiff-0.4.25 b/x11-plugins/wmbiff/files/digest-wmbiff-0.4.25
new file mode 100644
index 000000000000..e65ac741657e
--- /dev/null
+++ b/x11-plugins/wmbiff/files/digest-wmbiff-0.4.25
@@ -0,0 +1 @@
+MD5 bf80e6b3e8c2776ec1f82060c941f81d wmbiff-0.4.25.tar.gz 200270
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.15.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.15.ebuild
deleted file mode 100644
index 357566bd56d3..000000000000
--- a/x11-plugins/wmbiff/wmbiff-0.4.15.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.10 2004/06/24 23:05:24 agriffis 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"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc amd64 ppc"
-IUSE=""
-
-src_compile() {
-	cd ${S}
-	econf || die "econf failed"
-	emake || die
-}
-
-src_install () {
-	einstall
-	dodoc ChangeLog  FAQ NEWS  README  README.licq  TODO
-}
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.17.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild
index b50376d9339d..a6c6c03cbba4 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.17.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild
@@ -1,29 +1,35 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.4 2004/06/24 23:05:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild,v 1.1 2004/07/25 20:50:51 s4t4n 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 )"
+		crypt? ( >=net-libs/gnutls-1.0.4
+			>=dev-libs/libgcrypt-1.1.94 )"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~amd64 ppc"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
 IUSE="crypt"
 
+#This has been fixed upstream
+#src_unpack() {
+#	unpack ${A}
+#	cd ${S}
+#	if use crypt; then
+#		if has_version ">dev-libs/libgcrypt-1.1.12"; then
+#			epatch ${FILESDIR}/${P}-crypto-api-fix.patch
+#		fi
+#	fi
+#}
+
 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
+	if ! use crypt; then
+			myconf="--disable-crypto"
 	fi
 	econf ${myconf} || die
 	emake || die
@@ -31,5 +37,5 @@ src_compile() {
 
 src_install () {
 	make DESTDIR="${D}" install || die
-	dodoc ChangeLog  FAQ NEWS  README  README.licq  TODO
+	dodoc ChangeLog  FAQ NEWS  README  README.licq  TODO  wmbiff/sample.wmbiffrc
 }