Version bump, bug #329401, thank tman for report.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 22 insertions, 185 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index 9269e30b81bf..566203239fdb 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/pidgin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.177 2010/07/22 13:29:31 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.178 2010/07/22 14:16:07 pva Exp $
+
+*pidgin-2.7.2 (22 Jul 2010)
+
+  22 Jul 2010; Peter Volkov <pva@gentoo.org> -pidgin-2.6.6.ebuild,
+  -pidgin-2.7.1.ebuild, +pidgin-2.7.2.ebuild:
+  Version bump, bug #329401, thank tman for report.
 
   22 Jul 2010; Peter Volkov <pva@gentoo.org> pidgin-2.7.1-r1.ebuild,
   metadata.xml:
diff --git a/net-im/pidgin/pidgin-2.6.6.ebuild b/net-im/pidgin/pidgin-2.6.6.ebuild
deleted file mode 100644
index d5cfa0b701c6..000000000000
--- a/net-im/pidgin/pidgin-2.6.6.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.6.6.ebuild,v 1.11 2010/04/13 06:21:42 pva Exp $
-
-EAPI=2
-
-GENTOO_DEPEND_ON_PERL=no
-inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 autotools
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://pidgin.im/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="dbus debug doc eds gadu gnutls +gstreamer idn meanwhile networkmanager"
-IUSE+=" nls perl silc tcl tk spell qq gadu +gtk sasl +startup-notification"
-IUSE+=" ncurses groupwise prediction +xscreensaver zephyr zeroconf" # mono"
-
-RDEPEND="
-	>=dev-libs/glib-2.4
-	>=dev-libs/libxml2-2.6.18
-	ncurses? ( sys-libs/ncurses[unicode] )
-	gtk? (
-		>=x11-libs/gtk+-2.4:2
-		x11-libs/libSM
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		startup-notification? ( >=x11-libs/startup-notification-0.5 )
-		spell? ( >=app-text/gtkspell-2.0.2 )
-		eds? ( <gnome-extra/evolution-data-server-2.30 )
-		prediction? ( >=dev-db/sqlite-3.3:3 ) )
-	gstreamer? ( =media-libs/gstreamer-0.10*
-		=media-libs/gst-plugins-good-0.10*
-		>=net-libs/farsight2-0.0.14
-		media-plugins/gst-plugins-meta
-		media-plugins/gst-plugins-gconf )
-	zeroconf? ( 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 )
-	perl? ( >=dev-lang/perl-5.8.2-r1[-build] )
-	gadu?  ( net-libs/libgadu[-ssl] )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( >=dev-libs/nss-3.11 )
-	meanwhile? ( net-libs/meanwhile )
-	silc? ( >=net-im/silc-toolkit-1.0.1 )
-	zephyr? ( >=app-crypt/mit-krb5-1.3.6-r1[krb4] )
-	tcl? ( dev-lang/tcl )
-	tk? ( dev-lang/tk )
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	networkmanager? ( net-misc/networkmanager )
-	idn? ( net-dns/libidn )"
-	# Mono support crashes pidgin
-	#mono? ( dev-lang/mono )"
-
-DEPEND="$RDEPEND
-	dev-lang/perl
-	dev-perl/XML-Parser
-	dev-util/pkgconfig
-	dev-util/intltool
-	gtk? ( x11-proto/scrnsaverproto )
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
-
-# List of plugins
-#   app-accessibility/pidgin-festival
-#   net-im/librvp
-#   x11-plugins/guifications
-#	x11-plugins/msn-pecan
-#   x11-plugins/pidgin-encryption
-#   x11-plugins/pidgin-extprefs
-#   x11-plugins/pidgin-hotkeys
-#   x11-plugins/pidgin-latex
-#   x11-plugins/pidgintex
-#   x11-plugins/pidgin-libnotify
-#   x11-plugins/pidgin-otr
-#   x11-plugins/pidgin-rhythmbox
-#   x11-plugins/purple-plugin_pack
-#   x11-themes/pidgin-smileys
-#	x11-plugins/pidgin-knotify
-# Plugins in Sunrise:
-#	x11-plugins/pidgimpd
-#	x11-plugins/pidgin-birthday
-#	x11-plugins/pidgin-botsentry
-#	x11-plugins/pidgin-convreverse
-#	x11-plugins/pidgin-extended-blist-sort
-#	x11-plugins/pidgin-lastfm
-#	x11-plugins/pidgin-mbpurple
-
-pkg_setup() {
-	if ! use gtk && ! use ncurses ; then
-		einfo
-		elog "You did not pick the ncurses or gtk use flags, only libpurple"
-		elog "will be built."
-		einfo
-	fi
-	if ! use xscreensaver; then
-		elog "Note: xscreensaver USE flag is disabled. Thus pidgin will be unable"
-		elog "to monitor idle/active status based on mouse/keyboard events"
-	fi
-}
-
-src_prepare() {
-	intltoolize --automake --copy --force || die
-	eautoreconf
-}
-
-src_configure() {
-	# Stabilize things, for your own good
-	strip-flags
-	replace-flags -O? -O2
-
-	local myconf
-
-	if use gadu; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
-			myconf="${myconf} --with-gadu-includes=."
-			myconf="${myconf} --with-gadu-libs=."
-	fi
-
-	use silc && DYNAMIC_PRPLS+=",silc"
-	use qq && DYNAMIC_PRPLS+=",qq"
-	use meanwhile && DYNAMIC_PRPLS+=",sametime"
-	use zeroconf && DYNAMIC_PRPLS+=",bonjour"
-	use groupwise && DYNAMIC_PRPLS+=",novell"
-	use zephyr && DYNAMIC_PRPLS+=",zephyr"
-
-	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
-
-	econf \
-		$(use_enable ncurses consoleui) \
-		$(use_enable nls) \
-		$(use_enable gtk gtkui) \
-		$(use_enable gtk sm) \
-		$(use gtk && use_enable startup-notification) \
-		$(use gtk && use_enable xscreensaver screensaver) \
-		$(use gtk && use_enable prediction cap) \
-		$(use gtk && use_enable eds gevolution) \
-		$(use gtk && use_enable spell gtkspell) \
-		$(use_enable perl) \
-		$(use_enable tk) \
-		$(use_enable tcl) \
-		$(use_enable debug) \
-		$(use_enable dbus) \
-		$(use_enable meanwhile) \
-		$(use_enable gstreamer) \
-		$(use_enable gstreamer farsight) \
-		$(use_enable gstreamer vv) \
-		$(use_enable sasl cyrus-sasl ) \
-		$(use_enable doc doxygen) \
-		$(use_enable networkmanager nm) \
-		$(use_with zephyr krb4) \
-		$(use_enable zeroconf avahi) \
-		$(use_enable idn) \
-		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
-		--disable-mono \
-		--x-includes=/usr/include/X11 \
-		${myconf}
-		#$(use_enable mono) \
-}
-
-src_install() {
-	gnome2_src_install
-	use perl && fixlocalpod
-	dodoc AUTHORS HACKING INSTALL NEWS README ChangeLog
-}
diff --git a/net-im/pidgin/pidgin-2.7.1.ebuild b/net-im/pidgin/pidgin-2.7.2.ebuild
index 87c4bac67940..9245dfe192f4 100644
--- a/net-im/pidgin/pidgin-2.7.1.ebuild
+++ b/net-im/pidgin/pidgin-2.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.1.ebuild,v 1.4 2010/06/10 13:20:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.2.ebuild,v 1.1 2010/07/22 14:16:07 pva Exp $
 
 EAPI=2
 
@@ -106,10 +106,6 @@ pkg_setup() {
 		elog "will be built."
 		einfo
 	fi
-	if ! use xscreensaver; then
-		elog "Note: xscreensaver USE flag is disabled. Thus pidgin will be unable"
-		elog "to monitor idle/active status based on mouse/keyboard events"
-	fi
 	if use dbus && ! use python; then
 		elog "It's impossible to disable linkage with python in case dbus is enabled."
 	fi
@@ -189,5 +185,19 @@ src_configure() {
 
 src_install() {
 	gnome2_src_install
+	if use gtk; then
+		# Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other
+		# implementations that are not complient with new hicolor theme yet, #323355
+		local pixmapdir
+		for d in 16 22 32 48; do
+			pixmapdir=${D}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
+			mkdir "${pixmapdir}" || die
+			pushd "${pixmapdir}" >/dev/null || die
+			for f in ../status/*; do
+				ln -s ${f} || die
+			done
+			popd >/dev/null
+		done
+	fi
 	use perl && fixlocalpod
 }