[gentoo-commits] repo/gentoo:master commit in: net-nntp/pan/, net-nntp/pan/files/

[Pacho Ramos]

commit: 10ab7e302e3987f93aa133ad7f6597c244171728
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Jan 22 13:51:18 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Jan 22 13:53:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10ab7e30

net-nntp/pan: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-nntp/pan/Manifest  |  1 -
 net-nntp/pan/files/pan-0.139-get_pan_home.patch| 41 
 net-nntp/pan/files/pan-0.139-pan.desktop.patch | 31 -
 .../files/pan-0.139-r2-fix_crash_at_startup.patch  | 75 --
 net-nntp/pan/pan-0.139-r1.ebuild   | 55 
 net-nntp/pan/pan-0.139-r2.ebuild   | 58 -
 6 files changed, 261 deletions(-)

diff --git a/net-nntp/pan/Manifest b/net-nntp/pan/Manifest
index e72e22c..0ffd0e3 100644
--- a/net-nntp/pan/Manifest
+++ b/net-nntp/pan/Manifest
@@ -1,2 +1 @@
-DIST pan-0.139.tar.bz2 1523907 SHA256 
bf5f320f997f582d7ac823e3e854393307161a92e7014d2135e6e2674d144bb9 SHA512 
7c6c5f3f54de475e0b5778cc33b6c46f18cb1100d89eab6ea2a6279492cb95a85226ccd6dba1abb43092b78f7cb100cea3215edb21c7813d624e84104b119a81
 WHIRLPOOL 
b8c05cdabff893895370128dad53e19e29a348f3921c394af1a26210ebd9b89e4772dfb926685a549fc9d667c6cdc39fdf32b043a8761488f9f3a77d52aa52df
 DIST pan-0.140.tar.bz2 1563454 SHA256 
ba1c65ee75b9eca1f15f6249ea762492309731446edc8b09085b63ad34351c71 SHA512 
25936862ec566aa697ce99455320be7e28a341fa9c1ffe3b156d69f242e54e4cf5c454286f59b703aab9aebb0938f3923363a44b36228b4e99fe16e0a0724c9e
 WHIRLPOOL 
3ade64d51148b6adac0c882424ad0b168bed79bcfb38fe2ab51fc9a3c238ac4f2acb2f23ccf64a462566652d7aa71715eb08d85eae11e2685fafb9a48a91e949

diff --git a/net-nntp/pan/files/pan-0.139-get_pan_home.patch 
b/net-nntp/pan/files/pan-0.139-get_pan_home.patch
deleted file mode 100644
index 6a2d5fc..
--- a/net-nntp/pan/files/pan-0.139-get_pan_home.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From cef1d28d4a27fe383a74f4e5d0286aca3a28ff99 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev 
-Date: Mon, 7 Sep 2015 13:21:22 -0400
-Subject: [PATCH] file::get_pan_home() : fix for g++-5 non-CoW std::string
- semantics
-
-https://bugzilla.gnome.org/show_bug.cgi?id=754698

- pan/general/file-util.cc | 2 +-
- pan/general/file-util.h  | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pan/general/file-util.cc b/pan/general/file-util.cc
-index 4ea2e77..473e426 100644
 a/pan/general/file-util.cc
