version bump to beta5

(Portage version: 2.1.2_rc1-r5)
 (Unsigned Manifest commit)

3 files changed, 16 insertions, 239 deletions

diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 1d4eb65101e5..d4a47b099736 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -22,17 +22,17 @@ AUX gaim-2.0.0_beta4-dbus.patch 2347 RMD160 df8f4261289b1f1dd5dfb25d10c2750bb61c
 MD5 3368d8d7c673a679625f0fd12b535602 files/gaim-2.0.0_beta4-dbus.patch 2347
 RMD160 df8f4261289b1f1dd5dfb25d10c2750bb61cae3f files/gaim-2.0.0_beta4-dbus.patch 2347
 SHA256 ccdb151171d8df331f7192aeb3b04767627f608e5b0d9b06a9173be484f2b6bd files/gaim-2.0.0_beta4-dbus.patch 2347
+AUX gaim-2.0.0_beta5-dbus.patch 2347 RMD160 df8f4261289b1f1dd5dfb25d10c2750bb61cae3f SHA1 fbf4801f56008641e6de5c8a52c2710302cbb3a2 SHA256 ccdb151171d8df331f7192aeb3b04767627f608e5b0d9b06a9173be484f2b6bd
+MD5 3368d8d7c673a679625f0fd12b535602 files/gaim-2.0.0_beta5-dbus.patch 2347
+RMD160 df8f4261289b1f1dd5dfb25d10c2750bb61cae3f files/gaim-2.0.0_beta5-dbus.patch 2347
+SHA256 ccdb151171d8df331f7192aeb3b04767627f608e5b0d9b06a9173be484f2b6bd files/gaim-2.0.0_beta5-dbus.patch 2347
 DIST gaim-1.5.0.tar.bz2 6123237 RMD160 13f74e2d2ed69a775a5884b807c365177455ae0e SHA1 a280d005f01be7fa89c9fa210efb86cc6a9eb9c7 SHA256 58e3b0340cfc9e54e46f8d8835e5a02e31201c9ed8820bbb4cea36c59b9682aa
-DIST gaim-2.0.0beta3.1.tar.bz2 5445059 RMD160 5987586fee212a5c5e9287a9dce55a35c30ea7b7 SHA1 5897cc8b89e0937645be21a0655a6ebb4fb3e626 SHA256 a282c56f32a37f7838c5332f182bdd920d4e80099b96313e503c6acc020931f4
 DIST gaim-2.0.0beta4.tar.bz2 6298151 RMD160 c9c5931fc2b2bf1c5bc524e6dc2b68c28a6570f1 SHA1 c4aaa9417d897e38c630699eb76c5f26e4a54881 SHA256 08436e3fcb4caa61b92551e5e2c092ea94caae6520d50c479a164b93caedb820
+DIST gaim-2.0.0beta5.tar.bz2 6489271 RMD160 5fdb0f16411745033a691c4991e0f36cd31655c5 SHA1 cc897b656b933c60d9557df7f6dfdffc913fb6b6 SHA256 d6fab2ff940eddbf8256b2d845332cbc25b10e1c44f1761a0a754c55849b01db
 EBUILD gaim-1.5.0.ebuild 3993 RMD160 c590613b9c54e16c9aa6d427893d47924a86cf68 SHA1 6168859d926d724e236b0906fd8ed41536cd0f1e SHA256 f644ac37595f2727fa58198a7d16409a4b3102fae684bfc7e8acc91a8ad0db63
 MD5 33700f7439472df3bb31923316010694 gaim-1.5.0.ebuild 3993
 RMD160 c590613b9c54e16c9aa6d427893d47924a86cf68 gaim-1.5.0.ebuild 3993
 SHA256 f644ac37595f2727fa58198a7d16409a4b3102fae684bfc7e8acc91a8ad0db63 gaim-1.5.0.ebuild 3993
