Version bump
authorOlivier Crête <tester@gentoo.org>
Wed, 5 Mar 2008 19:32:29 +0000 (19:32 +0000)
committerOlivier Crête <tester@gentoo.org>
Wed, 5 Mar 2008 19:32:29 +0000 (19:32 +0000)
Package-Manager: portage-2.1.4.4

net-im/pidgin/ChangeLog
net-im/pidgin/Manifest
net-im/pidgin/pidgin-2.2.1.ebuild [deleted file]
net-im/pidgin/pidgin-2.4.0.ebuild [moved from net-im/pidgin/pidgin-2.2.2.ebuild with 75% similarity]

index cd866107d21e52c235402a34cdc32974acffb997..7c2b832638ff55b7752102486d7a387486602af9 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/pidgin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.48 2008/02/19 19:54:52 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.49 2008/03/05 19:32:29 tester Exp $
+
+*pidgin-2.4.0 (01 Mar 2008)
+
+  01 Mar 2008; <tester@gentoo.org> -pidgin-2.2.1.ebuild,
+  -pidgin-2.2.2.ebuild, +pidgin-2.4.0.ebuild:
+  Version bump
 
   19 Feb 2008; Christoph Mende <angelos@gentoo.org> pidgin-2.3.1.ebuild:
   Stable on amd64, bug #210396
index 6db7b1b654d1bb7f7ab7171d6a8e95c430bf6884..a4f0e6b4e533fa6bf8737d62a14d0b1f7a4968c3 100644 (file)
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST pidgin-2.2.1.tar.bz2 8882043 RMD160 6fa217ad5d55ea8e5c5f06322528c5c06e3b8faa SHA1 2dc920b156a2ba559108042ac2178f3bb8282e8e SHA256 6efbefe325f6eab711a5fbdc4b758b4585a4cda68c98dd2e11ccfc8d98075823
-DIST pidgin-2.2.2.tar.bz2 8901875 RMD160 1f067d84c1b8545ab1c4841c30fb3db2a3fac309 SHA1 ff955c3a2509d257c7fda1a48af6bdde439b0d8a SHA256 610efaefb869cb9b16ca0bb9b92779c41584f8965988a61a81e593d0510377ac
 DIST pidgin-2.3.1.tar.bz2 9358563 RMD160 f7473efa72974610224ea622fcc02d4703552d2c SHA1 d247d085e89360c2a6bd8e4775b7814fd02d10c9 SHA256 2d083687734b232c18b9d4500a314cff5ba1a2584350832c9688ecec668eb79e
-EBUILD pidgin-2.2.1.ebuild 6812 RMD160 f6c4c84195c6a63e87f98d562f990e2a3ff628f9 SHA1 aa5b02c8cf3a653e7d080f5706e0d67df5a911da SHA256 89db4f98afc9cbb1718e781a1012f85bedd4640ffbba5f0b2b3213e89776b6d4
-EBUILD pidgin-2.2.2.ebuild 6828 RMD160 20c1a87b6579c155a7752e2efd8873d3c48b0c02 SHA1 2360e85c6630493990650c1923f7408ccf27897f SHA256 e4a00564446618101e0fa8a0598d263a17b38acfc06e96e9456d3936bbcd6a5e
+DIST pidgin-2.4.0.tar.bz2 9515789 RMD160 72fa45c8ca26ff9f5bbd23e0d1ce91ff68b972b2 SHA1 a44469271c00604708c4f1ca37365af0f3cbf924 SHA256 6e35ee6abaa2a57fb8a347ca29c9213cd2c23768d819a7d1615ca7578b6b1ec1
 EBUILD pidgin-2.3.1.ebuild 5733 RMD160 63252e9889fde319843fa7094fd22ed495e2ba96 SHA1 e3212d8e84dab05d2f9e4d2d83b7014b8f6335e3 SHA256 5218a123a863f65d3751030f03e5222b7d53f711b006edfe7d7796533493aa07
