Fix deps on gmime since it is now slotted, bug #239412. remove old revisions.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.24-gentoo-r8 i686

12 files changed, 32 insertions, 335 deletions

diff --git a/net-nntp/pan/ChangeLog b/net-nntp/pan/ChangeLog
index b6a3eec9613b..a1241d90e59f 100644
--- a/net-nntp/pan/ChangeLog
+++ b/net-nntp/pan/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-nntp/pan
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/ChangeLog,v 1.71 2008/10/03 13:23:13 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/ChangeLog,v 1.72 2008/10/04 11:11:38 eva Exp $
+
+  04 Oct 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/pan-0.14.2.91-gcc4-2.patch,
+  -files/pan-0.14.2-update-desktop-file.patch, -pan-0.14.2.ebuild,
+  -pan-0.14.2.91-r2.ebuild, -pan-0.14.2.91-r3.ebuild, -pan-0.132-r1.ebuild,
+  -pan-0.132-r2.ebuild, pan-0.132-r3.ebuild, pan-0.133.ebuild,
+  pan-9999.ebuild:
+  Fix deps on gmime since it is now slotted, bug #239412. remove old
+  revisions.
 
   03 Oct 2008; Friedrich Oslage <bluebird@gentoo.org> pan-0.133.ebuild:
   Stable on sparc, bug #239378
diff --git a/net-nntp/pan/Manifest b/net-nntp/pan/Manifest
index f7c2d8d1319e..eb209c4ed5f3 100644
--- a/net-nntp/pan/Manifest
+++ b/net-nntp/pan/Manifest
@@ -1,20 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX load-pixbuf-in-1024-byte-chunks.diff 914 RMD160 fab3b1ec861d92d90f9899304229a6e741dbb5c8 SHA1 371e9376db3808a0d0b98f04699a3afe43cb9ed8 SHA256 e76d46ad9b26fd6737d760c7a2d22bf082d3b52fcde81a142abb13302371fc5a
 AUX pan-0.132-CVE-2008-2363.patch 2496 RMD160 478992d13cfab47b480adbbe0f5eb6c96b96fe5d SHA1 6415adb947c564ba17892e82fff7c3122b028869 SHA256 64874a5bce5a53a5c7932367cd982b51605f1a304b52ed2e3aeae39f02dcf687
 AUX pan-0.132-gcc43-fixes.patch 2065 RMD160 7c89f27fd7b4ff8bceed97ce953276769d910b2b SHA1 8d272ca74f6527c80f53f3ba6d73a2ea4af387ca SHA256 a09a3d7851dd22444503d9298e1403a7243560d868a8f5c38a73914f105ef449
 AUX pan-0.132-glib-compat.patch 25299 RMD160 b4244ccfe242b40bdb1e9b90584c9afb70e3fea2 SHA1 a8488a3ca10470c2bf7c394481521b05513cd50c SHA256 67a63bc9f4e945e2a123c33694a5052c47a9173e05206dfb30e7df4007b3af2e
-AUX pan-0.14.2-update-desktop-file.patch 1028 RMD160 12a05a7a1050b9d10d0ece9a117ecec930e4f6c2 SHA1 c2f41ecbccf27f440d61414b535b8112b13aff7b SHA256 ee4b8d882baf52c19ac5b2897fbaa05dfd6efd6b066fc65eea7b4d53d7d99606
-AUX pan-0.14.2.91-gcc4-2.patch 698 RMD160 cca70799a8507af85b2c60857bade4618f7fa75d SHA1 7c9014647cb44469ba343579525fed35a33763e9 SHA256 fd2ecb4b72c8046d30ef9dec43c088d5d346690c332a7b7dd9b66076b3ff7538
 DIST pan-0.132.tar.bz2 1466359 RMD160 8e9bd2b2851cf1794b975ed31317e9ce837a2851 SHA1 dc0bf586145b9d617039f49101874fbc76a9dc18 SHA256 8695cf02f7664ac9aae39fc3edfc513f9856fb0fe19aa19cae006737994da577
 DIST pan-0.133.tar.bz2 1452883 RMD160 cfa84e32d6d82731df582e1336f9deffc97aaabd SHA1 a0bd98ea1ba174800896611e3305a6b6d8dbde2f SHA256 e2494d89a5c3150d97f38af22ad6938f6ff29c64628c67e716d98a566f368e91