-EBUILD gaim-2.0.0_beta3-r4.ebuild 6303 RMD160 2e298efa3f36ef9e7b3b8749f8e8992ff80ec82b SHA1 2c49d4ada228ff60db09659a9ee9ffb07e5b8f30 SHA256 c7257a4f82967c4a69b1d381927a8266258392b44246f855dff591fcea8ffff6
-MD5 94c9d7a2d063bd8aabb2189f003632aa gaim-2.0.0_beta3-r4.ebuild 6303
-RMD160 2e298efa3f36ef9e7b3b8749f8e8992ff80ec82b gaim-2.0.0_beta3-r4.ebuild 6303
-SHA256 c7257a4f82967c4a69b1d381927a8266258392b44246f855dff591fcea8ffff6 gaim-2.0.0_beta3-r4.ebuild 6303
 EBUILD gaim-2.0.0_beta4-r1.ebuild 6524 RMD160 bf86248469f8d3478f867e38a6f231e5a14f1298 SHA1 a912e269403661f27bf177e21f17c470fe91a26a SHA256 a002bf9c858dbdb10a70561ca6b5ddb44c6e397246931fb256531b74946d6297
 MD5 fae3ce886ecf9cbdca0433d11ede4e02 gaim-2.0.0_beta4-r1.ebuild 6524
 RMD160 bf86248469f8d3478f867e38a6f231e5a14f1298 gaim-2.0.0_beta4-r1.ebuild 6524
@@ -45,10 +45,14 @@ EBUILD gaim-2.0.0_beta4.ebuild 6416 RMD160 c51357a21e0d6fb9ffed3c47b3f7f36decefd
 MD5 f8decc9b9a6cdbab21f1b5f1e2799676 gaim-2.0.0_beta4.ebuild 6416
 RMD160 c51357a21e0d6fb9ffed3c47b3f7f36decefd679 gaim-2.0.0_beta4.ebuild 6416
 SHA256 1dce90fae617eb3ca5ef7d0dbff0283b8e1c8cd5f8b149c1040efb1cfd9fab69 gaim-2.0.0_beta4.ebuild 6416
-MISC ChangeLog 61160 RMD160 313c90fa4df4d4597272b44a97eb30ecdab35d04 SHA1 e05228cbb90e50ed89b5ead94a45768960096d74 SHA256 a03cde234da3bc22990c87e251e453763316d919a272876c491b5be309842c28
-MD5 62716c62b14c633f8b45adec1bc9245c ChangeLog 61160
-RMD160 313c90fa4df4d4597272b44a97eb30ecdab35d04 ChangeLog 61160
-SHA256 a03cde234da3bc22990c87e251e453763316d919a272876c491b5be309842c28 ChangeLog 61160
+EBUILD gaim-2.0.0_beta5.ebuild 6534 RMD160 596e7a3844d33555da862643a6a6c3554c38bb10 SHA1 58bbdacaab79a6559c1bcb003f68168c43b1d8f6 SHA256 6f617ed3886e6f3a30d9270d144a0fb9d77f2842a62107c1c2e50abded11672f
+MD5 a1d06fd6eb37f7116c9773c982d6c2b9 gaim-2.0.0_beta5.ebuild 6534
+RMD160 596e7a3844d33555da862643a6a6c3554c38bb10 gaim-2.0.0_beta5.ebuild 6534
+SHA256 6f617ed3886e6f3a30d9270d144a0fb9d77f2842a62107c1c2e50abded11672f gaim-2.0.0_beta5.ebuild 6534
+MISC ChangeLog 61359 RMD160 9c0e4a044749f95765e81c94c657558c91fd7f16 SHA1 3f7348afbea8f71a11159252213df03e8918779b SHA256 217ca649eee05a170582f6aace34950c60b4fa6441ef590602f79a76c6011773
+MD5 82fa9e13ed3b6462afbd01e16766dd30 ChangeLog 61359
+RMD160 9c0e4a044749f95765e81c94c657558c91fd7f16 ChangeLog 61359
+SHA256 217ca649eee05a170582f6aace34950c60b4fa6441ef590602f79a76c6011773 ChangeLog 61359
 MISC metadata.xml 414 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 SHA1 9cd1e1d6345fc95f73379f5ee554a8e70860e067 SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f
 MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 metadata.xml 414
@@ -56,9 +60,6 @@ SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f metadata
 MD5 390f6cb2111f1f54bb55da3cb074981e files/digest-gaim-1.5.0 238
 RMD160 565afdbee5ecd1f78913ee6d3d813ff9db8bb185 files/digest-gaim-1.5.0 238
 SHA256 0eeeff6fff0204e03a372c96611f8db0135f38286f7abade6be47aef06463f5b files/digest-gaim-1.5.0 238