-MISC ChangeLog 6953 RMD160 ed08948e2a7197ceb4e47105ded6c524f38029fe SHA1 d62777f09a82945de2170071dbb922914292a222 SHA256 d85c551f15dd4162c9d282c6ef3552e0028178b4370c316fe3a8cfb6a857bc96
+EBUILD pidgin-2.4.0.ebuild 5739 RMD160 5ca498d6224d79fec44ad44f96d8badef07b6d26 SHA1 b3754a12eaadf190e73eba2bbc8bf4975cc21a01 SHA256 5e8387e4da2d70157f7db74e5345a82718cc3daed8c6bcfa0a1976155dd3c21a
+MISC ChangeLog 7100 RMD160 7279343fb75a5156820ec477d065a5946859eacc SHA1 954041dee66ff165db0bedcfa992a53b738cdbad SHA256 3f15ff6e3f66ab762278cbe3e25705ea5f4eab7e074130043d9e4f3f42449cf6
 MISC metadata.xml 458 RMD160 dca91f12277688e0a35ab2aefc0d46c8c70facbd SHA1 7dc17a356911852b3f5867e3629ef02a46adb675 SHA256 4457ab0d5db90f61e9d916879c32d1e0a7c6d15f2f7c955a17e5e31cb0777ba9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHuzQSKhnDs22gwa8RAlhtAJ9C7AWIAvogRUluNY3sedqyLNspiwCfV1hW
-lNq9OYhp5baRnSd6kDx+0H0=
-=eX0A
+iD8DBQFHzvVPmOfEJZHYOKcRAkUxAKCN1Pg0copgbdxIXFFNa2P7lKmG8QCghFBN
+jbkrzRaP/WJOCuWlKSiMKnk=
+=RJH4
 -----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/pidgin-2.2.1.ebuild b/net-im/pidgin/pidgin-2.2.1.ebuild
