Update live ebuild to gnome git repository, bug #290914. Make it use base eclass and update dependencies.

Package-Manager: portage-2.2_rc83/cvs/Linux x86_64

3 files changed, 30 insertions, 32 deletions

diff --git a/net-nntp/pan/ChangeLog b/net-nntp/pan/ChangeLog
index 3cd6c091fc42..341f9db7c876 100644
--- a/net-nntp/pan/ChangeLog
+++ b/net-nntp/pan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nntp/pan
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/ChangeLog,v 1.76 2009/05/15 22:11:59 dirtyepic Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/ChangeLog,v 1.77 2010/09/21 20:29:22 eva Exp $
+
+  21 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org> pan-9999.ebuild:
+  Update live ebuild to gnome git repository, bug #290914. Make it use base
+  eclass and update dependencies.
 
   15 May 2009; Ryan Hill <dirtyepic@gentoo.org> pan-0.133.ebuild,
   +files/pan-0.133-gcc44.patch:
diff --git a/net-nntp/pan/Manifest b/net-nntp/pan/Manifest
index 9453721bbd84..75252b4f65a2 100644
--- a/net-nntp/pan/Manifest
+++ b/net-nntp/pan/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
 AUX pan-0.133-gcc44.patch 1109 RMD160 c2b4ef1f286328ff5c81128b0e07339c7e6eda97 SHA1 b2953a3f3ab936d946994c64c19a291457fcb005 SHA256 3b6c5c061b1e53be3051dc8972612ab2940b00f14d77b49463f2057ad97eb517
 DIST pan-0.133.tar.bz2 1452883 RMD160 cfa84e32d6d82731df582e1336f9deffc97aaabd SHA1 a0bd98ea1ba174800896611e3305a6b6d8dbde2f SHA256 e2494d89a5c3150d97f38af22ad6938f6ff29c64628c67e716d98a566f368e91
 EBUILD pan-0.133.ebuild 1026 RMD160 c2d5edf07c723d9848629abac1cc085ed6d18295 SHA1 adf879ba36a7214cd87cb4a699693f336b25e770 SHA256 6e490eb56143c5018d6427ac544fe5966b81f3409c9921c9279d2b3800b63820
-EBUILD pan-9999.ebuild 1233 RMD160 4b027d6c082bd1e2a098d7c78765b3b89d481c7f SHA1 8269d54b07499ac2e6a50aaf8214b341a0e481f8 SHA256 867c5671859aaf3c359a18bc1cbe59fc68805d1e29f6c3744f09ef48b5248e47
-MISC ChangeLog 16718 RMD160 9955f6f9393f46b3d1c44f91b982d2976d0732fd SHA1 0ee55584a7379eb88152864e2576cd5a5533f5f2 SHA256 fc99aaf8000b216c3682822281801d5f0e1adc4039bedfc4ebd43e590303f40b
+EBUILD pan-9999.ebuild 958 RMD160 f12d0e590bacb40e5805e8d4cd55cb3b93fc17c4 SHA1 8cc1c5002b1711f921d618ad3fcf630fdb34a46a SHA256 616beeaac26ac48e2eda3e9d89cb26257a9dbd8fa0a9b989e5939bc14fa502dd
+MISC ChangeLog 16894 RMD160 9372f42f74baf50f600c1539fa0efb480071cea3 SHA1 f0f78cc26116e1e4f580fb6ba72a49e30e614ff7 SHA256 8e27cd822d7722f296c39ef26c4584d3f8283f7a1430b128324581c15a67ad07
 MISC metadata.xml 180 RMD160 797b69d3fd6f36d441bda500c1310c91837720a4 SHA1 e2e177f18436d4250aadeadfd6ec27639861290e SHA256 1bb112215f4f710d26b79a43b61ec93003963663cfdec7b3b7173cfdbf85f52c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkoN6TgACgkQiqiDRvmkBmKDXACgi/IcjmYjnLM95csFCDiA6piy
-CbwAoN1UsIbTtFsLafI+Jb8aR9V5WUjb
-=5JEJ
+iEYEARECAAYFAkyZFawACgkQ1fmVwcYIWAYlOACgzOFGRMREsjADRGqGtdvJXCAI
+zVUAoMQiM9ngACMTiQudNtK9cDrtt/tS
+=DBpP
 -----END PGP SIGNATURE-----
diff --git a/net-nntp/pan/pan-9999.ebuild b/net-nntp/pan/pan-9999.ebuild
index 2197ddbf6360..a04e56bd411f 100644
--- a/net-nntp/pan/pan-9999.ebuild
+++ b/net-nntp/pan/pan-9999.ebuild
@@ -1,51 +1,45 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 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.2 2008/10/04 11:11:38 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/pan-9999.ebuild,v 1.3 2010/09/21 20:29:22 eva Exp $
 
-inherit autotools subversion
+EAPI="3"
+
+inherit autotools base git
 
 DESCRIPTION="A newsreader for the Gnome2 desktop"
 HOMEPAGE="http://pan.rebelbase.com/"
 
-ESVN_REPO_URI="http://svn.gnome.org/svn/pan2/trunk"
-ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}"
-# maximum svn update frequency, hours
-ESVN_UP_FREQ="${ESVN_UP_FREQ:-1}"
+EGIT_REPO_URI="git://git.gnome.org/${PN}2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="spell"
 
-RDEPEND=">=dev-libs/glib-2.4.0
-	>=x11-libs/gtk+-2.4.0
-	>=dev-libs/libpcre-5.0
-	=dev-libs/gmime-2.2*
+RDEPEND=">=dev-libs/glib-2.14:2
+	>=x11-libs/gtk+-2.12:2
+	>=dev-libs/gmime-2.1.9:0
 	spell? ( >=app-text/gtkspell-2.0.7 )"
 
 DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.21
+	>=dev-util/intltool-0.35.5
 	dev-util/pkgconfig
 	sys-devel/gettext"
 
-	# The normal version tree ebuild we are based on (for patching)
-	Pnorm="${PN}-0.132"
+# The normal version tree ebuild we are based on (for patching)
+Pnorm="${PN}-0.133"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
 
-src_unpack() {
-	subversion_src_unpack
-	cd "${S}"
+src_prepare() {
+	git_src_prepare
 
 	# bootstrap build system
-	intltoolize --force || die "intltoolize failed"
+	intltoolize --force --automake || die "intltoolize failed"
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	econf $(use_with spell gtkspell)
-	emake || die "emake failed"
 }
 
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
-}