Forgot to cvs rm one file... and typo

Package-Manager: portage-2.1.2.2

3 files changed, 16 insertions, 278 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index d951cdf2d5d0..cb34a7ddb53c 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,11 +1,11 @@
 # ChangeLog for net-im/pidgin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.5 2007/05/04 15:19:20 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.6 2007/05/04 15:20:50 tester Exp $
 
 *pidgin-2.0.0 (04 May 2007)
 
   04 May 2007; Olivier Crête <tester@gentoo.org> +pidgin-2.0.0.ebuild:
-  Bump to final version\!
+  Bump to final version!
 
   04 May 2007; Timothy Redaelli <drizzt@gentoo.org>
   pidgin-2.0.0_beta7.ebuild:
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index dec320ed556c..db814ee1fd4f 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,17 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST pidgin-2.0.0.tar.bz2 7521328 RMD160 1e387bb098bb985c5aa46deedc5eb4450579ae4e SHA1 7bfe348abc25307845e8de1d0fe2b761293ab071 SHA256 d700a95fbce796b4a9e5c2fb07aad8c24402f38a795c8eb51a44e000a8400cff
-DIST pidgin-2.0.0beta7.tar.bz2 7465941 RMD160 e1b9c4fbb13497fb85774cb3092eeec51bc8d632 SHA1 95b0b9c9040a7b06beb9e6a7beeeec798dc34f82 SHA256 ee154b61c59d23d0977a0339d749db5f64cb91f38d22356403bc413eaf9200eb
 EBUILD pidgin-2.0.0.ebuild 7199 RMD160 f2a11122e521d368d977b509ce54ea2ffca450b7 SHA1 882813b68634206debf36b4f0f07bd8eba9ae676 SHA256 424cb04410448b0a520be3a21746e483a31d07cc7ca64566ac5758f7aaa9cfa1
 MD5 69219ee8e7da56bacdc908bd8b21709a pidgin-2.0.0.ebuild 7199
 RMD160 f2a11122e521d368d977b509ce54ea2ffca450b7 pidgin-2.0.0.ebuild 7199
 SHA256 424cb04410448b0a520be3a21746e483a31d07cc7ca64566ac5758f7aaa9cfa1 pidgin-2.0.0.ebuild 7199
-EBUILD pidgin-2.0.0_beta7.ebuild 7598 RMD160 3a03111f586cd6e423b21c3bfb5f64ade2e10edf SHA1 41a514c5c10e7ef1de48f6cba9f2f6a43557944d SHA256 d1c655ecbad5d5e37a7552a978ea735f69f95acd1e93107cf3d874b32ff63500
-MD5 1a074be8150c7acbd160458db5db7bfd pidgin-2.0.0_beta7.ebuild 7598
-RMD160 3a03111f586cd6e423b21c3bfb5f64ade2e10edf pidgin-2.0.0_beta7.ebuild 7598
-SHA256 d1c655ecbad5d5e37a7552a978ea735f69f95acd1e93107cf3d874b32ff63500 pidgin-2.0.0_beta7.ebuild 7598
-MISC ChangeLog 879 RMD160 f36f6f550b734be0fb9e6dc18c0d35b39be34f12 SHA1 38aefcece8d295e64b9b442eff36494623571073 SHA256 13d36edcdca1b005fbc817a96c9ea10ee18fc7fe955cff3b1f287494ba1e6676
-MD5 00b8fea19a2f48c5352e1bc512c6a05d ChangeLog 879
-RMD160 f36f6f550b734be0fb9e6dc18c0d35b39be34f12 ChangeLog 879
-SHA256 13d36edcdca1b005fbc817a96c9ea10ee18fc7fe955cff3b1f287494ba1e6676 ChangeLog 879
+MISC ChangeLog 878 RMD160 fd2e3bdc9a16aa9806f924cc3badc07c1a720ab0 SHA1 5294233db8a15416694d9a891815a631103bf85b SHA256 aebb53bf4b26a9045acc2ddcaec4657b44f72aaab67d1aa40178c8c8bd989b0b
+MD5 42f9705fbc180a70d4a7efde91b77fa4 ChangeLog 878
+RMD160 fd2e3bdc9a16aa9806f924cc3badc07c1a720ab0 ChangeLog 878
+SHA256 aebb53bf4b26a9045acc2ddcaec4657b44f72aaab67d1aa40178c8c8bd989b0b ChangeLog 878
 MISC metadata.xml 458 RMD160 dca91f12277688e0a35ab2aefc0d46c8c70facbd SHA1 7dc17a356911852b3f5867e3629ef02a46adb675 SHA256 4457ab0d5db90f61e9d916879c32d1e0a7c6d15f2f7c955a17e5e31cb0777ba9
 MD5 bba7b9e682937ac5182b872b00b19d93 metadata.xml 458
 RMD160 dca91f12277688e0a35ab2aefc0d46c8c70facbd metadata.xml 458