deleted file mode 100644 (file)
index c0ec45a..0000000
+++ /dev/null
@@ -1,244 +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.2.1.ebuild,v 1.6 2007/10/04 14:24:05 beandog Exp $
-
-inherit flag-o-matic eutils toolchain-funcs multilib 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="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE="bonjour dbus debug doc eds gadu gnutls gstreamer meanwhile networkmanager nls perl silc tcl tk spell qq gadu"
-IUSE="${IUSE} gtk sasl ncurses groupwise prediction zephyr" # mono"
-
-RDEPEND="
-       bonjour? ( 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
-               >=x11-libs/startup-notification-0.5
-               x11-libs/libXScrnSaver
-               eds? ( gnome-extra/evolution-data-server )      )
-       >=dev-libs/glib-2.0
-       gstreamer? ( =media-libs/gstreamer-0.10*
-                    =media-libs/gst-plugins-good-0.10* )
-       perl? ( >=dev-lang/perl-5.8.2-r1 )
-       gadu?  ( net-libs/libgadu )
-       gnutls? ( net-libs/gnutls )
-       !gnutls? ( >=dev-libs/nss-3.11 )
-       meanwhile? ( net-libs/meanwhile )
-       silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
-       zephyr? ( >=app-crypt/mit-krb5-1.3.6-r1 )
-       tcl? ( dev-lang/tcl )
-       tk? ( dev-lang/tk )
-       sasl? ( >=dev-libs/cyrus-sasl-2 )
-       doc? ( app-doc/doxygen )
-       dev-libs/libxml2
-       networkmanager? ( net-misc/networkmanager )
-       prediction? ( =dev-db/sqlite-3* )"
-       #mono? ( dev-lang/mono )"
-
-DEPEND="$RDEPEND
-       dev-lang/perl
-       dev-perl/XML-Parser
-       dev-util/pkgconfig
-       nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_PV}"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,zephyr,simple,msn,myspace"
-
-# List of plugins yet to be ported (will be removed at some point)
-#   net-im/gaim-bnet
-#   x11-plugins/autoprofile
-#   x11-plugins/gaim-xfire
-#   x11-plugins/gaim-galago
-#   x11-themes/gaim-smileys (get liquidx to fix it)
-
-# Abandonned
-#   x11-plugins/ignorance
-#   x11-plugins/bangexec
-#   x11-plugins/gaim-assistant
-# Last release in 2004
-#   net-im/gaim-blogger
-#   x11-plugins/gaimosd
-# Last release in 2005
-#   app-accessibility/festival-gaim
-# Merged into something else
-#   net-im/gaim-meanwhile (integrated in gaim)
-#   net-im/gaim-snpp (merged into the plugin pack)
-#   x11-plugins/gaim-slashexec (integrated into plugin pack)
-
-# List of plugins
-#   net-im/librvp
-#   x11-plugins/guifications
-#   x11-plugins/pidgin-encryption
-#   x11-plugins/pidgin-extprefs
-#   x11-plugins/pidgin-hotkeys
-#   x11-plugins/pidgin-latex
-#   x11-plugins/pidgin-libnotify
-#   x11-plugins/pidgin-otr
-#   x11-plugins/pidgin-rhythmbox
-#   x11-plugins/purple-plugin_pack
-
-print_pidgin_warning() {
-       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 "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://developer.pidgin.im/wiki/GetABacktrace for details on"
-       ewarn "backtraces."
-       ewarn
-       ewarn "Please read the pidgin FAQ at http://developer.pidgin.im/wiki/FAQ"
-       ewarn
-}
-
-pkg_setup() {
-       print_pidgin_warning
-
-       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 ncurses &&  ! 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 ncurses ; then
-               einfo
-               elog "As you did not pick gtk or ncurses use flag, building"
-               elog "console only."
-               einfo
-       fi
-
-       if use zephyr && ! built_with_use app-crypt/mit-krb5 krb4 ; then
-               eerror
-               eerror "You need to rebuild app-crypt/mit-krb5 with USE=krb4 in order to"
-               eerror "enable krb4 support for the zephyr protocol in pidgin"
-               eerror
-               die "Configure failed"
-       fi
-
-}
-
-src_compile() {
-       # Stabilize things, for your own good
-       strip-flags
-       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 groupwise; then
-               DYNAMIC_PRPLS="${DYNAMIC_PRPLS},novell"
-       fi
-
-       if use zephyr; then
-               DYNAMIC_PRPLS="${DYNAMIC_PRPLS},zephyr"
-       fi
-
-       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
-
-       if ! use ncurses && ! use gtk; then
-               myconf="${myconf} --enable-consoleui --disable-gtkui"
-       else
-               myconf="${myconf} $(use_enable ncurses consoleui) $(use_enable gtk gtkui)"
-       fi
-
-       econf \
-               $(use_enable nls) \
-               $(use_enable perl) \
-               $(use_enable gtk startup-notification) \
-               $(use_enable gtk screensaver) \
-               $(use_enable gtk sm) \
-               $(use_enable tcl) \
-               $(use_enable spell gtkspell) \
-               $(use_enable tk) \
-               $(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) \
-               $(use_enable networkmanager nm) \
-               $(use_with zephyr krb4) \
-               "--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
-               --disable-mono \
-               --x-includes=/usr/include/X11 \
-               ${myconf} || die "Configuration failed"
-               #$(use_enable mono) \
-
-               emake || die "make failed"
-}
-
-src_install() {
-       gnome2_src_install
-       use perl && fixlocalpod
-       dodoc AUTHORS COPYING HACKING INSTALL NEWS README ChangeLog
-}
-
-pkg_postinst() {
-       gnome2_pkg_postinst
-       print_pidgin_warning
-}
similarity index 75%
rename from net-im/pidgin/pidgin-2.2.2.ebuild
rename to net-im/pidgin/pidgin-2.4.0.ebuild
index 604d142394e62273eee8442227492732fd4744eb..6ccf5a67a965e5829f178ee66e44dd655504c8b7 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.2.2.ebuild,v 1.2 2007/11/30 16:42:23 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.4.0.ebuild,v 1.1 2008/03/05 19:32:29 tester Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2
 