-DIST pan-0.14.2.91.tar.bz2 1919099 RMD160 372012f9f23ef1654125977ff4dee193021fb733 SHA1 1a321bd7425350a1991e6802b05bcea8b744f923 SHA256 1658c22fbe29ac0b88d2ae8e487247bad40618809719819297ecf0b7ae69a9ab
-DIST pan-0.14.2.tar.bz2 1834784 RMD160 0dff24b1d83b6fabfb9cc38a7dea5f9e99513009 SHA1 39c0128906d389524e24d55691e017cf509516a0 SHA256 d864907d3179cde5bdd7afa02c8a2bd00f1d23ce6053f704f64e7814c7f6aba4
-EBUILD pan-0.132-r1.ebuild 1075 RMD160 5379333fe24d16446f0e6e7a02ec10d7256c1abd SHA1 261cc02c5c072adc1a3ed013001922a32e6dcce5 SHA256 e20d6354f0193a1cd372168ab0970774668e6c34ddee1073da5a1ac6315c0da4
-EBUILD pan-0.132-r2.ebuild 1262 RMD160 af9d1f013f74f5fbd186a9ac343e5c1d17e8ab84 SHA1 51618e1a49bd03526f9cc458d107b8d32f3ed423 SHA256 739c3c2a05f152c7f975d78fc94a395b386fc484063b0bbf4a524a969b989666
-EBUILD pan-0.132-r3.ebuild 1327 RMD160 b52b0105167aab5b93d2c03e04cfa97b39687cd9 SHA1 c99ff4a0276c45c310ecaf1bf622f7bba35d2b6a SHA256 29ee5b1f783f424411124bd4c92c830815fe99cface3ac060f0cfe1c35406d44
-EBUILD pan-0.133.ebuild 954 RMD160 532ea77fd2ea47496b418aeaeab94dc522b2c1c3 SHA1 6e69538a3814fcd899fd93e23f8076216c118fa2 SHA256 013e564fd53f963ce7034554ea4d6ca9241406cd41a3d3fcf8c9d8828d17945b
-EBUILD pan-0.14.2.91-r2.ebuild 1491 RMD160 4dfe6c23fe4e3223dfe0305f0abcc1288a43a1a3 SHA1 77a8a7c0234fa8b64bdd961198ee2b497519f86f SHA256 2f3da49aab71628d1f16351c2bc20b499087ae28b43aba4a856e5495ca3cd314
-EBUILD pan-0.14.2.91-r3.ebuild 1596 RMD160 437145972c0077551de052271098dc7e98835f52 SHA1 e6ab1a778b03cb7ad91fe5c459eee2479edf32c0 SHA256 85f19b7afbe537c6f232f765fc9e40026aa998fdff9bbafb7ffe802b11bb82be
-EBUILD pan-0.14.2.ebuild 1428 RMD160 41f6e981fda0f4b5759a35965811674b6cf1b4b9 SHA1 0f8a043b484362e083666396a6f753a8ed3150ba SHA256 7372d3323f32d5668acde7e57964f355fa1bcdb2a6a9c42693531fd7d66d8a24
-EBUILD pan-9999.ebuild 1257 RMD160 413365baba2719f28bf2279e69851cf7c30fd764 SHA1 4c6154c18e8d3e512111e9470a5de90ac8d7f92e SHA256 769656fdd82901f8a8c5a64ac53c5ecdaa3f3a514839363fde50b1126bb0e991
-MISC ChangeLog 15670 RMD160 7f4707a92a995efaf0198f8f91f41d6f2a9d07b9 SHA1 5746c523451cae68d7e6d6a41f02a206ce85a0c7 SHA256 6b224bbe337054e7fdd11ab39b5b760b2a7d0afdf40d4f65cb96692a91c38983
+EBUILD pan-0.132-r3.ebuild 1325 RMD160 59f3556f5af91a63a9e50566d1b983a92604efd7 SHA1 ee76027381a308b450ab61a86709c221cae3505b SHA256 05fe476cf58f90f3bfe4de5c37bbc4f9ecf1c8c0ac861bd96d13733ff5803dbd
+EBUILD pan-0.133.ebuild 925 RMD160 1a8eb54591498f67a0cfa8af65c9baab20114d9c SHA1 b3f2383dbcd8181c9178180b50dbb194273c486d SHA256 3fd41a3f4a4e5d51226663da8e062a7966bff96e0fd29efa26a81e6435b6a9ff
+EBUILD pan-9999.ebuild 1233 RMD160 4b027d6c082bd1e2a098d7c78765b3b89d481c7f SHA1 8269d54b07499ac2e6a50aaf8214b341a0e481f8 SHA256 867c5671859aaf3c359a18bc1cbe59fc68805d1e29f6c3744f09ef48b5248e47
+MISC ChangeLog 16064 RMD160 98714ea8bb31807385cb738175b7c79582a54ab3 SHA1 88e592b4211a333c97c293178dc5670968e859ae SHA256 38ce98ed5f7828a32a04f91b2ef335856c29206c47986ce72ea21e17aa0a633d
 MISC metadata.xml 180 RMD160 797b69d3fd6f36d441bda500c1310c91837720a4 SHA1 e2e177f18436d4250aadeadfd6ec27639861290e SHA256 1bb112215f4f710d26b79a43b61ec93003963663cfdec7b3b7173cfdbf85f52c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjnT4AACgkQ1fmVwcYIWAZmSwCdH2CcY3ECilKv+RwlBBrL9rju
