Version bump with various bugfixes (bug #427650, thanks to Emmanuel Andry and Chris Smith). Drop old.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

7 files changed, 94 insertions, 120 deletions

diff --git a/net-nntp/pan/ChangeLog b/net-nntp/pan/ChangeLog
index 27962e6e4d97..00b387d415bc 100644
--- a/net-nntp/pan/ChangeLog
+++ b/net-nntp/pan/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-nntp/pan
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/ChangeLog,v 1.99 2012/05/06 10:35:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/ChangeLog,v 1.100 2012/11/04 09:17:06 tetromino Exp $
+
+*pan-0.139 (04 Nov 2012)
+
+  04 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -pan-0.133-r1.ebuild, -files/pan-0.133-gcc44.patch, -pan-0.134.ebuild,
+  +pan-0.139.ebuild, +files/pan-0.139-pan.desktop.patch, pan-9999.ebuild:
+  Version bump with various bugfixes (bug #427650, thanks to Emmanuel Andry and
+  Chris Smith). Drop old.
 
 *pan-0.137 (06 May 2012)
 
diff --git a/net-nntp/pan/files/pan-0.133-gcc44.patch b/net-nntp/pan/files/pan-0.133-gcc44.patch
deleted file mode 100644
index f2ccce50b829..000000000000
--- a/net-nntp/pan/files/pan-0.133-gcc44.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur pan-0.133-orig/pan/general/log.h pan-0.133/pan/general/log.h
---- pan-0.133-orig/pan/general/log.h	2007-08-01 11:00:01.000000000 -0600
-+++ pan-0.133/pan/general/log.h	2009-05-15 16:03:53.699935401 -0600
-@@ -20,6 +20,7 @@
- #ifndef __Log_h__
- #define __Log_h__
- 
-+#include <cstdio>
- #include <ctime>
- #include <set>
- #include <string>
-diff -Naur pan-0.133-orig/pan/general/progress.cc pan-0.133/pan/general/progress.cc
---- pan-0.133-orig/pan/general/progress.cc	2007-08-01 11:00:01.000000000 -0600
-+++ pan-0.133/pan/general/progress.cc	2009-05-15 16:00:06.843924198 -0600
-@@ -19,6 +19,7 @@
- 
- #include <config.h>
- #include <cstdarg>
-+#include <cstdio>
- #include "progress.h"
- #include "string-view.h"
- 
-diff -Naur pan-0.133-orig/pan/usenet-utils/numbers.cc pan-0.133/pan/usenet-utils/numbers.cc
---- pan-0.133-orig/pan/usenet-utils/numbers.cc	2008-07-04 09:01:53.000000000 -0600
-+++ pan-0.133/pan/usenet-utils/numbers.cc	2009-05-15 16:04:48.354310199 -0600
-@@ -22,6 +22,7 @@
- #include <pan/general/string-view.h>
- #include "numbers.h"
- #include <algorithm>
-+#include <cstdio>
- 
- using namespace pan;
- 
diff --git a/net-nntp/pan/files/pan-0.139-pan.desktop.patch b/net-nntp/pan/files/pan-0.139-pan.desktop.patch
new file mode 100644
index 000000000000..1b1de5c4b3db
--- /dev/null
+++ b/net-nntp/pan/files/pan-0.139-pan.desktop.patch
@@ -0,0 +1,31 @@
+From 1dba05f87839a6fa347414a800824812f2642554 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Heinrich=20M=C3=BCller?= <henmull@src.gnome.org>
+Date: Wed, 25 Jul 2012 19:36:44 +0200
+Subject: [PATCH] https://bugzilla.gnome.org/show_bug.cgi?id=680468
+
+---
+ pan.desktop.in | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/pan.desktop.in b/pan.desktop.in
+index 4660140..4bbeca5 100644
+--- a/pan.desktop.in
++++ b/pan.desktop.in
+@@ -1,10 +1,10 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+-_Name=Pan Newsreader
++_Name=Pan
++_GenericName=Newsreader
+ _Comment=Read and Post Usenet Articles
+ Exec=pan
+-Icon=pan.png
++Icon=pan
+ Terminal=false
+ Type=Application
+-Categories=GTK;Application;Network;News
++Categories=GTK;Network;News;
+ StartupNotify=false
+-- 
+1.8.0
+
diff --git a/net-nntp/pan/pan-0.133-r1.ebuild b/net-nntp/pan/pan-0.133-r1.ebuild
deleted file mode 100644
index 38d56feff047..000000000000
--- a/net-nntp/pan/pan-0.133-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/pan-0.133-r1.ebuild,v 1.10 2012/05/03 04:32:51 jdhore Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="A newsreader for GNOME"
-HOMEPAGE="http://pan.rebelbase.com/"
-SRC_URI="
-	http://pan.rebelbase.com/download/releases/${PV}/source/${P}.tar.bz2
-	http://dev.gentoo.org/~jer/${P}-gmime-2.4.patch
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="spell"
-
-RDEPEND=">=dev-libs/glib-2.4:2
-	>=x11-libs/gtk+-2.4:2
-	>=dev-libs/libpcre-5
-	dev-libs/gmime:2.4
-	spell? ( >=app-text/gtkspell-2.0.7:2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.21
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc44.patch "${DISTDIR}"/${P}-gmime-2.4.patch
-}
-
-src_configure() {
-	econf $(use_with spell gtkspell)
-}
-
-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.134.ebuild b/net-nntp/pan/pan-0.134.ebuild
deleted file mode 100644
index f0161e864715..000000000000
--- a/net-nntp/pan/pan-0.134.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/pan-0.134.ebuild,v 1.3 2012/05/03 04:32:51 jdhore Exp $
-
-EAPI="3"
-
-DESCRIPTION="A newsreader for GNOME"
-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.14:2
-	>=x11-libs/gtk+-2.16:2
-	dev-libs/gmime:2.4
-	spell? ( >=app-text/gtkspell-2.0.7:2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	# XXX: disable the only failing test
-	sed '293 s:^\(.*\)$:/*\1*/:' \
-		-i pan/usenet-utils/text-massager-test.cc || die "sed failed"
-}
-
-src_configure() {
-	econf $(use_with spell gtkspell)
-}
-
-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.139.ebuild b/net-nntp/pan/pan-0.139.ebuild
new file mode 100644
index 000000000000..ffe3a740c287
--- /dev/null
+++ b/net-nntp/pan/pan-0.139.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/pan-0.139.ebuild,v 1.1 2012/11/04 09:17:06 tetromino Exp $
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="A newsreader for GNOME"
+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="dbus gnome-keyring libnotify spell ssl"
+
+RDEPEND=">=dev-libs/glib-2.26:2
+	>=x11-libs/gtk+-2.16:2
+	dev-libs/gmime:2.6
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.2 )
+	libnotify? ( >=x11-libs/libnotify-0.4.1 )
+	spell? (
+		>=app-text/enchant-1.6
+		>=app-text/gtkspell-2.0.7:2 )
+	ssl? ( >=net-libs/gnutls-3 )"
+
+DEPEND="${RDEPEND}
+	app-text/gnome-doc-utils
+	>=dev-util/intltool-0.35.5
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	# in next release
+	epatch "${FILESDIR}/${P}-pan.desktop.patch"
+}
+
+src_configure() {
+	econf \
+		--without-gtk3 \
+		$(use_with dbus) \
+		$(use_enable gnome-keyring gkr) \
+		$(use_with spell gtkspell) \
+		$(use_enable libnotify) \
+		$(use_with ssl gnutls)
+}
diff --git a/net-nntp/pan/pan-9999.ebuild b/net-nntp/pan/pan-9999.ebuild
index 535882ad76b0..979fee643df0 100644
--- a/net-nntp/pan/pan-9999.ebuild
+++ b/net-nntp/pan/pan-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.9 2012/05/06 10:35:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/pan-9999.ebuild,v 1.10 2012/11/04 09:17:06 tetromino Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ SRC_URI=
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="gnome-keyring libnotify spell ssl"
+IUSE="dbus gnome-keyring libnotify spell ssl"
 
 RDEPEND=">=dev-libs/glib-2.26:2
 	>=x11-libs/gtk+-2.16:2
@@ -26,7 +26,7 @@ RDEPEND=">=dev-libs/glib-2.26:2
 	spell? (
 		>=app-text/enchant-1.6
 		>=app-text/gtkspell-2.0.7:2 )
-	ssl? ( >=net-libs/gnutls-2.12.10 )"
+	ssl? ( >=net-libs/gnutls-3 )"
 
 DEPEND="${RDEPEND}
 	app-text/gnome-doc-utils
@@ -35,7 +35,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 # The normal version tree ebuild we are based on (for patching)
-Pnorm="${PN}-0.137"
+Pnorm="${PN}-0.139"
 
 DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
 
@@ -48,6 +48,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		--without-gtk3 \
+		$(use_with dbus) \
 		$(use_enable gnome-keyring gkr) \
 		$(use_with spell gtkspell) \
 		$(use_enable libnotify) \