@@ -19,6 +17,10 @@ SHA256 4457ab0d5db90f61e9d916879c32d1e0a7c6d15f2f7c955a17e5e31cb0777ba9 metadata
 MD5 c9fa3630408c75bc8eaebdccdcee270f files/digest-pidgin-2.0.0 244
 RMD160 f10e884c9488999e94f2230bb11f9b1575c43630 files/digest-pidgin-2.0.0 244
 SHA256 e2615579a04819aeb25329e428463a42e3b8a1a0a2702e83113261ddaf4071bb files/digest-pidgin-2.0.0 244
-MD5 6d23766a2769c4e099ca1a3f199fba19 files/digest-pidgin-2.0.0_beta7 259
-RMD160 bc6b0bf3513a877f71493539fd36c8ff93bcbd19 files/digest-pidgin-2.0.0_beta7 259
-SHA256 4837e0b54c64a5a658530be82792a748da58a0c5d90c6cc583ceb62c769f315b files/digest-pidgin-2.0.0_beta7 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFGO0+8+IXOQtHLm/gRAsoRAJ9SYozuLJ4MNiCNn9+XJA4R8t0nFgCfRxVB
+kdDXkdFeNYxQQ3trZ4UIaYg=
+=KEgG
+-----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/pidgin-2.0.0_beta7.ebuild b/net-im/pidgin/pidgin-2.0.0_beta7.ebuild
deleted file mode 100644
index 0877399ee51b..000000000000
--- a/net-im/pidgin/pidgin-2.0.0_beta7.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.0.0_beta7.ebuild,v 1.4 2007/05/04 08:53:40 drizzt Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib autotools perl-app gnome2
-
-MY_PV=${P/_beta/beta}
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://pidgin.im/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="avahi bonjour cjk crypt dbus debug doc eds gadu gnutls gstreamer meanwhile nls perl silc startup-notification tcl tk xscreensaver custom-cflags spell ssl qq msn gadu"
-IUSE="${IUSE} gtk sasl console groupwise prediction" # mono"
-
-RDEPEND="
-	bonjour? ( !avahi? ( net-misc/howl )
-		   avahi? ( net-dns/avahi ) )
-	dbus? ( >=dev-libs/dbus-glib-0.71
-		>=dev-python/dbus-python-0.71
-		>=sys-apps/dbus-0.90
-		>=dev-lang/python-2.4 )
-	gtk? (
-		spell? ( >=app-text/gtkspell-2.0.2 )
-		>=x11-libs/gtk+-2.0
-		startup-notification? ( >=x11-libs/startup-notification-0.5 )
-		xscreensaver? (	x11-libs/libXScrnSaver )
-		eds? ( gnome-extra/evolution-data-server ) 	)
-	>=dev-libs/glib-2.0
-	gstreamer? ( media-libs/gstreamer
-		     media-libs/gst-plugins-good )
-	perl? ( >=dev-lang/perl-5.8.2-r1 )
-	gadu?  ( net-libs/libgadu )
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( >=dev-libs/nss-3.11 )
-	)
-	msn? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( >=dev-libs/nss-3.11 )
-	)
-	meanwhile? ( net-libs/meanwhile )
-	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
-	tcl? ( dev-lang/tcl )
-	tk? ( dev-lang/tk )
-	gstreamer? ( >=media-libs/gstreamer-0.10 )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	doc? ( app-doc/doxygen )
-	dev-libs/libxml2
-	prediction? ( =dev-db/sqlite-3.3* )"
-	#mono? ( dev-lang/mono )"
-
-DEPEND="$RDEPEND
-	dev-lang/perl
-	dev-perl/XML-Parser
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-# PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-3.0_beta5 )"
-
-S="${WORKDIR}/${MY_PV}"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,zephyr,simple"
-
-# List of plugins yet to be ported (will be removed at some point)
-#   app-accessibility/festival-gaim
-#   net-im/gaim-blogger
-#   net-im/gaim-bnet
-#   net-im/gaim-meanwhile (integrated in gaim)
-#   net-im/gaim-snpp
-#   x11-plugins/autoprofile
-#   x11-plugins/gaim-assistant
-#   x11-plugins/gaim-encryption
-#   x11-plugins/gaim-latex
-#   x11-plugins/gaim-otr
-#   x11-plugins/gaimosd
-#   x11-plugins/gaim-xfire
-
-# List of plugins
-#   x11-plugins/pidgin-extprefs
-#   x11-plugins/gaim-rhythmbox
-#   x11-plugins/guifications
-
-
-print_pidgin_warning() {
-	ewarn
-	ewarn "While previous betas in the 2.0.0 series have been extremely"
-	ewarn "stable, and we recommended their use, this release is actually"
-	ewarn "of beta quality. This is our first release to reflect the name"
-	ewarn "change from Gaim to Pidgin, and so there are a lot of fairly "
-	ewarn "significant changes here, which we'd like to see have broader "
-	ewarn "testing before declaring it ready for release."
-	ewarn
-	ewarn "We strongly recommend that you backup your ~/.gaim directory"
-	ewarn "before running Pidgin for the first time. Things you should be"
-	ewarn "on the lookout for include problems with preferences being lost"
-	ewarn "or forgotten, buddy icons not working as you expect, plugins or"
-	ewarn "other external files not properly being found."
-	ewarn
-	ewarn
-	ewarn "If you are merging ${MY_P} from an earlier version of gaim,"
-	ewarn "you may need to re-merge any plugins like gaim-encryption or"
-	ewarn " gaim-snpp (when they are ported to pidgin!)."
-	ewarn
-	ewarn "If you experience problems with pidgin, file them as bugs with"
-	ewarn "Gentoo's bugzilla, http://bugs.gentoo.org.  DO NOT report them"
-	ewarn "as bugs with pidgin's bug tracker, and by all means DO NOT"
-	ewarn "seek help in #pidgin."
-	ewarn
-	ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg"
-	ewarn "faults, see http://pidgin.im/gdb.php for details on"
-	ewarn "backtraces."
-	ewarn
-	ewarn "Please read the pidgin FAQ at http://pidgin.im/faq.php"
-	ewarn
-	einfo
-	if  use custom-cflags; then
-		einfo "Note that you have chosen NOT TO FILTER UNSTABLE C[XX]FLAGS."
-		einfo "DO NOT file bugs with GENTOO or UPSTREAM while using custom-cflags"
-		einfo
-	else
-		einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
-		einfo
-	fi
-}
-
-pkg_setup() {
-	print_pidgin_warning
-
-	if use bonjour && use avahi && ! built_with_use net-dns/avahi howl-compat ; then
-	eerror
-	eerror "You need to rebuild net-dns/avahi with USE=howl-compat in order"
-	eerror  "to enable howl support for the bonjour protocol in pidgin."
-	eerror
-	die "Configure failed"
-	fi
-
-	if use gadu && built_with_use net-libs/libgadu ssl ; then
-	eerror
-	eerror "You need to rebuild net-libs/libgadu with USE=-ssl in order"
-	eerror "enable gadu gadu support in pidgin."
-	eerror
-	die "Configure failed"
-	fi
-
-	if use console &&  ! built_with_use sys-libs/ncurses unicode; then
-		eerror
-		eerror "You need to rebuild sys-libs/ncurses with USE=unicode in order"
-		eerror "to build finch the console client of pidgin."
-		eerror
-		die "Configure failed"
-	fi
-
-	if ! use gtk && ! use console; then
-		einfo
-		elog "As you did not pick gtk or console use flag, building"
-		elog "console only."
-		einfo
-	fi
-}
-
-src_compile() {
-	# Stabilize things, for your own good
-	if ! use custom-cflags; then
-		strip-flags
-	fi
-	replace-flags -O? -O2
-
-	# -msse2 doesn't play nice on gcc 3.2
-	[ "`gcc-version`" == "3.2" ] && filter-flags -msse2
-
-	local myconf
-
-	if use gadu; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
-			myconf="${myconf} --with-gadu-includes=."
-			myconf="${myconf} --with-gadu-libs=."
-	fi
-
-	if use silc; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},silc"
-	fi
-
-	if use qq; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},qq"
-	fi
-
-	if use meanwhile; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},sametime"
-	fi
-
-	if use bonjour; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},bonjour"
-	fi
-
-	if use msn; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},msn"
-	fi
-
-	if use groupwise; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},novell"
-	fi
-
-	if use ssl || use msn ; then
-		if use gnutls ; then
-			einfo "Disabling NSS, using GnuTLS"
-			myconf="${myconf} --enable-nss=no --enable-gnutls=yes"
-			myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
-			myconf="${myconf} --with-gnutls-libs=/usr/$(get_libdir)"
-		else
-			einfo "Disabling GnuTLS, using NSS"
-			myconf="${myconf} --enable-gnutls=no --enable-nss=yes"
-		fi
-	else
-		einfo "No SSL support selected"
-		myconf="${myconf} --enable-gnutls=no --enable-nss=no"
-	fi
-
-	if use xscreensaver ; then
-			myconf="${myconf} --x-includes=/usr/include/X11"
-	fi
-
-	if ! use console && ! use gtk; then
-		myconf="${myconf} --enable-consoleui"
-	else
-		myconf="${myconf} $(use_enable console consoleui) $(use_enable gtk gtkui)"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable perl) \
-		$(use_enable startup-notification) \
-		$(use_enable tcl) \
-		$(use_enable gtk sm) \
-		$(use_enable spell gtkspell) \
-		$(use_enable tk) \
-		$(use_enable xscreensaver screensaver) \
-		$(use_enable debug) \
-		$(use_enable dbus) \
-		$(use_enable meanwhile) \
-		$(use_enable eds gevolution) \
-		$(use_enable gstreamer) \
-		$(use_enable sasl cyrus-sasl ) \
-		$(use_enable doc doxygen) \
-		$(use_enable prediction cap) \
-		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
-		${myconf} || die "Configuration failed"
-		#$(use_enable mono) \
-}
-
-src_install() {
-	gnome2_src_install
-	use perl && fixlocalpod
-	dodoc AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	print_pidgin_warning
-}