-+++ b/pan/general/file-util.cc
-@@ -77,7 +77,7 @@ file :: print_file_info (std::ostream& os, const char* file)
- 
- ***/
- 
--std::string
-+const std::string &
- file :: get_pan_home ()
- {
-   static std::string pan_home;
-diff --git a/pan/general/file-util.h b/pan/general/file-util.h
-index 7c211a8..4b6d04f 100644
 a/pan/general/file-util.h
-+++ b/pan/general/file-util.h
-@@ -59,7 +59,7 @@ namespace pan
-  * Returns the home pan directory, which falls back to $HOME/.pan2
-  * if the PAN_HOME environmental variable isn't set.
-  */
--std::string get_pan_home ();
-+const std::string & get_pan_home ();
- 
- /**
-* Returns an absolute filename of a file
--- 
-2.5.1
-

diff --git a/net-nntp/pan/files/pan-0.139-pan.desktop.patch 
b/net-nntp/pan/files/pan-0.139-pan.desktop.patch
deleted file mode 100644
index 1b1de5c..
--- a/net-nntp/pan/files/pan-0.139-pan.desktop.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1dba05f87839a6fa347414a800824812f2642554 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Heinrich=20M=C3=BCller?= 
-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/files/pan-0.139-r2-fix_crash_at_startup.patch 
b/net-nntp/pan/files/pan-0.139-r2-fix_crash_at_startup.patch
deleted file mode 100644
index dfc1a36..
--- a/net-nntp/pan/files/pan-0.139-r2-fix_crash_at_startup.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 366372076042687a0bf21cf72c7693e4a7c2b3d6 Mon Sep 17 00:00:00 2001
-From: Detlef Graef 
-Date: Wed, 13 Jan 2016 16:59:35 +0100
-Subject: Fix crash at PanTreeStore::get_iter()
-

- pan/gui/gui.cc  | 2 +-
- pan/gui/prefs-ui.cc | 2 +-
- pan/gui/prefs.cc| 6 --
- pan/gui/prefs.h | 2 +-
- 4 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/pan/gui/gui.cc 

[gentoo-commits] repo/gentoo:master commit in: net-nntp/pan/, net-nntp/pan/files/

[Ole Reifschneider]

commit: 82d5289f4288586b761211ce9ea052deb3b73cfc
Author: PPed72  iol  it>
AuthorDate: Fri Mar 11 07:41:08 2016 +
Commit: Ole Reifschneider  gentoo  org>
CommitDate: Fri Mar 11 07:41:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82d5289f

net-nntp/pan: fix crash at startup

Gentoo bug #570108

 .../files/pan-0.139-r2-fix_crash_at_startup.patch  | 75 ++
 net-nntp/pan/pan-0.139-r2.ebuild   | 58 +
 2 files changed, 133 insertions(+)

diff --git a/net-nntp/pan/files/pan-0.139-r2-fix_crash_at_startup.patch 
b/net-nntp/pan/files/pan-0.139-r2-fix_crash_at_startup.patch
new file mode 100644
index 000..dfc1a36
--- /dev/null
+++ b/net-nntp/pan/files/pan-0.139-r2-fix_crash_at_startup.patch
@@ -0,0 +1,75 @@
+From 366372076042687a0bf21cf72c7693e4a7c2b3d6 Mon Sep 17 00:00:00 2001
+From: Detlef Graef 
+Date: Wed, 13 Jan 2016 16:59:35 +0100
+Subject: Fix crash at PanTreeStore::get_iter()
+
+---
+ pan/gui/gui.cc  | 2 +-
+ pan/gui/prefs-ui.cc | 2 +-
+ pan/gui/prefs.cc| 6 --
+ pan/gui/prefs.h | 2 +-
+ 4 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc
+index d709608..da7b5e7 100644
+--- a/pan/gui/gui.cc
 b/pan/gui/gui.cc
+@@ -2022,7 +2022,7 @@ void GUI :: do_read_selected_group ()
+ // update iconv handler
+ const char * from = g_mime_charset_iconv_name(local.c_str());
+ char buf[256];
+-g_snprintf(buf, sizeof(buf), "%s//IGNORE", 
_prefs.get_string("default-charset", "UTF-8").c_str());
++g_snprintf(buf, sizeof(buf), "%s//IGNORE", 
_prefs.get_string("default-charset", "UTF-8").str);
+ const char * to  = g_mime_charset_iconv_name(buf);
+ {
+   if (iconv_inited)
+diff --git a/pan/gui/prefs-ui.cc b/pan/gui/prefs-ui.cc
+index 23dc212..57f45bf 100644
+--- a/pan/gui/prefs-ui.cc
 b/pan/gui/prefs-ui.cc
+@@ -343,7 +343,7 @@ namespace pan
+   {
+ GtkWidget * t = gtk_entry_new();
+ g_object_set_data_full (G_OBJECT(t), PREFS_KEY, g_strdup(key), g_free);
+-gtk_entry_set_text (GTK_ENTRY(t), prefs.get_string (key, 
fallback).c_str());
++gtk_entry_set_text (GTK_ENTRY(t), prefs.get_string (key, fallback).str);
+ g_signal_connect (t, "changed", G_CALLBACK(entry_changed_cb), );
+ return t;
+   }
+diff --git a/pan/gui/prefs.cc b/pan/gui/prefs.cc
+index 5d21af7..95700a8 100644
+--- a/pan/gui/prefs.cc
 b/pan/gui/prefs.cc
+@@ -324,12 +324,14 @@ Prefs :: set_long64 (const StringView& key, uint64_t 
value)
+   STRINGS
+ ***/
+ 
+-std::string
++StringView
+ Prefs :: get_string (const StringView& key, const StringView& fallback) const
+ {
++  StringView prefs_string;
+   if (!_strings.count (key))
+ _strings[key] = fallback;
+-  return _strings[key];
++  prefs_string = _strings[key];
++  return prefs_string;
+ }
+ 
+ void
+diff --git a/pan/gui/prefs.h b/pan/gui/prefs.h
+index 748834a..eac865e 100644
+--- a/pan/gui/prefs.h
 b/pan/gui/prefs.h
+@@ -103,7 +103,7 @@ namespace pan
+   uint64_t get_long64 (const StringView& key, uint64_t fallback) const;
+   void set_long64 (const StringView& key, uint64_t value);
+ 
+-  std::string get_string (const StringView& key, const StringView& 
fallback) const;
++  StringView get_string (const StringView& key, const StringView& 
fallback) const;
+   void set_string (const StringView& key, const StringView&);
+ 
+   void set_color (const StringView& key, const GdkColor& color);
+-- 
+cgit v0.12
+

diff --git a/net-nntp/pan/pan-0.139-r2.ebuild b/net-nntp/pan/pan-0.139-r2.ebuild
new file mode 100644
index 000..2e64f8e
--- /dev/null
+++ b/net-nntp/pan/pan-0.139-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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:0= )
+   spell? (
+   >=app-text/enchant-1.6
+   >=app-text/gtkspell-2.0.7:2 )
+   ssl? ( >=net-libs/gnutls-3:0= )"
+
+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"
+
+   # g++-5 fix, https://bugzilla.gnome.org/show_bug.cgi?id=754698
+   epatch "${FILESDIR}"/${PN}-0.139-get_pan_home.patch
+
+   # Fix crash at startup: #570108
+   epatch 

