Drop old, drop 9999 ebuild as none of us is really maintaining it, take the package as we are the people are taking care of this for a long time.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

5 files changed, 6 insertions, 275 deletions

diff --git a/net-nntp/pan/ChangeLog b/net-nntp/pan/ChangeLog
index 1f9687f91702..66a849dc98d1 100644
--- a/net-nntp/pan/ChangeLog
+++ b/net-nntp/pan/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-nntp/pan
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/ChangeLog,v 1.106 2014/02/22 22:34:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/ChangeLog,v 1.107 2014/04/18 08:35:47 pacho Exp $
+
+  18 Apr 2014; Pacho Ramos <pacho@gentoo.org> -files/pan-0.135-glib-2.31.patch,
+  -pan-0.135.ebuild, -pan-9999.ebuild, metadata.xml:
+  Drop old, drop 9999 ebuild as none of us is really maintaining it, take the
+  package as we are the people are taking care of this for a long time.
 
   22 Feb 2014; Pacho Ramos <pacho@gentoo.org> pan-0.139.ebuild:
   Fix wrong commit, bug 502160
diff --git a/net-nntp/pan/files/pan-0.135-glib-2.31.patch b/net-nntp/pan/files/pan-0.135-glib-2.31.patch
deleted file mode 100644
index 1fd3c352f572..000000000000
--- a/net-nntp/pan/files/pan-0.135-glib-2.31.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-Author: Dominique Leuenberger <dominique-gnomezilla@leuenberger.net>
-
-glib 2.31 only allows #include'ing glib.h (and a few exceptions to this).
-
-https://bugzilla.gnome.org/show_bug.cgi?id=665289
-
-Index: pan-0.135/pan/data-impl/data-impl.cc
-===================================================================
---- pan-0.135.orig/pan/data-impl/data-impl.cc
-+++ pan-0.135/pan/data-impl/data-impl.cc
-@@ -24,7 +24,7 @@
- #include <config.h>
- extern "C" {
-   #include <glib/gi18n.h>
--  #include <glib/gfileutils.h> // for g_build_filename
-+  #include <glib.h> // for g_build_filename
- }
- #include <pan/general/debug.h>
- #include <pan/general/file-util.h>
-Index: pan-0.135/pan/data/article-cache.h
-===================================================================
---- pan-0.135.orig/pan/data/article-cache.h
-+++ pan-0.135/pan/data/article-cache.h
-@@ -23,7 +23,7 @@
- #include <map>
- #include <vector>
- extern "C" {
--  #include <glib/gtypes.h> // for guint64
-+  #include <glib.h> // for guint64
- }
- #include <pan/general/string-view.h>
- #include <pan/general/quark.h>
-Index: pan-0.135/pan/general/file-util.h
-===================================================================
---- pan-0.135.orig/pan/general/file-util.h
-+++ pan-0.135/pan/general/file-util.h
-@@ -25,7 +25,7 @@
- extern "C" {
-   #include <stddef.h>
-   #include <stdio.h>
--  #include <glib/gtypes.h>
-+  #include <glib.h>
-   #include <glib/gstdio.h>
- }
- #include <pan/general/string-view.h>
-Index: pan-0.135/pan/general/locking.h
-===================================================================
---- pan-0.135.orig/pan/general/locking.h
-+++ pan-0.135/pan/general/locking.h
-@@ -22,7 +22,7 @@
- #ifndef _Mutex_h_
- #define _Mutex_h_
- 
--#include <glib/gthread.h>
-+#include <glib.h>
- 
- namespace pan
- {
-Index: pan-0.135/pan/general/macros.h
-===================================================================
---- pan-0.135.orig/pan/general/macros.h
-+++ pan-0.135/pan/general/macros.h
-@@ -62,12 +62,11 @@
- 
- extern "C"
- {
--  #include <glibconfig.h> // get the version
--  #include <glib/gutils.h> // get GLIB_CHECK_VERSION
-+  #include <glib.h>
- 
-   // pick up g_assert()
-   #if GLIB_CHECK_VERSION(2,16,0)
--    #include <glib/gtestutils.h>
-+    #include <glib.h>
-   #else
-     #include <glib/gmessages.h>
-   #endif
-Index: pan-0.135/pan/general/time-elapsed.h
-===================================================================
---- pan-0.135.orig/pan/general/time-elapsed.h
-+++ pan-0.135/pan/general/time-elapsed.h
-@@ -1,9 +1,7 @@
- #ifndef __Time_Elapsed_h__
- #define __Time_Elapsed_h__
- 
--#include <glib/gtypes.h> // for GTimeVal
--#include <glib/gmain.h> // for g_get_current_time
--#include <glib/gtimer.h> // for GUSEC_PER_SEC
-+#include <glib.h>
- 
- namespace pan
- {
-Index: pan-0.135/pan/general/worker-pool.cc
-===================================================================
---- pan-0.135.orig/pan/general/worker-pool.cc
-+++ pan-0.135/pan/general/worker-pool.cc
-@@ -21,7 +21,7 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- #include <cassert>
--#include <glib/gmain.h> // for g_idle_add
-+#include <glib.h> // for g_idle_add
- #include <pan/general/debug.h>
- #include <pan/general/macros.h>
- #include "worker-pool.h"
-Index: pan-0.135/pan/general/worker-pool.h
-===================================================================
---- pan-0.135.orig/pan/general/worker-pool.h
-+++ pan-0.135/pan/general/worker-pool.h
-@@ -24,8 +24,7 @@
- #define _Worker_Pool_H_
- 
- #include <set>
--#include <glib/gtypes.h>
--#include <glib/gthreadpool.h>
-+#include <glib.h>
- 
- namespace pan
- {
-Index: pan-0.135/pan/gui/render-bytes.cc
-===================================================================
---- pan-0.135.orig/pan/gui/render-bytes.cc
-+++ pan-0.135/pan/gui/render-bytes.cc
-@@ -1,4 +1,4 @@
--#include <glib/gutils.h> // g_snprintf
-+#include <glib.h> // g_snprintf
- #include "render-bytes.h"
- 
- namespace pan
-Index: pan-0.135/pan/gui/render-bytes.h
-===================================================================
---- pan-0.135.orig/pan/gui/render-bytes.h
-+++ pan-0.135/pan/gui/render-bytes.h
-@@ -1,6 +1,6 @@
- #ifndef RENDER_BYTES_H
- #define RENDER_BYTES_H
--#include <glib/gtypes.h>
-+#include <glib.h>
- namespace pan {
-   extern char* render_bytes (guint64);
- }
-Index: pan-0.135/pan/tasks/socket-impl-gio.h
-===================================================================
---- pan-0.135.orig/pan/tasks/socket-impl-gio.h
-+++ pan-0.135/pan/tasks/socket-impl-gio.h
-@@ -21,8 +21,7 @@
- #define __SocketGIO_h__
- 
- #include <string>
--#include <glib/giochannel.h>
--#include <glib/gstring.h>
-+#include <glib.h>
- #include <pan/tasks/socket.h>
- 
- namespace pan
-Index: pan-0.135/pan/usenet-utils/mime-utils.h
-===================================================================
---- pan-0.135.orig/pan/usenet-utils/mime-utils.h
-+++ pan-0.135/pan/usenet-utils/mime-utils.h
-@@ -21,7 +21,7 @@
- #define _UtilMime_h_
- 
- #include <vector>
--#include <glib/gtypes.h>
-+#include <glib.h>
- #include <gmime/gmime-filter.h>
- #include <gmime/gmime-stream.h>
- #include <gmime/gmime-message.h>
-Index: pan-0.135/pan/usenet-utils/text-massager.cc
-===================================================================
---- pan-0.135.orig/pan/usenet-utils/text-massager.cc
-+++ pan-0.135/pan/usenet-utils/text-massager.cc
-@@ -25,7 +25,6 @@
- extern "C" {
- #include <glib/gi18n.h>
- }
--#include <glib/gunicode.h>
- #include "text-massager.h"
- #include <pan/general/log.h>
- using namespace pan;
diff --git a/net-nntp/pan/metadata.xml b/net-nntp/pan/metadata.xml
index a619a2ebdc70..da6fd63d0085 100644
--- a/net-nntp/pan/metadata.xml
+++ b/net-nntp/pan/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-news</herd>
 <herd>gnome</herd>
 </pkgmetadata>
diff --git a/net-nntp/pan/pan-0.135.ebuild b/net-nntp/pan/pan-0.135.ebuild
deleted file mode 100644
index 38d9642838a2..000000000000
--- a/net-nntp/pan/pan-0.135.ebuild
+++ /dev/null
@@ -1,37 +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.135.ebuild,v 1.10 2012/05/03 04:32:51 jdhore 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="spell"
-
-RDEPEND=">=dev-libs/glib-2.14:2
-	>=x11-libs/gtk+-2.16:2
-	dev-libs/gmime:2.6
-	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"
-	epatch "${FILESDIR}/pan-0.135-glib-2.31.patch" # 401437
-}
-
-src_configure() {
-	econf --without-gtk3 $(use_with spell gtkspell)
-}
diff --git a/net-nntp/pan/pan-9999.ebuild b/net-nntp/pan/pan-9999.ebuild
deleted file mode 100644
index 979fee643df0..000000000000
--- a/net-nntp/pan/pan-9999.ebuild
+++ /dev/null
@@ -1,56 +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-9999.ebuild,v 1.10 2012/11/04 09:17:06 tetromino Exp $
-
-EAPI="4"
-
-inherit autotools git-2
-
-DESCRIPTION="A newsreader for GNOME"
-HOMEPAGE="http://pan.rebelbase.com/"
-
-EGIT_REPO_URI="git://git.gnome.org/${PN}2
-	http://git.gnome.org/browse/${PN}2"
-SRC_URI=
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-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"
-
-# The normal version tree ebuild we are based on (for patching)
-Pnorm="${PN}-0.139"
-
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-
-src_prepare() {
-	# bootstrap build system
-	intltoolize --force --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-gtk3 \
-		$(use_with dbus) \
-		$(use_enable gnome-keyring gkr) \
-		$(use_with spell gtkspell) \
-		$(use_enable libnotify) \
-		$(use_with ssl gnutls)
-}