+O0IAniFRQEAKWA2g9wHBeZAOrELF5luK
+=DXGO
+-----END PGP SIGNATURE-----
diff --git a/net-nntp/pan/files/pan-0.14.2-update-desktop-file.patch b/net-nntp/pan/files/pan-0.14.2-update-desktop-file.patch
deleted file mode 100644
index 54e99cde7116..000000000000
--- a/net-nntp/pan/files/pan-0.14.2-update-desktop-file.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- pan-0.14.2.91/Makefile.am	2005-07-03 21:11:21.000000000 +0200
-+++ pan-0.14.2.91.az/Makefile.am	2005-07-03 21:12:03.000000000 +0200
-@@ -18,7 +18,7 @@
- 	     $(DESKTOP_FILES) \
-              intltool-extract.in intltool-merge.in intltool-update.in
- 
--Productivitydir = $(datadir)/gnome/apps/Internet
-+Productivitydir = $(datadir)/applications
- Productivity_DATA = $(DESKTOP_FILES)
- 
- icon_DATA = pan.png
---- pan-0.14.2.91/Makefile.in	2005-07-03 21:11:27.000000000 +0200
-+++ pan-0.14.2.91.az/Makefile.in	2005-07-03 21:12:20.000000000 +0200
-@@ -148,7 +148,7 @@
-              intltool-extract.in intltool-merge.in intltool-update.in
- 
- 
--Productivitydir = $(datadir)/gnome/apps/Internet
-+Productivitydir = $(datadir)/applications
- Productivity_DATA = $(DESKTOP_FILES)
- 
- icon_DATA = pan.png
---- pan-0.14.2.91/pan.desktop.in	2005-07-03 21:10:11.000000000 +0200
-+++ pan-0.14.2.91.az/pan.desktop.in	2005-07-03 21:10:28.000000000 +0200
-@@ -6,3 +6,4 @@
- Icon=pan.png
- Terminal=false
- Type=Application
-+Categories=Application;Network;
diff --git a/net-nntp/pan/files/pan-0.14.2.91-gcc4-2.patch b/net-nntp/pan/files/pan-0.14.2.91-gcc4-2.patch
deleted file mode 100644
index 1edb35bfa0fd..000000000000
--- a/net-nntp/pan/files/pan-0.14.2.91-gcc4-2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- pan-0.14.2.91/pan/base/msort.c.orig	2005-04-25 15:54:31.000000000 +0000
-+++ pan-0.14.2.91/pan/base/msort.c	2005-04-25 15:59:21.000000000 +0000
-@@ -65,14 +65,16 @@
- 			if ((*cmp) (b1, b2) <= 0)
- 			{
- 				--n1;
--				*((unsigned long int *) tmp)++ =
--					*((unsigned long int *) b1)++;
-+				*((unsigned long int *) tmp) = *((unsigned long int *) b1);
-+				tmp += sizeof(unsigned long int);
-+				b1 += sizeof(unsigned long int);
- 			}
- 			else
- 			{
- 				--n2;
--				*((unsigned long int *) tmp)++ =
--					*((unsigned long int *) b2)++;
-+				*((unsigned long int *) tmp) = *((unsigned long int *) b2);
-+				tmp += sizeof(unsigned long int);
-+				b2 += sizeof(unsigned long int);
- 			}
- 		}
- 	else
diff --git a/net-nntp/pan/pan-0.132-r1.ebuild b/net-nntp/pan/pan-0.132-r1.ebuild
deleted file mode 100644
index ac0cf3fca978..000000000000
--- a/net-nntp/pan/pan-0.132-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/pan-0.132-r1.ebuild,v 1.5 2008/01/25 21:38:21 philantrop Exp $
-
-inherit eutils
-
-DESCRIPTION="A newsreader for the Gnome2 desktop"
-HOMEPAGE="http://pan.rebelbase.com/"
-SRC_URI="http://pan.rebelbase.com/download/releases/${PV}/source/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="spell"
-
-RDEPEND=">=dev-libs/glib-2.4.0
-	>=x11-libs/gtk+-2.4.0
-	>=dev-libs/libpcre-5.0
-	>=dev-libs/gmime-2.1.9
-	spell? ( >=app-text/gtkspell-2.0.7 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.21
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/load-pixbuf-in-1024-byte-chunks.diff
-}
-
-src_compile() {
-	econf $(use_with spell gtkspell) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
-}
diff --git a/net-nntp/pan/pan-0.132-r2.ebuild b/net-nntp/pan/pan-0.132-r2.ebuild
deleted file mode 100644
index ad6735f4dcf5..000000000000
--- a/net-nntp/pan/pan-0.132-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/pan-0.132-r2.ebuild,v 1.4 2008/06/21 20:04:14 corsair Exp $
-
-inherit eutils
-
-DESCRIPTION="A newsreader for the Gnome2 desktop"
-HOMEPAGE="http://pan.rebelbase.com/"
-SRC_URI="http://pan.rebelbase.com/download/releases/${PV}/source/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ppc ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="spell"
-
-RDEPEND=">=dev-libs/glib-2.4.0
-	>=x11-libs/gtk+-2.4.0
-	>=dev-libs/libpcre-5.0
-	>=dev-libs/gmime-2.1.9
-	spell? ( >=app-text/gtkspell-2.0.7 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.21
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/load-pixbuf-in-1024-byte-chunks.diff
-
-	# Fix compilation with >=glib-2.16, bug #214446
-	epatch "${FILESDIR}/${P}-glib-compat.patch"
-
-	# Fix compilation with gcc-4.3, bug #211670
-	epatch "${FILESDIR}/${P}-gcc43-fixes.patch"
-}
-
-src_compile() {
-	econf $(use_with spell gtkspell) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
-}
diff --git a/net-nntp/pan/pan-0.132-r3.ebuild b/net-nntp/pan/pan-0.132-r3.ebuild
index 1446bede4c6c..008815d432e2 100644
--- a/net-nntp/pan/pan-0.132-r3.ebuild
+++ b/net-nntp/pan/pan-0.132-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/pan-0.132-r3.ebuild,v 1.6 2008/06/30 16:10:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/pan-0.132-r3.ebuild,v 1.7 2008/10/04 11:11:38 eva Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ IUSE="spell"
 RDEPEND=">=dev-libs/glib-2.4.0
 	>=x11-libs/gtk+-2.4.0
 	>=dev-libs/libpcre-5.0