[gentoo-commits] repo/gentoo:master commit in: net-nntp/pan/, net-nntp/pan/files/

[Alexandre Rostovtsev]

commit: 3e828ee766a6ebaa5c71ed1764f7998d59c24054
Author: Alexandre Rostovtsev  gentoo  org>
AuthorDate: Mon Sep  7 17:29:52 2015 +
Commit: Alexandre Rostovtsev  gentoo  org>
CommitDate: Mon Sep  7 17:33:23 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e828ee7

net-nntp/pan: fix newsrc-* files created in wrong place with g++-5

Gentoo-Bug: 559666
Reported-by: Holger Hoffstätte
Upstream-Bug-url: https://bugzilla.gnome.org/show_bug.cgi?id=754698
Package-Manager: portage-2.2.20.1

 net-nntp/pan/files/pan-0.139-get_pan_home.patch | 41 ++
 net-nntp/pan/pan-0.139-r1.ebuild| 55 +
 2 files changed, 96 insertions(+)

diff --git a/net-nntp/pan/files/pan-0.139-get_pan_home.patch 
b/net-nntp/pan/files/pan-0.139-get_pan_home.patch
new file mode 100644
index 000..6a2d5fc
--- /dev/null
+++ b/net-nntp/pan/files/pan-0.139-get_pan_home.patch
@@ -0,0 +1,41 @@
+From cef1d28d4a27fe383a74f4e5d0286aca3a28ff99 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev 
+Date: Mon, 7 Sep 2015 13:21:22 -0400
+Subject: [PATCH] file::get_pan_home() : fix for g++-5 non-CoW std::string
+ semantics
+
+https://bugzilla.gnome.org/show_bug.cgi?id=754698
+---
+ pan/general/file-util.cc | 2 +-
+ pan/general/file-util.h  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pan/general/file-util.cc b/pan/general/file-util.cc
+index 4ea2e77..473e426 100644
+--- a/pan/general/file-util.cc
 b/pan/general/file-util.cc
+@@ -77,7 +77,7 @@ file :: print_file_info (std::ostream& os, const char* file)
+ 
+ ***/
+ 
+-std::string
++const std::string &
+ file :: get_pan_home ()
+ {
+   static std::string pan_home;
+diff --git a/pan/general/file-util.h b/pan/general/file-util.h
+index 7c211a8..4b6d04f 100644
+--- a/pan/general/file-util.h
 b/pan/general/file-util.h
+@@ -59,7 +59,7 @@ namespace pan
+  * Returns the home pan directory, which falls back to $HOME/.pan2
+  * if the PAN_HOME environmental variable isn't set.
+  */
+-std::string get_pan_home ();
++const std::string & get_pan_home ();
+ 
+ /**
+* Returns an absolute filename of a file
+-- 
+2.5.1
+

diff --git a/net-nntp/pan/pan-0.139-r1.ebuild b/net-nntp/pan/pan-0.139-r1.ebuild
new file mode 100644
index 000..382c8c2
--- /dev/null
+++ b/net-nntp/pan/pan-0.139-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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:0= )
+   spell? (
+   >=app-text/enchant-1.6
+   >=app-text/gtkspell-2.0.7:2 )
+   ssl? ( >=net-libs/gnutls-3:0= )"
+
+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"
+
+   # g++-5 fix, https://bugzilla.gnome.org/show_bug.cgi?id=754698
+   epatch "${FILESDIR}"/${PN}-0.139-get_pan_home.patch
+
+   # upstream release was in 2012 - users may want to apply patches
+   epatch_user
+}
+
+src_configure() {
+   econf \
+   --without-gtk3 \
+   $(use_with dbus) \
+   $(use_enable gnome-keyring gkr) \
+   $(use_with spell gtkspell) \
+   $(use_enable libnotify) \
+   $(use_with ssl gnutls)
+}