-MD5 ffd99b34dae16b5b118de79bff8a948c files/digest-gaim-2.0.0_beta3-r4 259
-RMD160 53b88544cfe6ea127784fcb43fc82a24097dcf94 files/digest-gaim-2.0.0_beta3-r4 259
-SHA256 94f6c231a875fc84a7e98d49e9e32d31d19107375f600bbe357457d951fcc15d files/digest-gaim-2.0.0_beta3-r4 259
 MD5 f5bc0e4144699e3db21103823912768c files/digest-gaim-2.0.0_beta4 253
 RMD160 46a8c79ada5eedb43c7cda139c06ae55ad7b852f files/digest-gaim-2.0.0_beta4 253
 SHA256 bdfad7a8a04a595682982df7046e8f00b8ce106beb865ed4239b7bd361a5b76a files/digest-gaim-2.0.0_beta4 253
@@ -68,3 +69,6 @@ SHA256 bdfad7a8a04a595682982df7046e8f00b8ce106beb865ed4239b7bd361a5b76a files/di
 MD5 f5bc0e4144699e3db21103823912768c files/digest-gaim-2.0.0_beta4-r2 253
 RMD160 46a8c79ada5eedb43c7cda139c06ae55ad7b852f files/digest-gaim-2.0.0_beta4-r2 253
 SHA256 bdfad7a8a04a595682982df7046e8f00b8ce106beb865ed4239b7bd361a5b76a files/digest-gaim-2.0.0_beta4-r2 253
