Remove old versions and mark latest stable for amd64 wrt #204554. Sanitize ebuild.

Package-Manager: portage-2.1.4_rc14

8 files changed, 33 insertions, 158 deletions

diff --git a/x11-plugins/wmbiff/ChangeLog b/x11-plugins/wmbiff/ChangeLog
index 5f932ad32f19..48db17746eaf 100644
--- a/x11-plugins/wmbiff/ChangeLog
+++ b/x11-plugins/wmbiff/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/wmbiff
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/ChangeLog,v 1.27 2007/07/22 05:24:06 dberkholz Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/ChangeLog,v 1.28 2008/01/06 21:22:11 drac Exp $
+
+  06 Jan 2008; Samuli Suominen <drac@gentoo.org> -wmbiff-0.4.25.ebuild,
+  -wmbiff-0.4.25-r1.ebuild, wmbiff-0.4.27.ebuild:
+  Remove old versions and mark latest stable for amd64 wrt #204554. Sanitize
+  ebuild.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmbiff-0.4.25.ebuild,
   wmbiff-0.4.25-r1.ebuild, wmbiff-0.4.27.ebuild:
diff --git a/x11-plugins/wmbiff/Manifest b/x11-plugins/wmbiff/Manifest
index ab659ae2c73f..73ed70146daa 100644
--- a/x11-plugins/wmbiff/Manifest
+++ b/x11-plugins/wmbiff/Manifest
@@ -1,35 +1,16 @@
-AUX wmbiff-0.4.25-crypto-api-fix.patch 646 RMD160 6ff79d644b0cfcc3f1e8c65b583f0b7f226eede1 SHA1 4290afe621786b42e2ce0996f37762b8c926f265 SHA256 18c3f69b491329a58f5c9de6f74e859f9496a831cd31e3342ce246599d1c27dd
-MD5 988ba1c28ca012c99a062db781ef997c files/wmbiff-0.4.25-crypto-api-fix.patch 646
-RMD160 6ff79d644b0cfcc3f1e8c65b583f0b7f226eede1 files/wmbiff-0.4.25-crypto-api-fix.patch 646
-SHA256 18c3f69b491329a58f5c9de6f74e859f9496a831cd31e3342ce246599d1c27dd files/wmbiff-0.4.25-crypto-api-fix.patch 646
-DIST wmbiff-0.4.25.tar.gz 200270 RMD160 2cf1964a5e40b5304879bb3b8eba2c2849e3ef66 SHA1 c5529766c55d692e2a76eaeb21d9c231da0780a8 SHA256 f21aa4beec92a702743a5f88f1cd7ac1e18b0ac92e31f3c6f30aa2bca6598df4
 DIST wmbiff-0.4.27.tar.gz 201713 RMD160 d1d8831967b0539d56eb0d77286442ebafb8a6b8 SHA1 2c84993d78e22b5061192412161bc27a2a1a3007 SHA256 c25b7b3d3a5ddbbfa9f85bb39f553f5bc001189fc624e6761d986369068d7da3