-	>=dev-libs/gmime-2.1.9
+	=dev-libs/gmime-2.2*
 	spell? ( >=app-text/gtkspell-2.0.7 )"
 
 DEPEND="${RDEPEND}
diff --git a/net-nntp/pan/pan-0.133.ebuild b/net-nntp/pan/pan-0.133.ebuild
index 918fa4a2af55..a13b377702f3 100644
--- a/net-nntp/pan/pan-0.133.ebuild
+++ b/net-nntp/pan/pan-0.133.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/pan-0.133.ebuild,v 1.5 2008/10/03 13:23:13 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/pan-0.133.ebuild,v 1.6 2008/10/04 11:11:38 eva Exp $
 
 DESCRIPTION="A newsreader for the Gnome2 desktop"
 HOMEPAGE="http://pan.rebelbase.com/"
@@ -14,7 +14,7 @@ IUSE="spell"
 RDEPEND=">=dev-libs/glib-2.4.0
 	>=x11-libs/gtk+-2.4.0
 	>=dev-libs/libpcre-5.0
-	>=dev-libs/gmime-2.1.9
+	=dev-libs/gmime-2.2*
 	spell? ( >=app-text/gtkspell-2.0.7 )"
 
 DEPEND="${RDEPEND}
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 src_compile() {
-	econf $(use_with spell gtkspell) || die "econf failed"
+	econf $(use_with spell gtkspell)
 	emake || die "emake failed"
 }
 