+MD5 e72ee508b4ecfbfb4b6aa4a2d69e1a8b files/digest-gaim-2.0.0_beta5 253
+RMD160 8e54b2eeefbc921ead529e878e49e0ed6ef763ea files/digest-gaim-2.0.0_beta5 253
+SHA256 609d8796cdf2888aae84b2d384a750f17ab9d48516c4e229d46a92c789bc668b files/digest-gaim-2.0.0_beta5 253
diff --git a/net-im/gaim/files/digest-gaim-2.0.0_beta3-r4 b/net-im/gaim/files/digest-gaim-2.0.0_beta3-r4
deleted file mode 100644
index f020f448cc44..000000000000
--- a/net-im/gaim/files/digest-gaim-2.0.0_beta3-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 202b9e6ee5171da90de14230b3037dc1 gaim-2.0.0beta3.1.tar.bz2 5445059
-RMD160 5987586fee212a5c5e9287a9dce55a35c30ea7b7 gaim-2.0.0beta3.1.tar.bz2 5445059
-SHA256 a282c56f32a37f7838c5332f182bdd920d4e80099b96313e503c6acc020931f4 gaim-2.0.0beta3.1.tar.bz2 5445059
diff --git a/net-im/gaim/gaim-2.0.0_beta3-r4.ebuild b/net-im/gaim/gaim-2.0.0_beta3-r4.ebuild
deleted file mode 100644
index 73998ef83f09..000000000000
--- a/net-im/gaim/gaim-2.0.0_beta3-r4.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta3-r4.ebuild,v 1.4 2006/10/16 23:34:32 gothgirl Exp $
-
-inherit flag-o-matic eutils toolchain-funcs debug multilib mono autotools perl-app
-
-#MY_PV=${PV/_beta/beta}
-MY_PV="2.0.0beta3.1"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gaim/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="avahi audiofile bonjour cjk crypt dbus debug doc eds gadu gnutls meanwhile mono nas nls perl silc spell startup-notification tcl
-tk xscreensaver custom-flags ssl msn"
-
-RDEPEND="
-	audiofile? ( media-libs/libao
-		media-libs/audiofile )
-	bonjour? ( !avahi? ( net-misc/howl )
-		   avahi? ( net-dns/avahi ) )
-	dbus? ( >=sys-apps/dbus-0.35
-		>=dev-lang/python-2.4 )
-	>=x11-libs/gtk+-2.0
-	>=dev-libs/glib-2.0
-	nas? ( >=media-libs/nas-1.4.1-r1 )
-	perl? ( >=dev-lang/perl-5.8.2-r1 )
-	spell? ( >=app-text/gtkspell-2.0.2 )
-	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 )
-	eds? ( gnome-extra/evolution-data-server )
-	tcl? ( dev-lang/tcl )
-	tk? ( dev-lang/tk )
-	startup-notification? ( >=x11-libs/startup-notification-0.5 )
-	mono? ( dev-lang/mono )
-	doc? ( app-doc/doxygen )
-	xscreensaver? (	x11-libs/libXScrnSaver )"
-
-DEPEND="$RDEPEND
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-3.0_beta5 )"
-
-S="${WORKDIR}/${MY_P}"
-
-# List of plugins
-#   app-accessibility/festival-gaim
-#   net-im/gaim-blogger
-#   net-im/gaim-bnet
-#   net-im/gaim-meanwhile
-#   net-im/gaim-snpp
-#   x11-plugins/autoprofile
-#   x11-plugins/gaim-assistant
-#   x11-plugins/gaim-encryption
-#   x11-plugins/gaim-extprefs
-#   x11-plugins/gaim-latex
-#   x11-plugins/gaim-otr
-#   x11-plugins/gaim-rhythmbox
-#   x11-plugins/gaim-xmms-remote
-#   x11-plugins/gaimosd
-#   x11-plugins/guifications
-
-
-print_gaim_warning() {
-	ewarn
-	ewarn "This is a beta release!  Please back up everything in your .gaim"
-	ewarn "directory. We're looking for lots of feedback on this release"
-	ewarn "especially what you love about it and what you hate about it."
-	ewarn
-	ewarn "If you are merging ${MY_P} from an earlier version, you may need"
-	ewarn "to re-merge any plugins like gaim-encryption or gaim-snpp."
-	ewarn
-	ewarn "If you experience problems with gaim, file them as bugs with"
-	ewarn "Gentoo's bugzilla, http://bugs.gentoo.org.  DO NOT report them"
-	ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT"
-	ewarn "seek help in #gaim."
-	ewarn
-	ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg"
-	ewarn "faults, see http://gaim.sourceforge.net/gdb.php for details on"
-	ewarn "backtraces."
-	ewarn
-	ewarn "Please read the gaim FAQ at http://gaim.sourceforge.net/faq.php"
-	ewarn
-	einfo
-	if  use custom-flags; 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-flags"
-		einfo
-	else
-		einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
-		einfo
-	fi
-
-	if use silc; then
-		einfo "To be able to connect to silc network, you need to run"
-		einfo "\`usermod -c \"comment\"\` as user as which you are running gaim,"
-		einfo "where \"comment\" is either your real name if you want show it"
-		einfo "on silc or any othe not empty string."
-		einfo
-	fi
-	ebeep 5
-	epause 3
-}
-
-pkg_setup() {
-	print_gaim_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 gaim.
-	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 gaim.
-	eerror
-	die "Configure failed"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch "${FILESDIR}"/"${P}"-as-needed.patch
-	epatch "${FILESDIR}"/"${P}"-avahi-compat.patch
-	epatch "${FILESDIR}"/"${P}"-dbus-1.patch
-	eautoreconf || die "Failed running eautoreconf"
-}
-
-src_compile() {
-	# Stabilize things, for your own good
-	if ! use custom-flags; 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 bonjour ; then
-		myconf="${myconf} --with-howl-includes=."
-		myconf="${myconf} --with-howl-libs=."
-	fi
-
-	if ! use silc; then
-		einfo "Disabling SILC protocol"
-		myconf="${myconf} --with-silc-includes=."
-		myconf="${myconf} --with-silc-libs=."
-	fi
-
-	if ! use gadu ; then
-		myconf="${myconf} --with-gadu-includes=."
-		myconf="${myconf} --with-gadu-libs=."
-	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
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable perl) \
-		$(use_enable spell gtkspell) \
-		$(use_enable startup-notification) \
-		$(use_enable tcl) \
-		$(use_enable tk) \
-		$(use_enable mono) \
-		$(use_enable debug) \
-		$(use_enable dbus) \
-		$(use_enable meanwhile) \
-		$(use_enable nas) \
-		$(use_enable eds gevolution) \
-		$(use_enable audiofile audio) \
-		$(use_enable doc doxygen) \
-		${myconf} || die "Configuration failed"
-
-	emake -j1 || die "Make failed"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "Install failed"
-	use perl && fixlocalpod
-	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
-}
-
-pkg_postinst() {
-	print_gaim_warning
-}