-EBUILD wmbiff-0.4.25-r1.ebuild 1122 RMD160 acaf92b83e576800cbc5412655e54d60c3989a08 SHA1 669bf59d6ad9ed614e83f7e3ad4a974cc8d95ccb SHA256 134f5b351e1f1306c74c52e7ed2130520e161f1f6bc7b18bf1d6e2279780c190
-MD5 5083d7c4d3123281d86743966e697217 wmbiff-0.4.25-r1.ebuild 1122
-RMD160 acaf92b83e576800cbc5412655e54d60c3989a08 wmbiff-0.4.25-r1.ebuild 1122
-SHA256 134f5b351e1f1306c74c52e7ed2130520e161f1f6bc7b18bf1d6e2279780c190 wmbiff-0.4.25-r1.ebuild 1122
-EBUILD wmbiff-0.4.25.ebuild 934 RMD160 fdc66b2b26cfbd07bb70f98df5e5639b2b3d9e15 SHA1 1ed076e4cbc4c05961916a88001c8bd98d84ac64 SHA256 7a2f053c880bf2174199ca71df2ba153a49736dd39160b2403dfee2c4654a0c6
-MD5 45b88077283f5270cd8466f99e6b6ac1 wmbiff-0.4.25.ebuild 934
-RMD160 fdc66b2b26cfbd07bb70f98df5e5639b2b3d9e15 wmbiff-0.4.25.ebuild 934
-SHA256 7a2f053c880bf2174199ca71df2ba153a49736dd39160b2403dfee2c4654a0c6 wmbiff-0.4.25.ebuild 934
-EBUILD wmbiff-0.4.27.ebuild 933 RMD160 7cf6af1663e917b73b7766324ed13e91dd2ec1c4 SHA1 40b152818a24499045341a54617a74edc5f4750a SHA256 2ea0d5dc16c04cc379c122613f398bf5c27294d8406fbd649325c831f068c0d1
-MD5 a9d7f0ad7dd14b9701f021c0348c076e wmbiff-0.4.27.ebuild 933
-RMD160 7cf6af1663e917b73b7766324ed13e91dd2ec1c4 wmbiff-0.4.27.ebuild 933
-SHA256 2ea0d5dc16c04cc379c122613f398bf5c27294d8406fbd649325c831f068c0d1 wmbiff-0.4.27.ebuild 933
-MISC ChangeLog 3413 RMD160 47393ab8a4c8b25313438fb72016cbd22b1c3764 SHA1 de361aec05a32367fea021d099e50d48c73e83ca SHA256 1973cd5d92539b09d2f639099f849a1dca87a1b56911a15d3b4200ba8741c325
-MD5 a52cc9386330f0b2d465eab670d37fe9 ChangeLog 3413
-RMD160 47393ab8a4c8b25313438fb72016cbd22b1c3764 ChangeLog 3413
-SHA256 1973cd5d92539b09d2f639099f849a1dca87a1b56911a15d3b4200ba8741c325 ChangeLog 3413
+EBUILD wmbiff-0.4.27.ebuild 904 RMD160 d6fde92b171b0d11a273da8eceddeac90e89317d SHA1 8167ce85eb6a1681ff53daebfefec8792f0a561f SHA256 36b26e5f65c350c8158da5ca1fc5185dcdd3d4f60bc9c2d08cf5c0912da2e321
+MD5 7e33fc7f88a62b2af6f4acc73f6a5fbd wmbiff-0.4.27.ebuild 904
+RMD160 d6fde92b171b0d11a273da8eceddeac90e89317d wmbiff-0.4.27.ebuild 904
+SHA256 36b26e5f65c350c8158da5ca1fc5185dcdd3d4f60bc9c2d08cf5c0912da2e321 wmbiff-0.4.27.ebuild 904
+MISC ChangeLog 3618 RMD160 bde0cbade51e20ab873ce03347115135fd7457a0 SHA1 8e10ce0874f9fe9256dd483c753756aff072db77 SHA256 5b003d158682f9c1bdd69bb3a76cd2d2c42ee5eb4f3910fe5e94aedcee1ca5d5
+MD5 a3e3b5012bfbf4d3b13a5a33458c30dc ChangeLog 3618
+RMD160 bde0cbade51e20ab873ce03347115135fd7457a0 ChangeLog 3618
+SHA256 5b003d158682f9c1bdd69bb3a76cd2d2c42ee5eb4f3910fe5e94aedcee1ca5d5 ChangeLog 3618
 MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c metadata.xml 165
 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b metadata.xml 165
-MD5 4248a1e5c61c18196eb9c1138e6b8dad files/digest-wmbiff-0.4.25 241
-RMD160 6140b17713df6acb541a4bfa8ea11c25409269ef files/digest-wmbiff-0.4.25 241
-SHA256 7f609738da92ee6f2a2e55f5e9aedb671a78335d9a219b2f290faf19efc53fb9 files/digest-wmbiff-0.4.25 241
-MD5 4248a1e5c61c18196eb9c1138e6b8dad files/digest-wmbiff-0.4.25-r1 241
-RMD160 6140b17713df6acb541a4bfa8ea11c25409269ef files/digest-wmbiff-0.4.25-r1 241
-SHA256 7f609738da92ee6f2a2e55f5e9aedb671a78335d9a219b2f290faf19efc53fb9 files/digest-wmbiff-0.4.25-r1 241
 MD5 a57921df87e99818f45ad493c5d2d30f files/digest-wmbiff-0.4.27 241
 RMD160 eaf5b5eb88b3631fd768f7eeb631e09e2d3c6016 files/digest-wmbiff-0.4.27 241
 SHA256 39c2f0df884d0da899956a90a35a422d404dd8ffebae3de5ea1d7912ff74ddc5 files/digest-wmbiff-0.4.27 241