diff --git a/net-nntp/pan/pan-0.14.2.91-r2.ebuild b/net-nntp/pan/pan-0.14.2.91-r2.ebuild
deleted file mode 100644
index 235af3832dd1..000000000000
--- a/net-nntp/pan/pan-0.14.2.91-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/pan-0.14.2.91-r2.ebuild,v 1.4 2007/08/13 21:50:39 dertobi123 Exp $
-
-inherit eutils libtool
-
-IUSE="nls spell"
-
-DESCRIPTION="A newsreader for the Gnome2 desktop"
-SRC_URI="http://pan.rebelbase.com/download/releases/${PV}/SOURCE/${P}.tar.bz2"
-HOMEPAGE="http://pan.rebelbase.com/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ppc ppc64 ~sparc ~x86"
-SLOT="0"
-
-RDEPEND=">=dev-libs/glib-2.0.4
-	>=x11-libs/gtk+-2.0.5
-	>=dev-libs/libxml2-2.4.22
-	>=net-libs/gnet-1.1.8
-	>=dev-libs/libpcre-4.0
-	spell? ( >=app-text/gtkspell-2.0.2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.21
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	# Likely that glibc might of been compiled with nls turned off.
-	# Warn people that Pan requires glibc to have nls support.
-	if ! use nls
-	then
-		ewarn "Pan requires glibc to be merged with 'nls' in your USE flags."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix for building with gcc4
-	epatch "${FILESDIR}"/${P}-gcc4-2.patch
-
-	elibtoolize || die "elibtoolize failed"
-}
-
-src_compile() {
-	econf $(use_enable spell gtkspell) || die "Configure failure"
-	emake || die "Compilation failure"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "Installation failed"
-	dodoc AUTHORS ChangeLog CREDITS NEWS README TODO || die "dodoc failed"
-	dohtml ANNOUNCE.html docs/{pan-shortcuts,faq}.html || die "dodoc failed"
-}
diff --git a/net-nntp/pan/pan-0.14.2.91-r3.ebuild b/net-nntp/pan/pan-0.14.2.91-r3.ebuild
deleted file mode 100644
index ef83e4934c94..000000000000
--- a/net-nntp/pan/pan-0.14.2.91-r3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/pan-0.14.2.91-r3.ebuild,v 1.3 2006/11/04 01:19:52 swegener Exp $
-
-inherit eutils libtool
-
-IUSE="nls spell"
-
-DESCRIPTION="A newsreader for the Gnome2 desktop"
-SRC_URI="http://pan.rebelbase.com/download/releases/${PV}/SOURCE/${P}.tar.bz2"
-HOMEPAGE="http://pan.rebelbase.com/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-
-RDEPEND=">=dev-libs/glib-2.0.4
-	>=x11-libs/gtk+-2.0.5
-	>=dev-libs/libxml2-2.4.22
-	>=net-libs/gnet-1.1.8
-	>=dev-libs/libpcre-4.0
-	spell? ( >=app-text/gtkspell-2.0.2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.21
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	# Likely that glibc might of been compiled with nls turned off.
-	# Warn people that Pan requires glibc to have nls support.
-	if ! use nls
-	then
-		ewarn "Pan requires glibc to be merged with 'nls' in your USE flags."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix for building with gcc4
-	epatch "${FILESDIR}"/${P}-gcc4-2.patch
-	# Update desktop file location and format.
-	epatch "${FILESDIR}"/${PN}-0.14.2-update-desktop-file.patch
-
-	elibtoolize || die "elibtoolize failed"
-}
-
-src_compile() {
-	econf $(use_enable spell gtkspell) || die "Configure failure"
-	emake || die "Compilation failure"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "Installation failed"
-	dodoc AUTHORS ChangeLog CREDITS NEWS README TODO || die "dodoc failed"
-	dohtml ANNOUNCE.html docs/{pan-shortcuts,faq}.html || die "dodoc failed"
-}
diff --git a/net-nntp/pan/pan-0.14.2.ebuild b/net-nntp/pan/pan-0.14.2.ebuild
deleted file mode 100644
index c1476ec36a14..000000000000
--- a/net-nntp/pan/pan-0.14.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/pan-0.14.2.ebuild,v 1.5 2006/11/04 01:19:52 swegener Exp $
-
-inherit eutils libtool
-
-IUSE="nls spell"
-
-DESCRIPTION="A newsreader for the Gnome2 desktop"
-SRC_URI="http://pan.rebelbase.com/download/releases/${PV}/SOURCE/${P}.tar.bz2"
-HOMEPAGE="http://pan.rebelbase.com/"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 hppa ppc sparc amd64"
-SLOT="0"
-
-RDEPEND=">=dev-libs/glib-2.0.4
-	>=x11-libs/gtk+-2.0.5
-	>=dev-libs/libxml2-2.4.22
-	>=net-libs/gnet-1.1.8
-	spell? ( >=app-text/gtkspell-2.0.2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.21
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-pkg_setup() {
-	# Likely that glibc might of been compiled with nls turned off.
-	# Warn people that Pan requires glibc to have nls support.
-	if ! use nls
-	then
-		ewarn "Pan requires glibc to be merged with 'nls' in your USE flags."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/pan-0.14.2.91-gcc4-2.patch
-
-	elibtoolize || die "elibtoolize failed"
-}
-
-src_compile() {
-	econf $(use_enable spell gtkspell) || die "Configure failure"
-	emake || die "Compilation failure"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "Installation failed"
-	dodoc AUTHORS ChangeLog CREDITS NEWS README TODO || die "dodoc failed"
-	dohtml ANNOUNCE.html docs/{pan-shortcuts,faq}.html || die "dodoc failed"
-}
diff --git a/net-nntp/pan/pan-9999.ebuild b/net-nntp/pan/pan-9999.ebuild
index 5c43ead3ff7b..2197ddbf6360 100644
--- a/net-nntp/pan/pan-9999.ebuild
+++ b/net-nntp/pan/pan-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/pan-9999.ebuild,v 1.1 2008/07/14 10:48:43 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/pan-9999.ebuild,v 1.2 2008/10/04 11:11:38 eva Exp $
 
 inherit autotools subversion
 
@@ -20,7 +20,7 @@ IUSE="spell"
 RDEPEND=">=dev-libs/glib-2.4.0
 	>=x11-libs/gtk+-2.4.0
 	>=dev-libs/libpcre-5.0
-	>=dev-libs/gmime-2.1.9
+	=dev-libs/gmime-2.2*
 	spell? ( >=app-text/gtkspell-2.0.7 )"
 
 DEPEND="${RDEPEND}
@@ -41,7 +41,7 @@ src_unpack() {
 }
 
 src_compile() {
-	econf $(use_with spell gtkspell) || die "econf failed"
+	econf $(use_with spell gtkspell)
 	emake || die "emake failed"
 }