* [gentoo-commits] gentoo-x86 commit in net-im/empathy: empathy-2.28.2.ebuild ChangeLog empathy-2.28.2-r1.ebuild empathy-2.28.1.2.ebuild empathy-2.28.1.1.ebuild
@ 2010-02-28 12:44 99% Nirbheek Chauhan (nirbheek)
0 siblings, 0 replies; 1+ results
From: Nirbheek Chauhan (nirbheek) @ 2010-02-28 12:44 UTC (permalink / raw
To: gentoo-commits
nirbheek 10/02/28 12:44:18
Modified: empathy-2.28.2.ebuild ChangeLog
Added: empathy-2.28.2-r1.ebuild
Removed: empathy-2.28.1.2.ebuild empathy-2.28.1.1.ebuild
Log:
Add patch to fix compilation with networkmanager-0.8 (causes dropping of keywords, bug 296548), fixes bug 306977 . Also remove old versions.
(Portage version: 2.1.7.17/cvs/Linux i686)
Revision Changes Path
1.4 net-im/empathy/empathy-2.28.2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/empathy-2.28.2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/empathy-2.28.2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/empathy-2.28.2.ebuild?r1=1.3&r2=1.4
Index: empathy-2.28.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.28.2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- empathy-2.28.2.ebuild 19 Feb 2010 19:33:27 -0000 1.3
+++ empathy-2.28.2.ebuild 28 Feb 2010 12:44:17 -0000 1.4
@@ -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/empathy/empathy-2.28.2.ebuild,v 1.3 2010/02/19 19:33:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.28.2.ebuild,v 1.4 2010/02/28 12:44:17 nirbheek Exp $
EAPI="2"
@@ -36,7 +36,7 @@
net-voip/telepathy-connection-managers
applet? ( >=gnome-base/gnome-panel-2.10 )
- networkmanager? ( >=net-misc/networkmanager-0.7 )
+ networkmanager? ( =net-misc/networkmanager-0.7* )
python? (
>=dev-lang/python-2.4.4-r5
>=dev-python/pygtk-2 )
1.51 net-im/empathy/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/ChangeLog?rev=1.51&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/ChangeLog?rev=1.51&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/ChangeLog?r1=1.50&r2=1.51
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ChangeLog 19 Feb 2010 19:33:27 -0000 1.50
+++ ChangeLog 28 Feb 2010 12:44:17 -0000 1.51
@@ -1,6 +1,15 @@
# ChangeLog for net-im/empathy
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.50 2010/02/19 19:33:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.51 2010/02/28 12:44:17 nirbheek Exp $
+
+*empathy-2.28.2-r1 (28 Feb 2010)
+
+ 28 Feb 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
+ +files/empathy-2.28-networkmanager-0.8.patch, -empathy-2.28.1.1.ebuild,
+ -empathy-2.28.1.2.ebuild, empathy-2.28.2.ebuild,
+ +empathy-2.28.2-r1.ebuild:
+ Add patch to fix compilation with networkmanager-0.8, fixes bug 306977 .
+ also remove old versions.
19 Feb 2010; Raúl Porcel <armin76@gentoo.org> empathy-2.26.2.ebuild,
empathy-2.28.1.1.ebuild, empathy-2.28.1.2.ebuild, empathy-2.28.2.ebuild:
1.1 net-im/empathy/empathy-2.28.2-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/empathy-2.28.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/empathy-2.28.2-r1.ebuild?rev=1.1&content-type=text/plain
Index: empathy-2.28.2-r1.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.28.2-r1.ebuild,v 1.1 2010/02/28 12:44:17 nirbheek Exp $
EAPI="2"
inherit autotools eutils gnome2 multilib
DESCRIPTION="Telepathy client and library using GTK+"
HOMEPAGE="http://live.gnome.org/Empathy"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
# FIXME: Add location support once geoclue stops being idiotic with automagic deps
IUSE="applet networkmanager python spell test webkit" # map
# FIXME: libnotify & libcanberra hard deps
RDEPEND=">=dev-libs/glib-2.16.0
>=x11-libs/gtk+-2.16.0
>=gnome-base/gconf-2
>=dev-libs/dbus-glib-0.51
>=gnome-extra/evolution-data-server-1.2
>=net-libs/telepathy-glib-0.7.35
>=media-libs/libcanberra-0.4[gtk]
>=x11-libs/libnotify-0.4.4
>=gnome-base/gnome-keyring-2.22
dev-libs/libunique
net-libs/farsight2
media-libs/gstreamer:0.10
media-libs/gst-plugins-base:0.10
net-libs/telepathy-farsight
dev-libs/libxml2
x11-libs/libX11
net-voip/telepathy-connection-managers
applet? ( >=gnome-base/gnome-panel-2.10 )
networkmanager? ( >=net-misc/networkmanager-0.8 )
python? (
>=dev-lang/python-2.4.4-r5
>=dev-python/pygtk-2 )
spell? (
app-text/enchant
app-text/iso-codes )
webkit? ( >=net-libs/webkit-gtk-1.1.7 )
"
# map? (
# >=media-libs/libchamplain-0.4[gtk]
# >=media-libs/clutter-gtk-0.10:1.0 )
DEPEND="${RDEPEND}
app-text/scrollkeeper
>=app-text/gnome-doc-utils-0.17.3
>=dev-util/intltool-0.35.0
>=dev-util/pkgconfig-0.16
test? (
sys-apps/grep
>=dev-libs/check-0.9.4 )
dev-libs/libxslt
virtual/python
"
PDEPEND=">=net-im/telepathy-mission-control-5"
DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
# FIXME: Highly broken with parallel make, mallard strike 2, see bug #286889
MAKEOPTS="${MAKEOPTS} -j1"
pkg_setup() {
G2CONF="${G2CONF}
--disable-maintainer-mode
--disable-static
--disable-location
--disable-gtk-doc
--disable-map
$(use_enable applet megaphone)
$(use_enable applet nothere)
$(use_enable debug)
$(use_with networkmanager connectivity nm)
$(use_enable python)
$(use_enable spell)
$(use_enable test coding-style-checks)
$(use_enable webkit)
"
}
src_prepare() {
gnome2_src_prepare
epatch "${FILESDIR}/empathy-2.28-networkmanager-0.8.patch"
eautoreconf
# Remove hard enabled -Werror (see AM_MAINTAINER_MODE), bug 218687
sed -i "s:-Werror::g" configure || die "sed 1 failed"
}
src_test() {
unset DBUS_SESSION_BUS_ADDRESS
emake check || die "emake check failed."
}
pkg_preinst() {
gnome2_pkg_preinst
preserve_old_lib /usr/$(get_libdir)/libempathy.so.23
preserve_old_lib /usr/$(get_libdir)/libempathy-gtk.so.19
}
pkg_postinst() {
gnome2_pkg_postinst
echo
elog "Empathy needs telepathy's connection managers to use any IM protocol."
elog "See the USE flags on net-voip/telepathy-connection-managers"
elog "to install them."
preserve_old_lib_notify /usr/$(get_libdir)/libempathy.so.23
preserve_old_lib_notify /usr/$(get_libdir)/libempathy-gtk.so.19
}
^ permalink raw reply [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2010-02-28 12:44 99% [gentoo-commits] gentoo-x86 commit in net-im/empathy: empathy-2.28.2.ebuild ChangeLog empathy-2.28.2-r1.ebuild empathy-2.28.1.2.ebuild empathy-2.28.1.1.ebuild Nirbheek Chauhan (nirbheek)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox