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.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 11 insertions, 284 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/Manifest b/net-nntp/pan/Manifest
index 17bdb0f1e4cb..7c813437d59c 100644
--- a/net-nntp/pan/Manifest
+++ b/net-nntp/pan/Manifest
@@ -1,19 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX pan-0.135-glib-2.31.patch 5428 SHA256 d105b1810f3f710af00f00898fd953c665b63442751c1e618d7220ed9be006b8 SHA512 b6ca61b85668bddec13a0a5301f7939ba44082aaac6d2000b4cac75f6ae7be84eed36584f77e614ede763db86b6455f9e62d7abc48719862cd998d8b5aeb3b58 WHIRLPOOL 15ed3593d67657741a9d95fbc41a25cb460b0a1f8d4a6ec0bf39342df1c6bc454decc760d4d56cabb36860d264757e0a5edaf6ba9f35a50dbde05dac943ce3fc
 AUX pan-0.139-pan.desktop.patch 762 SHA256 214322cb4a889aeb50bdcc465935aecd4c823b73dbefe1d10ddc940daac8b615 SHA512 5ab78f67074c1b5c8c7e9952f7cd4c1768c9dff989d95e9221960a501118d0db683bcad4df1155ae398f116f57c5ef34ebcf82e6aaccc642e84c82761488add4 WHIRLPOOL 2a8c42bc8a6b2f28d8cec5851444b69faabc8ad8015db454090884729df97933872223db40a6a5a48f0da44a6f44a14197cf26313250e4bdccbb7be5ed2f512c
-DIST pan-0.135.tar.bz2 1404420 SHA256 ba73fb8b1f867f9d18ec5ecf19d60e902041b4fcb1584d49a320037de93bc929 SHA512 1624f1939767fa912a924133d6ff12ad8f699a73278d96797a67d83215dc0249a01b4b179eb0b71691e67b93237a73ee5a8e4308ec4e36d3c1b9c49f2197ddbf WHIRLPOOL b7a09343e75f5d0ad477380f4f18f4b28dab0660d658d8372709a695d1ee823ff21afdd61b8317a5aeeea2e07376f4bbb3cc4f0856144a40b942f62d435f5827
 DIST pan-0.139.tar.bz2 1523907 SHA256 bf5f320f997f582d7ac823e3e854393307161a92e7014d2135e6e2674d144bb9 SHA512 7c6c5f3f54de475e0b5778cc33b6c46f18cb1100d89eab6ea2a6279492cb95a85226ccd6dba1abb43092b78f7cb100cea3215edb21c7813d624e84104b119a81 WHIRLPOOL b8c05cdabff893895370128dad53e19e29a348f3921c394af1a26210ebd9b89e4772dfb926685a549fc9d667c6cdc39fdf32b043a8761488f9f3a77d52aa52df
-EBUILD pan-0.135.ebuild 976 SHA256 0fb70182939c1c8877e3aa4dabfe1be3bba09cb8462e7c2e35f07ac21f15c4a7 SHA512 55fa64b7545aeec24050113d28c06517304d5ca41b04a0b5084617815df5c18ab8fc3532fa31ca2e5b513d171fb6306a0fca1f7a909a73cdb8a22f1403e911c3 WHIRLPOOL 283754cbd7dbbb68243211e3e82a86402b34760e4459d1170c6cb40bb6629667f26906b4ff9e448336673189d2e8498e4d1abfd565a8190ccc8e13062ba8e412
 EBUILD pan-0.139.ebuild 1220 SHA256 7b1d05fc8022c5cb9f3dfb95a7c679a29ad1a6069ac2e950ebf289ac303cdaa7 SHA512 9ae88cec1fd69eb75fee1b48f12531651a900edc5957202c1ba7d61618cb899a061ab90d6ae68b48f23aefadd920faa433c0791e664d54803be33e46e4d4cb8b WHIRLPOOL 9ca4a4a1789064100a46260603b3e8d2b207929dc9f11c0e76f37829e1e0455c04553c359f579059319553e18342b4099f7a5c6720cdd34bc302ade0cd037b83
-EBUILD pan-9999.ebuild 1325 SHA256 8d3fa2e24477a5d6e66df7604736aa79922ba38dcf78fcd93cc2f87dfec90d0a SHA512 4db3f65d3967444b2083f58722bca15f22fd39455fc5923d8f5a24bb3336ec8f62c9557bb557688f4e47cb6078870a60a7db390e841b00a38229b357a7bd35ba WHIRLPOOL b785f7b30328078482fdb73f3bab962f3dda2833e5131ffa88f28dff7c219dd154607b8539cd0e21f0ec42f462cb2efbf4509aa2141cfe6ac325e270f63ff977
-MISC ChangeLog 20619 SHA256 3c06bdbc4b0a2f943c3a583cc8a341d5c175e83ef0668469f4f84cfd3d25f1a6 SHA512 c5f17911ea4b9e29fac049f6adbf757db616f0008e8e5d705b64dc6bc627357fea01eef206040e7f9b94f0c07bed93b64aaa36fce4cc1dcba911f43435b72484 WHIRLPOOL 0bce8f2a0f35ae9c585382c8cc192b565888c233b64d118c3f85131626cc738848c8d0a7ac2268189d20f7fa9f6fec58f4e573cff02c77a29c7ee5f023e5614f
-MISC metadata.xml 180 SHA256 1bb112215f4f710d26b79a43b61ec93003963663cfdec7b3b7173cfdbf85f52c SHA512 73f129411d011702da24bccc1e07b8fbcf4cacf42f1393dc54377bbfcfc635e5f7f602a7b674f15979ebbfba92f89074efd0789157c305483e37d9fe4d680c40 WHIRLPOOL c33270f34d813f39abe81105cc4cae0730f092262872a6dc5cd05933c06e0f5ec4315fb471f403f7613ab4267bb5c165d2049360e2385f35cbd8eb584827fcdd
+MISC ChangeLog 20903 SHA256 eb9917fdaa4488c34c7b3da86fba88d9cd62d3863c4cfe561e1d03911ba9dbf6 SHA512 f7252a4358190d3b8c0fb38a1822617264967b6d41f111bc469b8e53ecf47b41e23a85213c13dcf9df5887611add19a1e0a363c85e72ce468d41a89b6072d1b5 WHIRLPOOL e4cb0c8184e8e8905843fbc8bd37581f9b9088a55f8eb26b868b0e7617c3a32d665a18ab28ec2572466b4f99551c0230f74795652e548eb7d3c7004339c1587a
+MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMJJhMACgkQCaWpQKGI+9RTigCeLljnG1unwnP1JtOETa69DoTh
-LRMAn3CqIFEHgoehK2sKdtEebe8x3X6Y
-=PIea
+iEYEAREIAAYFAlNQ4+QACgkQCaWpQKGI+9RgWACfRsI4g0L4jeYzInXK81pT7ig2
+ihAAnjPdmn8CVDDPOcZyWP53GwKO40tz
+=VKqg
 -----END PGP SIGNATURE-----
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)
-}