diff options
author | Peter Volkov <pva@gentoo.org> | 2011-04-15 08:01:57 +0000 |
---|---|---|
committer | Peter Volkov <pva@gentoo.org> | 2011-04-15 08:01:57 +0000 |
commit | bcb8873b2d3fdf06ed887a053ef2ffd6f6362acc (patch) | |
tree | 5b483d7f4bc84f4737bc3722f605a6bf7f492c86 /net-im | |
parent | improved CXX, remove ggdb flag, drop old (diff) | |
download | historical-bcb8873b2d3fdf06ed887a053ef2ffd6f6362acc.tar.gz historical-bcb8873b2d3fdf06ed887a053ef2ffd6f6362acc.tar.bz2 historical-bcb8873b2d3fdf06ed887a053ef2ffd6f6362acc.zip |
Allow to build net-libs/libgadu without ssl, bug #363627 thank Bartosz Brachaczek for report. Drop old.
Package-Manager: portage-2.1.9.45/cvs/Linux x86_64
Diffstat (limited to 'net-im')
-rw-r--r-- | net-im/pidgin/ChangeLog | 7 | ||||
-rw-r--r-- | net-im/pidgin/Manifest | 6 | ||||
-rw-r--r-- | net-im/pidgin/pidgin-2.7.10.ebuild | 215 | ||||
-rw-r--r-- | net-im/pidgin/pidgin-2.7.11.ebuild | 4 |
4 files changed, 10 insertions, 222 deletions
diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog index 5083d8349a5b..5c3efad86948 100644 --- a/net-im/pidgin/ChangeLog +++ b/net-im/pidgin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-im/pidgin # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.233 2011/03/25 14:25:56 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.234 2011/04/15 08:01:55 pva Exp $ + + 15 Apr 2011; Peter Volkov <pva@gentoo.org> -pidgin-2.7.10.ebuild, + pidgin-2.7.11.ebuild: + Allow to build net-libs/libgadu without ssl, bug #363627 thank Bartosz + Brachaczek for report. Drop old. 25 Mar 2011; Peter Volkov <pva@gentoo.org> pidgin-2.7.10.ebuild, pidgin-2.7.11.ebuild: diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest index 1f061ea4e462..16fb2c83ce7c 100644 --- a/net-im/pidgin/Manifest +++ b/net-im/pidgin/Manifest @@ -1,8 +1,6 @@ AUX pidgin-2.7.2-ldflags.patch 1593 RMD160 ade438f25d0af927485523e561ce728762645948 SHA1 6ac16bd019ad048109643af5e3525987c994dbb0 SHA256 64d78b48111345b49216e9678c114f321963393b4fd0aa6046de8aec6f03cb44 AUX pidgin-2.7.3-ldflags.patch 1332 RMD160 0dd11485e9c990dab1230629faac704835a91ae4 SHA1 7bbb420a206bf6cb366bf501b90c893e896a1f65 SHA256 1f8574a9c2f056ba8c07559623da8c9ce241928f060898752eef5770dd1d081a -DIST pidgin-2.7.10.tar.bz2 9970363 RMD160 a79e53ba1ecef4c17e2ebf8121a712cf03eac6ca SHA1 ebce0b8c6130849e0df1bdc4557470b1d99da45a SHA256 269708d519537d74ff316ff88f5c39e0c04617073a07dce920fa85321586950e DIST pidgin-2.7.11.tar.bz2 9978175 RMD160 2bee3fe39c02948d10e1fdb6fff2840941148786 SHA1 3da07577c15257108d61c7f2d3f63cd422cdb4d7 SHA256 a24e2c3118bd47983955d398c9cf5543c12e95527cdf7de9d273a6e92f9d160b -EBUILD pidgin-2.7.10.ebuild 6594 RMD160 6b355f0e8064b27023205a7f68d02d64e6634d7c SHA1 e6878a384962d007407dd184261a664f8e2cc674 SHA256 34161eb58a67c2f568a1d665347750e0eb4238ce54146ec024cbd7d1f295658a -EBUILD pidgin-2.7.11.ebuild 6458 RMD160 b0fcc5cf70dcd96d85237e23f73f4396a4365b58 SHA1 618fe800934b049683c5284bc1d0ab673a48f651 SHA256 7225fc6897a37b283cb66e4852a3dba287a0610fba7103a680c97fbcb8a52100 -MISC ChangeLog 32733 RMD160 e2518569407d6b51e1af8ff8b18ef8024cc886df SHA1 1ca9c4b35e6db3a17c5aba2e8ec1bb51f442d0af SHA256 352e0346554607b1fb76d7363f53a9d16f1d51d7ec9052330efd881b26ee6689 +EBUILD pidgin-2.7.11.ebuild 6450 RMD160 15df33bfd9e0a4875a1206fe43cd54843104df69 SHA1 936ed58367c33e4df403d7764ecb7d51d2d6b9b6 SHA256 804438aedd0fd8b309c7291b60978b5cbad4acdc8c65e9fcf23722b978a4fa08 +MISC ChangeLog 32934 RMD160 9854fc66269ffc78810ff25db5ffa3c7c86d8789 SHA1 41604786424b143f1a48c050acf7cb98ec20915e SHA256 63e0fa7498ba93c0e7662146a01c783b6ee20b2d11fbac3ae55c05f7b772de16 MISC metadata.xml 1347 RMD160 ab118b33da598ea43ea4adb8cd07d269faf19528 SHA1 d68aea7e02d1fa45f1a71eb34c98259d61c935ca SHA256 b1b9067810378483188a403fb85f8ff76bc5260cb4bb811179eed1088dd6f5ba 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 a36bf15d04c2..000000000000 --- a/net-im/pidgin/pidgin-2.7.10.ebuild +++ /dev/null @@ -1,215 +0,0 @@ -# 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.10.ebuild,v 1.8 2011/03/25 14:25:56 pva Exp $ - -EAPI=2 - -GENTOO_DEPEND_ON_PERL=no -inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python - -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 ~arm hppa ia64 ppc ppc64 sparc x86" -IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile" -IUSE+=" networkmanager nls perl silc tcl tk spell qq sasl +startup-notification" -IUSE+=" ncurses groupwise prediction python +xscreensaver zephyr zeroconf" # mono" - -# dbus requires python to generate C code for dbus bindings (thus DEPEND only). -# finch uses libgnt that links with libpython - {R,}DEPEND. But still there 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 reality we -# rdepend on python if dbus enabled. But it is possible to separate this dep. -RDEPEND=" - >=dev-libs/glib-2.12 - >=dev-libs/libxml2-2.6.18 - ncurses? ( sys-libs/ncurses[unicode] - dbus? ( <dev-lang/python-3 ) - python? ( <dev-lang/python-3 ) ) - gtk? ( - >=x11-libs/gtk+-2.10: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 ) - 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 - >=sys-apps/dbus-0.90 - dev-python/dbus-python ) - perl? ( >=dev-lang/perl-5.8.2-r1[-build] ) - gadu? ( || ( >=net-libs/libgadu-1.10.1[ssl,gnutls] - <net-libs/libgadu-1.10.1[-ssl] ) ) - gnutls? ( net-libs/gnutls ) - !gnutls? ( >=dev-libs/nss-3.11 ) - meanwhile? ( net-libs/meanwhile ) - silc? ( >=net-im/silc-toolkit-1.0.1 ) - tcl? ( dev-lang/tcl ) - tk? ( dev-lang/tk ) - sasl? ( dev-libs/cyrus-sasl:2 ) - networkmanager? ( net-misc/networkmanager ) - idn? ( net-dns/libidn ) - !<x11-plugins/pidgin-facebookchat-1.69-r1" - # Mono support crashes pidgin - #mono? ( dev-lang/mono )" - -# We want nls in case gtk is enabled, bug # -NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext" - -DEPEND="$RDEPEND - dev-lang/perl - dev-perl/XML-Parser - dev-util/pkgconfig - gtk? ( x11-proto/scrnsaverproto - ${NLS_DEPEND} ) - dbus? ( <dev-lang/python-3 ) - doc? ( app-doc/doxygen ) - !gtk? ( nls? ( ${NLS_DEPEND} ) )" - -DOCS="AUTHORS HACKING NEWS README ChangeLog" - -# 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-bot-sentry -# 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-convreverse -# x11-plugins/pidgin-extended-blist-sort -# x11-plugins/pidgin-lastfm -# x11-plugins/pidgin-mbpurple - -pkg_setup() { - if ! use gtk && ! use ncurses ; then - elog "You did not pick the ncurses or gtk use flags, only libpurple" - elog "will be built." - fi - if use gtk && ! use nls; then - ewarn "gtk build => nls is enabled!" - fi - if use dbus && ! use python; then - elog "dbus is enabled, no way to disable linkage with python => python is enabled" - fi - if use dbus || { use ncurses && use python; }; then - python_set_active_version 2 - python_pkg_setup - fi -} - -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+=" --enable-nss=no --enable-gnutls=yes" - myconf+=" --with-gnutls-includes=/usr/include/gnutls" - myconf+=" --with-gnutls-libs=/usr/$(get_libdir)" - else - einfo "Disabling GnuTLS, using NSS" - myconf+=" --enable-gnutls=no --enable-nss=yes" - fi - - if use dbus || { use ncurses && use python; }; then - myconf+=" --with-python=$(PYTHON)" - else - myconf+=" --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 idn) \ - --with-system-ssl-certs="/etc/ssl/certs/" \ - --with-dynamic-prpls="${DYNAMIC_PRPLS}" \ - --disable-mono \ - --x-includes=/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=${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 - - find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed" -} diff --git a/net-im/pidgin/pidgin-2.7.11.ebuild b/net-im/pidgin/pidgin-2.7.11.ebuild index 5299043de8a9..3d3e5e0366be 100644 --- a/net-im/pidgin/pidgin-2.7.11.ebuild +++ b/net-im/pidgin/pidgin-2.7.11.ebuild @@ -1,6 +1,6 @@ # 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.8 2011/03/25 14:25:56 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.11.ebuild,v 1.9 2011/04/15 08:01:55 pva Exp $ EAPI=2 @@ -48,7 +48,7 @@ RDEPEND=" dev-python/dbus-python ) perl? ( >=dev-lang/perl-5.8.2-r1[-build] ) gadu? ( || ( >=net-libs/libgadu-1.10.1[ssl,gnutls] - <net-libs/libgadu-1.10.1[-ssl] ) ) + net-libs/libgadu[-ssl] ) ) gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/nss-3.11 ) meanwhile? ( net-libs/meanwhile ) |