diff --git a/x11-plugins/wmbiff/files/digest-wmbiff-0.4.25 b/x11-plugins/wmbiff/files/digest-wmbiff-0.4.25
deleted file mode 100644
index 83516770cf19..000000000000
--- a/x11-plugins/wmbiff/files/digest-wmbiff-0.4.25
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bf80e6b3e8c2776ec1f82060c941f81d wmbiff-0.4.25.tar.gz 200270
-RMD160 2cf1964a5e40b5304879bb3b8eba2c2849e3ef66 wmbiff-0.4.25.tar.gz 200270
-SHA256 f21aa4beec92a702743a5f88f1cd7ac1e18b0ac92e31f3c6f30aa2bca6598df4 wmbiff-0.4.25.tar.gz 200270
diff --git a/x11-plugins/wmbiff/files/digest-wmbiff-0.4.25-r1 b/x11-plugins/wmbiff/files/digest-wmbiff-0.4.25-r1
deleted file mode 100644
index 83516770cf19..000000000000
--- a/x11-plugins/wmbiff/files/digest-wmbiff-0.4.25-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bf80e6b3e8c2776ec1f82060c941f81d wmbiff-0.4.25.tar.gz 200270
-RMD160 2cf1964a5e40b5304879bb3b8eba2c2849e3ef66 wmbiff-0.4.25.tar.gz 200270
-SHA256 f21aa4beec92a702743a5f88f1cd7ac1e18b0ac92e31f3c6f30aa2bca6598df4 wmbiff-0.4.25.tar.gz 200270
diff --git a/x11-plugins/wmbiff/files/wmbiff-0.4.25-crypto-api-fix.patch b/x11-plugins/wmbiff/files/wmbiff-0.4.25-crypto-api-fix.patch
deleted file mode 100644
index eb99b8f430d2..000000000000
--- a/x11-plugins/wmbiff/files/wmbiff-0.4.25-crypto-api-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur wmbiff-0.4.25-orig/wmbiff/tlsComm.c wmbiff-0.4.25/wmbiff/tlsComm.c
---- wmbiff-0.4.25-orig/wmbiff/tlsComm.c	2004-06-23 17:44:45.000000000 -0400
-+++ wmbiff-0.4.25/wmbiff/tlsComm.c	2005-03-17 13:07:28.643262198 -0500
-@@ -407,10 +407,6 @@
- 							"server's certificate is invalid or not X.509.\n"
- 							"there may be a problem with the certificate stored in your certfile\n");
- 		}
--	} else if (certstat & GNUTLS_CERT_NOT_TRUSTED) {
--		TDM(DEBUG_INFO, "server's certificate is not trusted.\n");
--		TDM(DEBUG_INFO,
--			"to verify that a certificate is trusted, use the certfile option.\n");
- 	}
- 
- 	if (gnutls_x509_crt_init(&cert) < 0) {
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.25-r1.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.25-r1.ebuild
deleted file mode 100644
index 3d9d7fe42db7..000000000000
--- a/x11-plugins/wmbiff/wmbiff-0.4.25-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.25-r1.ebuild,v 1.6 2007/07/22 05:24:06 dberkholz Exp $
-
-inherit eutils
-
-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/"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	crypt? ( >=net-libs/gnutls-1.0.4
-		>=dev-libs/libgcrypt-1.1.94 )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc sparc x86"
-IUSE="crypt"
-
-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
-			myconf="--disable-crypto"
-	fi
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install()
-{
-	make DESTDIR="${D}" install || die
-	dodoc ChangeLog  FAQ NEWS  README  README.licq  TODO  wmbiff/sample.wmbiffrc
-}
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild
deleted file mode 100644
index bbab36e718c8..000000000000
--- a/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild,v 1.8 2007/07/22 05:24:06 dberkholz 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/"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	crypt? ( >=net-libs/gnutls-1.0.4
-		>=dev-libs/libgcrypt-1.1.94 )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc amd64 ppc"
-IUSE="crypt"
-
-src_compile() {
-	local myconf
-	if ! use crypt; then
-			myconf="--disable-crypto"
-	fi
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die
-	dodoc ChangeLog  FAQ NEWS  README  README.licq  TODO  wmbiff/sample.wmbiffrc
-}
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild
index 880f91d9930a..93ba9aec940a 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild
@@ -1,37 +1,31 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild,v 1.6 2007/07/22 05:24:06 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild,v 1.7 2008/01/06 21:22:11 drac 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/"
+SRC_URI="mirror://sourceforge/wmbiff/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="crypt"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
+	x11-libs/libXpm
 	crypt? ( >=net-libs/gnutls-1.2.3
 		>=dev-libs/libgcrypt-1.2.1 )"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto"
 
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc sparc x86"
-IUSE="crypt"
-
-src_compile()
-{
-	local myconf
-	if ! use crypt; then
-			myconf="--disable-crypto"
-	fi
-	econf ${myconf} || die
-	emake || die
+src_compile() {
+	econf $(use_enable crypt crypto)
+	emake || die "emake failed."
 }
 
-src_install()
-{
-	make DESTDIR="${D}" install || die
-	dodoc ChangeLog  FAQ NEWS  README  README.licq  TODO  wmbiff/sample.wmbiffrc
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc ChangeLog FAQ NEWS README README.licq TODO wmbiff/sample.wmbiffrc
 }