Added version 2.0.0beta3.1 as beta3-r2, and using the doc flag for doxygen doc

Package-Manager: portage-2.1-r2

4 files changed, 270 insertions, 5 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 6fdf39f002ad..f6b95658767e 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.405 2006/07/10 17:59:50 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.406 2006/09/06 00:54:18 tester Exp $
+
+*gaim-2.0.0_beta3-r2 (06 Sep 2006)
+
+  06 Sep 2006; Olivier Crête <tester@gentoo.org>
+  +gaim-2.0.0_beta3-r2.ebuild:
+  Added version 2.0.0beta3.1 as beta3-r2, and using the doc flag for doxygen doc
 
   10 Jul 2006; gothgirl <gothgirl@gentoo.org> gaim-2.0.0_beta3-r1.ebuild:
   2nd attempt at removing krb4 use flag
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index d289560767f3..be6137cb31cc 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gaim-0.76-xinput.patch 644 RMD160 8003dcbad47c300845898cb42b7a96f12b149c5f SHA1 f74085f170b8d6171cf47094bde9601f2e6085d7 SHA256 3532e792388cc6023522871bc99fd9e84204a42dfa6801b507df7fe480c37cd0
 MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
 RMD160 8003dcbad47c300845898cb42b7a96f12b149c5f files/gaim-0.76-xinput.patch 644
@@ -11,6 +14,7 @@ MD5 ebb905b4a73583eaa4b68c022beb110f files/gaim-2.0.0_beta3-avahi-compat.patch 9
 RMD160 0012a39e59134ea580958fe0c0d278dde65b0ab7 files/gaim-2.0.0_beta3-avahi-compat.patch 977
 SHA256 e9e3a9a3d0a474e6325c5d205d6906032b9998a11df71c4cb8935102138e3a28 files/gaim-2.0.0_beta3-avahi-compat.patch 977
 DIST gaim-1.5.0.tar.bz2 6123237
+DIST gaim-2.0.0beta3.1.tar.bz2 5445059 RMD160 5987586fee212a5c5e9287a9dce55a35c30ea7b7 SHA1 5897cc8b89e0937645be21a0655a6ebb4fb3e626 SHA256 a282c56f32a37f7838c5332f182bdd920d4e80099b96313e503c6acc020931f4
 DIST gaim-2.0.0beta3.tar.bz2 8056708 RMD160 f7c7273ebb5149b5eb3b3759f4a1d756f68392c5 SHA1 e23363cdcf928d503c6fa583239537b409d10b84 SHA256 5ce3a0054b26e96cacb5471d0d3456fde00223cadc267a3e010155b6a2ffe710
 EBUILD gaim-1.5.0.ebuild 4071 RMD160 32f00b81e42b7a36a9b77014f2795a19c38e9b23 SHA1 c04570e3d096852cfd79cc6219ed1ab89bba604a SHA256 66cc01b6a2101ade5dd529f481552f938a1d092d4624b8e44b51cb7f74014d95
 MD5 410bff266caec5e8d126acc5301e559b gaim-1.5.0.ebuild 4071
@@ -20,10 +24,18 @@ EBUILD gaim-2.0.0_beta3-r1.ebuild 6438 RMD160 37e9dc0fb72a6f2318d448b0e4a6751215
 MD5 b34d75c5546ee6284450f08c71679893 gaim-2.0.0_beta3-r1.ebuild 6438
 RMD160 37e9dc0fb72a6f2318d448b0e4a6751215c71afd gaim-2.0.0_beta3-r1.ebuild 6438
 SHA256 cde152251874fec4f28db288e7802ee7a5158d88a83027ab93f170512ed07329 gaim-2.0.0_beta3-r1.ebuild 6438
-MISC ChangeLog 58843 RMD160 cc28747db5ca61ee85d7b54beec932127ba88b32 SHA1 2fe4719ac7f013b0923c7577dc95c6c8bfc07b38 SHA256 f8ddf554823fc2887585112e15e9af818ca569eca66d468d76f0d19b11789112
-MD5 5960bc1b9fc9d17e425434d51ab8d078 ChangeLog 58843
-RMD160 cc28747db5ca61ee85d7b54beec932127ba88b32 ChangeLog 58843
-SHA256 f8ddf554823fc2887585112e15e9af818ca569eca66d468d76f0d19b11789112 ChangeLog 58843
+EBUILD gaim-2.0.0_beta3-r2.ebuild 6594 RMD160 bdd64f216270e069ab87bc1d372049f67d19c008 SHA1 5b4fbf64aa0eb524f56a08477e8a91e02b4d56c0 SHA256 8780e14e04870a6cbe2cb6d9ae7e97ce987687a8965edc44f27794157264ffaa
+MD5 9224438963624c6f7ceeb52f9987d1a2 gaim-2.0.0_beta3-r2.ebuild 6594
+RMD160 bdd64f216270e069ab87bc1d372049f67d19c008 gaim-2.0.0_beta3-r2.ebuild 6594
+SHA256 8780e14e04870a6cbe2cb6d9ae7e97ce987687a8965edc44f27794157264ffaa gaim-2.0.0_beta3-r2.ebuild 6594
+MISC ChangeLog 59040 RMD160 1f790f98eff6b5f82d2b75409581a55ed85540db SHA1 ea962d835de33b608589f0a278960ed77287fcb3 SHA256 50766408b5544b98d9154c677eb10232739429c0fd94523b264d454db1198414
+MD5 e6893a156f3eb76d68483d93d90b04f0 ChangeLog 59040
+RMD160 1f790f98eff6b5f82d2b75409581a55ed85540db ChangeLog 59040
+SHA256 50766408b5544b98d9154c677eb10232739429c0fd94523b264d454db1198414 ChangeLog 59040
+MISC gaim-2.0.0_beta3-r2.ebuild.orig 6460 RMD160 9fcc99622c9c60e9dc2908538ad4a144963549ac SHA1 8ab69cffb8401e747e8d9405841357732e39f820 SHA256 183c425d18243bf3b570802c0298982102427aa1d451a12adeacc45bf160ea58
+MD5 4d55a16d053c47a3fe8e8ad0fe1eba07 gaim-2.0.0_beta3-r2.ebuild.orig 6460
+RMD160 9fcc99622c9c60e9dc2908538ad4a144963549ac gaim-2.0.0_beta3-r2.ebuild.orig 6460
+SHA256 183c425d18243bf3b570802c0298982102427aa1d451a12adeacc45bf160ea58 gaim-2.0.0_beta3-r2.ebuild.orig 6460
 MISC metadata.xml 414 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 SHA1 9cd1e1d6345fc95f73379f5ee554a8e70860e067 SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f
 MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 metadata.xml 414
@@ -34,3 +46,13 @@ SHA256 6d0d6a97397284c18dd881305d135a634f77b01c762cd8232f8b626d97841036 files/di
 MD5 18ac09d4d582248a50d0f68546832419 files/digest-gaim-2.0.0_beta3-r1 253
 RMD160 f5f547a5d04a6d1e1a3dc043abeabbe930ab8d55 files/digest-gaim-2.0.0_beta3-r1 253
 SHA256 4e8269e2659d7e240380f43cef0fa13244ce16c29457d81ba55a20ac071f62e4 files/digest-gaim-2.0.0_beta3-r1 253
+MD5 ffd99b34dae16b5b118de79bff8a948c files/digest-gaim-2.0.0_beta3-r2 259
+RMD160 53b88544cfe6ea127784fcb43fc82a24097dcf94 files/digest-gaim-2.0.0_beta3-r2 259
+SHA256 94f6c231a875fc84a7e98d49e9e32d31d19107375f600bbe357457d951fcc15d files/digest-gaim-2.0.0_beta3-r2 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE/hxGmOfEJZHYOKcRAsn1AJ0f6zBkbK5wiC9eBnqbKnLMDRhfPgCePHD0
+lb5GeVcmCp8ypKSlAl6YZkA=
+=IH8Q
+-----END PGP SIGNATURE-----
diff --git a/net-im/gaim/files/digest-gaim-2.0.0_beta3-r2 b/net-im/gaim/files/digest-gaim-2.0.0_beta3-r2
new file mode 100644
index 000000000000..f020f448cc44
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-2.0.0_beta3-r2
@@ -0,0 +1,3 @@
+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-r2.ebuild b/net-im/gaim/gaim-2.0.0_beta3-r2.ebuild
new file mode 100644
index 000000000000..ce6c313772fd
--- /dev/null
+++ b/net-im/gaim/gaim-2.0.0_beta3-r2.ebuild
@@ -0,0 +1,234 @@
+# 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-r2.ebuild,v 1.1 2006/09/06 00:54:18 tester 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 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-misc/xscreensaver
+			x11-libs/libXScrnSaver )"
+
+DEPEND="$RDEPEND
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+
+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 "Again, this is a beta release and should not be used by those"
+	ewarn "with a heart condition, if you are pregnant, or if you are under"
+	ewarn "the age of 8. Side-effects include awesomeness, dumbfoundedness,"
+	ewarn "dry mouth and lava. Consult your doctor to find out if"
+	ewarn "${MY_P} is right for you."
+	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 avahi && ! built_with_use net-dns/avahi howl-compat ; then
+	eerror
+	eerror You need to rebuild net-dns/avavhi 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
+
+	eautomake || die "Failed running eautomake"
+}
+
+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
+
+	if use doc ; then
+		myconf="${myconf} --enable-doxygen"
+	else
+		myconf="${myconf} --disable-doxygen"
+	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) \
+		${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
+}