@@ -41,7 +41,6 @@ RDEPEND="
        tcl? ( dev-lang/tcl )
        tk? ( dev-lang/tk )
        sasl? ( >=dev-libs/cyrus-sasl-2 )
-       doc? ( app-doc/doxygen )
        dev-libs/libxml2
        networkmanager? ( net-misc/networkmanager )
        prediction? ( =dev-db/sqlite-3* )"
@@ -51,30 +50,13 @@ DEPEND="$RDEPEND
        dev-lang/perl
        dev-perl/XML-Parser
        dev-util/pkgconfig
+       doc? ( app-doc/doxygen )
        nls? ( sys-devel/gettext )"
 
 S="${WORKDIR}/${MY_PV}"
 
 # Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,zephyr,simple,msn,myspace"
-
-# List of plugins yet to be ported (will be removed at some point)
-#   net-im/gaim-bnet
-#   x11-plugins/autoprofile
-#   x11-plugins/gaim-xfire
-#   x11-plugins/gaim-galago
-
-# Abandonned
-#   x11-plugins/gaim-assistant
-# Last release in 2004
-#   net-im/gaim-blogger
-#   x11-plugins/gaimosd
-# Merged into something else
-#   net-im/gaim-meanwhile (integrated in gaim)
-#   net-im/gaim-snpp (merged into the plugin pack)
-#   x11-plugins/gaim-slashexec (integrated into plugin pack)
-#   x11-plugins/ignorance (into plugin pack)
-#   x11-plugins/bangexec (into slashexec into plugin pack)
+DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
 
 # List of plugins
 #   app-accessibility/pidgin-festival
@@ -91,17 +73,9 @@ DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,zephyr,simple,msn,myspace"
 #   x11-themes/pidgin-smileys
 
 print_pidgin_warning() {
-       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 "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 "Gentoo's bugzilla, http://bugs.gentoo.org"
        ewarn
        ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg"
        ewarn "faults, see http://developer.pidgin.im/wiki/GetABacktrace for details on"
@@ -132,8 +106,8 @@ pkg_setup() {
 
        if ! use gtk && ! use ncurses ; then
                einfo
-               elog "As you did not pick gtk or ncurses use flag, building"
-               elog "console only."
+               elog "You did not pick the ncurses or gtk use flags, only libpurple"
+               elog "will be built."
                einfo
        fi
 
@@ -197,15 +171,11 @@ src_compile() {
                myconf="${myconf} --enable-gnutls=no --enable-nss=yes"
        fi
 
-       if ! use ncurses && ! use gtk; then
-               myconf="${myconf} --enable-consoleui --disable-gtkui"
-       else
-               myconf="${myconf} $(use_enable ncurses consoleui) $(use_enable gtk gtkui)"
-       fi
-
        econf \
+               $(use_enable ncurses consoleui) \
                $(use_enable nls) \
                $(use_enable perl) \
+               $(use_enable gtk gtkui) \
                $(use_enable gtk startup-notification) \
                $(use_enable gtk screensaver) \
                $(use_enable gtk sm) \
@@ -234,7 +204,10 @@ src_compile() {
 src_install() {
        gnome2_src_install
        use perl && fixlocalpod
-       dodoc AUTHORS COPYING HACKING INSTALL NEWS README ChangeLog
+       dodoc AUTHORS HACKING INSTALL NEWS README ChangeLog
+
+       # Remove superfluous desktop file
+       use gtk || rm -rf "${D}/usr/share/applications"
 }
 
 pkg_postinst() {