From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QWwtt-0004Mw-MI for garchives@archives.gentoo.org; Wed, 15 Jun 2011 20:41:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9FA791C045; Wed, 15 Jun 2011 20:41:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 505981C045 for ; Wed, 15 Jun 2011 20:41:10 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C6B961B402B for ; Wed, 15 Jun 2011 20:41:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9811C8003C for ; Wed, 15 Jun 2011 20:41:08 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <7be5c0f2f8fcdeafd08b8771c0bcf276278282f6.chutzpah@gentoo> Subject: [gentoo-commits] dev/chutzpah:master commit in: net-im/pidgin/ X-VCS-Repository: dev/chutzpah X-VCS-Files: net-im/pidgin/Manifest net-im/pidgin/pidgin-2.7.10.ebuild net-im/pidgin/pidgin-2.7.11.ebuild net-im/pidgin/pidgin-2.8.0.ebuild X-VCS-Directories: net-im/pidgin/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 7be5c0f2f8fcdeafd08b8771c0bcf276278282f6 Date: Wed, 15 Jun 2011 20:41:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: d68c8588918ee0cb0c4b7bc7139b9d8e commit: 7be5c0f2f8fcdeafd08b8771c0bcf276278282f6 Author: Patrick McLean gentoo org> AuthorDate: Wed Jun 15 20:40:51 2011 +0000 Commit: Patrick McLean gentoo org> CommitDate: Wed Jun 15 20:40:51 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/chutzpah.git;a= =3Dcommit;h=3D7be5c0f2 Pidgin version bump --- net-im/pidgin/Manifest | 34 ++-- net-im/pidgin/pidgin-2.7.10.ebuild | 223 --------------= ------ .../{pidgin-2.7.11.ebuild =3D> pidgin-2.8.0.ebuild} | 30 ++-- 3 files changed, 33 insertions(+), 254 deletions(-) diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest index ccded2b..dbeb45e 100644 --- a/net-im/pidgin/Manifest +++ b/net-im/pidgin/Manifest @@ -1,26 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 =20 AUX pidgin-2.7.3-ldflags.patch 1332 RMD160 0dd11485e9c990dab1230629faac7= 04835a91ae4 SHA1 7bbb420a206bf6cb366bf501b90c893e896a1f65 SHA256 1f8574a9= c2f056ba8c07559623da8c9ce241928f060898752eef5770dd1d081a AUX pidgin-gnome-keyring-1.patch 7457 RMD160 0d8345675a073c8585bf0be7678= f52d63d14ec95 SHA1 b3dd0d336e4773578cc6e20dc9b317b27f383077 SHA256 f56bc4= a1a678ad749848108ecef76f4bb2b16501908197bb645518e1a3027619 -DIST pidgin-2.7.10.tar.bz2 9970363 RMD160 a79e53ba1ecef4c17e2ebf8121a712= cf03eac6ca SHA1 ebce0b8c6130849e0df1bdc4557470b1d99da45a SHA256 269708d51= 9537d74ff316ff88f5c39e0c04617073a07dce920fa85321586950e -DIST pidgin-2.7.11.tar.bz2 9978175 RMD160 2bee3fe39c02948d10e1fdb6fff284= 0941148786 SHA1 3da07577c15257108d61c7f2d3f63cd422cdb4d7 SHA256 a24e2c311= 8bd47983955d398c9cf5543c12e95527cdf7de9d273a6e92f9d160b -EBUILD pidgin-2.7.10.ebuild 6666 RMD160 6cfcd6ba7bb286e84d6be4d9fd28593d= 8276f84b SHA1 eb517dee2bcf70c6bb5eb737edbb605b481a071f SHA256 37cb2a4787e= 9ed6ad22bad073f95499795ad998824b88bcf5ad4056345eb680a -EBUILD pidgin-2.7.11.ebuild 6632 RMD160 36673abb129cf01421e1c20c1aacd91e= f62699bc SHA1 ead6dcc42d55a3c80db870922eae30a810537c3c SHA256 20af8703f70= 721800aa905339e13f47e1b230783dfd1f82ed36a354f97430bce +DIST pidgin-2.8.0.tar.bz2 9921362 RMD160 92bed10284e2d88e18dbabaa2eac214= c938c9adb SHA1 c5b4f06fc88d57054953044c75563a473bb352fd SHA256 71ced93efe= cd48a1114eaf6370adebf591ace31158457baf023d15892d663c78 +EBUILD pidgin-2.8.0.ebuild 7008 RMD160 9f8dda528cdfc98096661fe3a755ee626= 78f092d SHA1 28c7d53b5bf6bd8a9ddf914a5d550937c696a16a SHA256 4948c69a339f= 19cd13f30af944eb03d0a37d943ed8b9ea0d51da77e611113d90 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) =20 -iQIcBAEBAgAGBQJNfWb8AAoJEHy/RO9cNQiDx1wQAKrTc27ZBypPukAQZCb5d902 -cvQ4is1uB41YsqrEbWOfeqU48UUCOC6TUENtU4DCKEOlKHkt5EPwZdxSmOcAZz0w -3edwnh7jdVsDSk1uisDpJje/CF2I/RCPkJ+YYiWAeLkVD4q+4whGx3wZ2T5wpjie -wzc18b2vzFzKeZRUqZCzg41GS+V2pAgrkYVoEmRy4SxbKMTOk9nheZXA/p+nTu9U -nvd6ulkLNN0VuIga4F3Arzn4pj54piFxO9jMiuCeHZy+nuJOoYH+og+y0fWGsadG -XZevkha5Fh/JYgH5qmD6urDY4pmfNbLF7fTchJA0acoqRd3G405Ez/MhcmCr2F4u -zXs3FLKd4McZ0FbheZz99ePMkEu928KzwcqcviZrIn50nmQGhGM0S0RekE8h5j5M -mbu2u359I5wH0XHGGaXY2ipEJ7F2GHVb1NHeXjQHyXMypxHyvZWZYLtLTwqLNzzk -Lu/yDwW59Y/9cmdEwBTCTvmeH4++SwyR71bJebZpX+dO2SQ6UBZQQcmPfBjgEZQd -4IAaLECuggF2cbZcVTy8W6voSmIWCHS6rYzAeqMva6j8bYIhBgyjF8hvepiFDBXg -JqPx/XuDALtPU2yHRPBO+PHhBC3yN9R3mvX4SDNk10AGBHl7k4MErdrdrnB++0L/ -s/7SltPjY3H5RVlEFrcW -=3DBAFy +iQIcBAEBCAAGBQJN+RjFAAoJEHy/RO9cNQiD+Z4QAKL5VVuOYIyvTitA31HW3nsf +X8sJ7tUCIQagbVICV4mU6sd9fOVBRPagEmjKUKY4nj0KYZxjTNGtqbXckgjQYZti +G3QGOuDXLlW4ggvL775pOCjjXar1UzUTFWklLnChju3wtCxhtKXdkNq+/63XPVWq +nkmIar9wA4j3EqC0fclk+8BD/njJHNPWupCA2Em/no2OtEAKyOb6OFOfAQiZadan +ibtKq8STvCzlxMcYFC7W9HSnTM6Lu5YfLBHAHrgEJZgD2ecvb1fxfXkwf7DBB+Nt +UwobwkrK3Dve9Lg4ohWDZmVJDZc4fVx87QfqmK+IUnGFYF6kt9hS3AUs92co6HXS +BZF3Hq+az53WW/vEZqZ5KQ43FUnXOz1DA7DNtB6gXhP0q5OgUH+izlpFk2IJnVOO +QiPl49PwvJSVM6CUVYhwpD4A+atByQJg3ZyWuzSf9OA23i4SQ4N/WO7gaLd6aXsO +vknwbIdmTqpG6B2Lu4QyhJPKMc2KPkTp4Lz1wolM3294sDx7ysMQ0r6FBxtgx84V +JdUZgiUn/AmK6ottMS6qvLq7GHSJs8wvwsfUFSE1ZbQv0wn7McDf1MQWHsZrgUVY +Bp9KvwUSwpn3uXsmnInJekGY5IDLNv1ffNtNe45XFVyKwdTktAAW6JEZJ2ulcRg3 +7GhjWdxXyFq7QXS3q+LL +=3DiSd0 -----END PGP SIGNATURE----- diff --git a/net-im/pidgin/pidgin-2.7.10.ebuild b/net-im/pidgin/pidgin-2.= 7.10.ebuild deleted file mode 100644 index 37d50a0..0000000 --- a/net-im/pidgin/pidgin-2.7.10.ebuild +++ /dev/null @@ -1,223 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header:=20 - -EAPI=3D2 - -GENTOO_DEPEND_ON_PERL=3Dno -inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 pyt= hon autotools - -DESCRIPTION=3D"GTK Instant Messenger client" -HOMEPAGE=3D"http://pidgin.im/" -SRC_URI=3D"mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE=3D"GPL-2" -SLOT=3D"0" -KEYWORDS=3D"alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86" -IUSE=3D"dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile" -IUSE+=3D" networkmanager nls perl silc tcl tk spell qq sasl +startup-not= ification" -IUSE+=3D" ncurses groupwise prediction python +xscreensaver zephyr zeroc= onf" # mono" -IUSE+=3D" gnome-keyring" - -# dbus requires python to generate C code for dbus bindings (thus DEPEND= only). -# finch uses libgnt that links with libpython - {R,}DEPEND. But still th= ere is -# no way to build dbus and avoid libgnt linkage with python. If you want= this -# send patch upstream. -# purple-url-handler and purple-remote require dbus-python thus in reali= ty we -# rdepend on python if dbus enabled. But it is possible to separate this= dep. -RDEPEND=3D" - >=3Ddev-libs/glib-2.12 - >=3Ddev-libs/libxml2-2.6.18 - ncurses? ( sys-libs/ncurses[unicode] - dbus? ( =3Dx11-libs/gtk+-2.10:2 - x11-libs/libSM - xscreensaver? ( x11-libs/libXScrnSaver ) - startup-notification? ( >=3Dx11-libs/startup-notification-0.5 ) - spell? ( >=3Dapp-text/gtkspell-2.0.2 ) - eds? ( gnome-extra/evolution-data-server ) - prediction? ( >=3Ddev-db/sqlite-3.3:3 ) ) - gstreamer? ( =3Dmedia-libs/gstreamer-0.10* - =3Dmedia-libs/gst-plugins-good-0.10* - >=3Dnet-libs/farsight2-0.0.14 - media-plugins/gst-plugins-meta - media-plugins/gst-plugins-gconf ) - zeroconf? ( net-dns/avahi ) - dbus? ( >=3Ddev-libs/dbus-glib-0.71 - >=3Dsys-apps/dbus-0.90 - dev-python/dbus-python ) - perl? ( >=3Ddev-lang/perl-5.8.2-r1[-build] ) - gadu? ( >=3Dnet-libs/libgadu-1.9.0[-ssl] ) - gnutls? ( net-libs/gnutls ) - !gnutls? ( >=3Ddev-libs/nss-3.11 ) - meanwhile? ( net-libs/meanwhile ) - silc? ( >=3Dnet-im/silc-toolkit-1.0.1 ) - tcl? ( dev-lang/tcl ) - tk? ( dev-lang/tk ) - sasl? ( dev-libs/cyrus-sasl:2 ) - networkmanager? ( net-misc/networkmanager ) - gnome-keyring? ( gnome-base/gnome-keyring ) - idn? ( net-dns/libidn ) - !=3Ddev-util/intltool-0.41.1 sys-devel/gettext" - -DEPEND=3D"$RDEPEND - dev-lang/perl - dev-perl/XML-Parser - dev-util/pkgconfig - gtk? ( x11-proto/scrnsaverproto - ${NLS_DEPEND} ) - dbus? ( nls is enabled!" - fi - if use dbus && ! use python; then - elog "dbus is enabled, no way to disable linkage with python =3D> pyth= on is enabled" - fi - if use dbus || { use ncurses && use python; }; then - python_set_active_version 2 - python_pkg_setup - fi -} - -src_prepare() { - gnome2_src_prepare - epatch "${FILESDIR}"/${PN}-gnome-keyring-1.patch - eautoreconf -} - -src_configure() { - # Stabilize things, for your own good - strip-flags - replace-flags -O? -O2 - - local myconf - - if use gadu; then - DYNAMIC_PRPLS=3D"${DYNAMIC_PRPLS},gg" - myconf=3D"${myconf} --with-gadu-includes=3D." - myconf=3D"${myconf} --with-gadu-libs=3D." - fi - - use silc && DYNAMIC_PRPLS+=3D",silc" - use qq && DYNAMIC_PRPLS+=3D",qq" - use meanwhile && DYNAMIC_PRPLS+=3D",sametime" - use zeroconf && DYNAMIC_PRPLS+=3D",bonjour" - use groupwise && DYNAMIC_PRPLS+=3D",novell" - use zephyr && DYNAMIC_PRPLS+=3D",zephyr" - - if use gnutls; then - einfo "Disabling NSS, using GnuTLS" - myconf+=3D" --enable-nss=3Dno --enable-gnutls=3Dyes" - myconf+=3D" --with-gnutls-includes=3D/usr/include/gnutls" - myconf+=3D" --with-gnutls-libs=3D/usr/$(get_libdir)" - else - einfo "Disabling GnuTLS, using NSS" - myconf+=3D" --enable-gnutls=3Dno --enable-nss=3Dyes" - fi - - if use dbus || { use ncurses && use python; }; then - myconf+=3D" --with-python=3D$(PYTHON)" - else - myconf+=3D" --without-python" - fi - - econf \ - --disable-silent-rules \ - $(use_enable ncurses consoleui) \ - $(use_enable gtk gtkui) \ - $(use_enable gtk sm) \ - $(use gtk || use_enable nls) \ - $(use gtk && echo "--enable-nls") \ - $(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_enable zeroconf avahi) \ - $(use_enable gnome-keyring) \ - $(use_enable idn) \ - --with-system-ssl-certs=3D"/etc/ssl/certs/" \ - --with-dynamic-prpls=3D"${DYNAMIC_PRPLS}" \ - --disable-mono \ - --x-includes=3D/usr/include/X11 \ - ${myconf} - #$(use_enable mono) \ -} - -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=3D${D}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/acti= ons - 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 - - find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la remov= al failed" -} diff --git a/net-im/pidgin/pidgin-2.7.11.ebuild b/net-im/pidgin/pidgin-2.= 8.0.ebuild similarity index 88% rename from net-im/pidgin/pidgin-2.7.11.ebuild rename to net-im/pidgin/pidgin-2.8.0.ebuild index d248b0e..b84fc69 100644 --- a/net-im/pidgin/pidgin-2.7.11.ebuild +++ b/net-im/pidgin/pidgin-2.8.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.11.ebuild,v = 1.5 2011/03/13 18:53:26 klausman Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.8.0.ebuild,v 1= .1 2011/06/14 10:27:08 pva Exp $ =20 -EAPI=3D2 +EAPI=3D3 =20 GENTOO_DEPEND_ON_PERL=3Dno inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 pyt= hon autotools @@ -13,9 +13,9 @@ SRC_URI=3D"mirror://sourceforge/${PN}/${P}.tar.bz2" =20 LICENSE=3D"GPL-2" SLOT=3D"0" -KEYWORDS=3D"alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86" +KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE=3D"dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile" -IUSE+=3D" networkmanager nls perl silc tcl tk spell qq sasl ncurses" +IUSE+=3D" networkmanager nls perl silc tcl tk spell sasl ncurses" IUSE+=3D" groupwise prediction python +xscreensaver zephyr zeroconf" # m= ono" IUSE+=3D" gnome-keyring" =20 @@ -26,7 +26,7 @@ IUSE+=3D" gnome-keyring" # purple-url-handler and purple-remote require dbus-python thus in reali= ty we # rdepend on python if dbus enabled. But it is possible to separate this= dep. RDEPEND=3D" - >=3Ddev-libs/glib-2.12 + >=3Ddev-libs/glib-2.16 >=3Ddev-libs/libxml2-2.6.18 ncurses? ( sys-libs/ncurses[unicode] dbus? ( =3Dsys-apps/dbus-0.90 dev-python/dbus-python ) perl? ( >=3Ddev-lang/perl-5.8.2-r1[-build] ) - gadu? ( >=3Dnet-libs/libgadu-1.9.0[-ssl] ) + gadu? ( >=3Dnet-libs/libgadu-1.11.0[ssl,gnutls] ) gnutls? ( net-libs/gnutls ) !gnutls? ( >=3Ddev-libs/nss-3.11 ) meanwhile? ( net-libs/meanwhile ) @@ -111,20 +111,25 @@ pkg_setup() { elog "You did not pick the ncurses or gtk use flags, only libpurple" elog "will be built." fi + if use dbus || { use ncurses && use python; }; then + python_set_active_version 2 + python_pkg_setup + fi + + # dbus is enabled, no way to disable linkage with python =3D> python is= enabled + #REQUIRED_USE=3D"gtk? ( nls ) dbus? ( python )" if use gtk && ! use nls; then ewarn "gtk build =3D> nls is enabled!" fi if use dbus && ! use python; then elog "dbus is enabled, no way to disable linkage with python =3D> pyth= on is enabled" fi - if use dbus || { use ncurses && use python; }; then - python_set_active_version 2 - python_pkg_setup - fi } =20 src_prepare() { - gnome2_src_prepare + # Fix build issue. + # http://developer.pidgin.im/viewmtn/revision/diff/9e7616dbab2878bcc9f4= b412bca1f55c903a337e/with/aebefd6d98382ce0f7b42b41e4bf2611044d4182/pidgin= /plugins/gevolution/gevolution.c + sed 's:\:GTK_POLICY_AUTOMATIC:' -i pidgin/plugins/gev= olution/gevolution.c || die epatch "${FILESDIR}"/${PN}-gnome-keyring-1.patch eautoreconf } @@ -143,7 +148,6 @@ src_configure() { fi =20 use silc && DYNAMIC_PRPLS+=3D",silc" - use qq && DYNAMIC_PRPLS+=3D",qq" use meanwhile && DYNAMIC_PRPLS+=3D",sametime" use zeroconf && DYNAMIC_PRPLS+=3D",bonjour" use groupwise && DYNAMIC_PRPLS+=3D",novell" @@ -217,5 +221,5 @@ src_install() { fi use perl && fixlocalpod =20 - find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la remov= al failed" + find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la remo= val failed" }