diff options
author | 2006-10-19 22:08:35 +0000 | |
---|---|---|
committer | 2006-10-19 22:08:35 +0000 | |
commit | 696671c028508fb9e38712ea12a4670404edd716 (patch) | |
tree | cab01c345f219e73fa6c4c6a7a45c92aeb63cda9 /net-im/gaim | |
parent | Version bump wrt bug #149927 and cleanup (diff) | |
download | historical-696671c028508fb9e38712ea12a4670404edd716.tar.gz historical-696671c028508fb9e38712ea12a4670404edd716.tar.bz2 historical-696671c028508fb9e38712ea12a4670404edd716.zip |
Version bump thanks to Jory A. Pratt for the ebuild modifications
Package-Manager: portage-2.1.2_pre2-r9
Diffstat (limited to 'net-im/gaim')
-rw-r--r-- | net-im/gaim/ChangeLog | 8 | ||||
-rw-r--r-- | net-im/gaim/Manifest | 20 | ||||
-rw-r--r-- | net-im/gaim/files/digest-gaim-2.0.0_beta4 | 3 | ||||
-rw-r--r-- | net-im/gaim/files/gaim-2.0.0_beta4-dbus.patch | 62 | ||||
-rw-r--r-- | net-im/gaim/gaim-2.0.0_beta4.ebuild | 229 |
5 files changed, 317 insertions, 5 deletions
diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog index bd63151f2919..863cdfcd2e61 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.415 2006/10/16 23:34:32 gothgirl Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.416 2006/10/19 22:08:35 gothgirl Exp $ + +*gaim-2.0.0_beta4 (19 Oct 2006) + + 19 Oct 2006; gothgirl <gothgirl@gentoo.org> + +files/gaim-2.0.0_beta4-dbus.patch, +gaim-2.0.0_beta4.ebuild: + Version bump thanks to Jory A. Pratt for the ebuild modifications 16 Oct 2006; gothgirl <gothgirl@gentoo.org> +files/gaim-2.0.0_beta3-dbus-1.patch, gaim-2.0.0_beta3-r4.ebuild: diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest index dfb19d914b53..9894a58cd451 100644 --- a/net-im/gaim/Manifest +++ b/net-im/gaim/Manifest @@ -14,8 +14,13 @@ AUX gaim-2.0.0_beta3-dbus-1.patch 2845 RMD160 8a16ba09713a28a93fce789c9daa98f12f MD5 fe24d2f46894db059e7f41e48a6789c3 files/gaim-2.0.0_beta3-dbus-1.patch 2845 RMD160 8a16ba09713a28a93fce789c9daa98f12fdb533c files/gaim-2.0.0_beta3-dbus-1.patch 2845 SHA256 886e5918f1cdddf172e9db52c049d7571dc1bb277faa75d154c78a0ef658e447 files/gaim-2.0.0_beta3-dbus-1.patch 2845 +AUX gaim-2.0.0_beta4-dbus.patch 2347 RMD160 df8f4261289b1f1dd5dfb25d10c2750bb61cae3f SHA1 fbf4801f56008641e6de5c8a52c2710302cbb3a2 SHA256 ccdb151171d8df331f7192aeb3b04767627f608e5b0d9b06a9173be484f2b6bd +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 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 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 @@ -24,10 +29,14 @@ EBUILD gaim-2.0.0_beta3-r4.ebuild 6303 RMD160 2e298efa3f36ef9e7b3b8749f8e8992ff8 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 -MISC ChangeLog 60490 RMD160 a555d0b3f65b7e39e327f2bbb118fbb9a65e21d6 SHA1 3c9d529c5fc54b5b3147531c8f812cf7f30de43c SHA256 d2a3e87663c17b33c9b14300ef3cb4c7635d151b36cf955685a86a551a503cac -MD5 dd8fbf1b952399ee96ecffaacb43d6f9 ChangeLog 60490 -RMD160 a555d0b3f65b7e39e327f2bbb118fbb9a65e21d6 ChangeLog 60490 -SHA256 d2a3e87663c17b33c9b14300ef3cb4c7635d151b36cf955685a86a551a503cac ChangeLog 60490 +EBUILD gaim-2.0.0_beta4.ebuild 6284 RMD160 15e86ca7c5b0915cb23ec65eec9c56f1cad9b131 SHA1 252775fa56cc21e7569a71df462ae3b3cc8c9e22 SHA256 43e829bb60e5d633db7265db9f71fa5071de48692b35a19017a18c839bff661a +MD5 7c06a82215d27d67eaac0ed80302540e gaim-2.0.0_beta4.ebuild 6284 +RMD160 15e86ca7c5b0915cb23ec65eec9c56f1cad9b131 gaim-2.0.0_beta4.ebuild 6284 +SHA256 43e829bb60e5d633db7265db9f71fa5071de48692b35a19017a18c839bff661a gaim-2.0.0_beta4.ebuild 6284 +MISC ChangeLog 60702 RMD160 69fb5fbe9f328cdb23d100e2cb41ee242f21ae8e SHA1 cb3d0639f294b21369f5a01a347283479c2d17a0 SHA256 b2c5b07630919584cf09b87add37389a689cd23ebe7e2ad043ed7557256278d4 +MD5 e191b1bfe16dc594e39da0bcc6290470 ChangeLog 60702 +RMD160 69fb5fbe9f328cdb23d100e2cb41ee242f21ae8e ChangeLog 60702 +SHA256 b2c5b07630919584cf09b87add37389a689cd23ebe7e2ad043ed7557256278d4 ChangeLog 60702 MISC metadata.xml 414 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 SHA1 9cd1e1d6345fc95f73379f5ee554a8e70860e067 SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 metadata.xml 414 @@ -38,3 +47,6 @@ SHA256 0eeeff6fff0204e03a372c96611f8db0135f38286f7abade6be47aef06463f5b files/di 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 diff --git a/net-im/gaim/files/digest-gaim-2.0.0_beta4 b/net-im/gaim/files/digest-gaim-2.0.0_beta4 new file mode 100644 index 000000000000..db30a0a3dd8a --- /dev/null +++ b/net-im/gaim/files/digest-gaim-2.0.0_beta4 @@ -0,0 +1,3 @@ +MD5 ddf49cb3f95febdd26bf2214875446e6 gaim-2.0.0beta4.tar.bz2 6298151 +RMD160 c9c5931fc2b2bf1c5bc524e6dc2b68c28a6570f1 gaim-2.0.0beta4.tar.bz2 6298151 +SHA256 08436e3fcb4caa61b92551e5e2c092ea94caae6520d50c479a164b93caedb820 gaim-2.0.0beta4.tar.bz2 6298151 diff --git a/net-im/gaim/files/gaim-2.0.0_beta4-dbus.patch b/net-im/gaim/files/gaim-2.0.0_beta4-dbus.patch new file mode 100644 index 000000000000..a77178a28f0c --- /dev/null +++ b/net-im/gaim/files/gaim-2.0.0_beta4-dbus.patch @@ -0,0 +1,62 @@ +diff -Nru gaim-2.0.0beta4-old/gtk/Makefile.am gaim-2.0.0beta4/gtk/Makefile.am +--- gaim-2.0.0beta4-old/gtk/Makefile.am 2006-10-18 12:37:48.000000000 -0500 ++++ gaim-2.0.0beta4/gtk/Makefile.am 2006-10-19 12:36:13.000000000 -0500 +@@ -161,6 +161,7 @@ + gaim_LDFLAGS = -export-dynamic + gaim_LDADD = \ + @LIBOBJS@ \ ++ $(GLIB_LIBS) \ + $(DBUS_LIBS) \ + $(GSTREAMER_LIBS) \ + $(STATIC_LINK_LIBS) \ +diff -Nru gaim-2.0.0beta4-old/gtk/Makefile.in gaim-2.0.0beta4/gtk/Makefile.in +--- gaim-2.0.0beta4-old/gtk/Makefile.in 2006-10-18 15:00:12.000000000 -0500 ++++ gaim-2.0.0beta4/gtk/Makefile.in 2006-10-19 12:37:26.000000000 -0500 +@@ -611,6 +611,7 @@ + @ENABLE_GTK_TRUE@gaim_LDFLAGS = -export-dynamic + @ENABLE_GTK_TRUE@gaim_LDADD = \ + @ENABLE_GTK_TRUE@ @LIBOBJS@ \ ++@ENABLE_GTK_TRUE@ $(GLIB_LIBS) \ + @ENABLE_GTK_TRUE@ $(DBUS_LIBS) \ + @ENABLE_GTK_TRUE@ $(GSTREAMER_LIBS) \ + @ENABLE_GTK_TRUE@ $(STATIC_LINK_LIBS) \ +diff -Nru gaim-2.0.0beta4-old/gtk/gtkmain.c gaim-2.0.0beta4/gtk/gtkmain.c +--- gaim-2.0.0beta4-old/gtk/gtkmain.c 2006-10-18 12:37:48.000000000 -0500 ++++ gaim-2.0.0beta4/gtk/gtkmain.c 2006-10-19 12:42:42.000000000 -0500 +@@ -65,6 +65,7 @@ + #include "gtkutils.h" + #include "gaimstock.h" + #include "gtkwhiteboard.h" ++#include <glib/gthread.h> + + #ifdef HAVE_SIGNAL_H + # include <signal.h> +@@ -675,6 +676,16 @@ + gtk_rc_add_default_file(search_path); + g_free(search_path); + ++#if (defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE)) ++ /* Since threads can be yanked in all unawares by other libraries, ++ * and some libraries aren't smart enough to initialize the thread ++ * subsystem when they need it, we need to do this here. We also ++ * threadify dbus when that gets initialized. Ugh. */ ++ if (!g_thread_supported()) ++ g_thread_init(NULL); ++ gdk_threads_init(); ++#endif /* Glib has threads */ ++ + gui_check = gtk_init_check(&argc, &argv); + if (!gui_check) { + char *display = gdk_get_display(); +diff -Nru gaim-2.0.0beta4-old/libgaim/dbus-server.c gaim-2.0.0beta4/libgaim/dbus-server.c +--- gaim-2.0.0beta4-old/libgaim/dbus-server.c 2006-10-18 12:38:16.000000000 -0500 ++++ gaim-2.0.0beta4/libgaim/dbus-server.c 2006-10-19 12:34:57.000000000 -0500 +@@ -758,6 +758,8 @@ + void + gaim_dbus_init(void) + { ++ if(g_thread_supported()) ++ dbus_g_thread_init(); + gaim_dbus_init_ids(); + + g_free(init_error); diff --git a/net-im/gaim/gaim-2.0.0_beta4.ebuild b/net-im/gaim/gaim-2.0.0_beta4.ebuild new file mode 100644 index 000000000000..85317cd30299 --- /dev/null +++ b/net-im/gaim/gaim-2.0.0_beta4.ebuild @@ -0,0 +1,229 @@ +# 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_beta4.ebuild,v 1.1 2006/10/19 22:08:35 gothgirl Exp $ + +inherit flag-o-matic eutils toolchain-funcs debug multilib mono autotools perl-app gnome2 + +MY_PV=${P/_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_PV}.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 qq 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 ) + dev-libs/libxml2" + +DEPEND="$RDEPEND + 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,msn,oscar,yahoo,zephyr,simple" + +# 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() { + gnome2_src_unpack + epatch "${FILESDIR}"/"${P}"-dbus.patch +} + +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 gadu; then + DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg" + 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 bounjour; then + DYNAMIC_PRPLS="${DYNAMIC_PRPLS},bonjour" + 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 + + G2CONF=" \ + $(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) \ + "--with-dynamic-prpls=${DYNAMIC_PRPLS}" \ + ${myconf} " || die "Configuration failed" + + gnome2_src_compile || die "Make failed" +} + +src_install() { + gnome2_src_install || die "Install failed" + use perl && fixlocalpod + dodoc AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog +} + +pkg_postinst() { + gnome2_gconf_install + print_gaim_warning +} |