diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-03-28 20:23:30 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-03-28 20:23:30 +0000 |
| commit | 9458b02a1caa838ef78022c80e0b6681b93ba382 (patch) | |
| tree | 1944b06090dc2afb317a37da2b87ef472df4879a | |
| parent | stable x86, security bug 360241 (diff) | |
| download | gentoo-2-9458b02a1caa838ef78022c80e0b6681b93ba382.tar.gz gentoo-2-9458b02a1caa838ef78022c80e0b6681b93ba382.tar.bz2 gentoo-2-9458b02a1caa838ef78022c80e0b6681b93ba382.zip | |
Fix python.eclass usage wrt #315305. Remove USE="gnutls" and always enable it wrt #339204.
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
| -rw-r--r-- | net-irc/conspire/ChangeLog | 9 | ||||
| -rw-r--r-- | net-irc/conspire/conspire-1.0.1.ebuild | 40 |
2 files changed, 30 insertions, 19 deletions
diff --git a/net-irc/conspire/ChangeLog b/net-irc/conspire/ChangeLog index 5453c6bfc86e..18cdfb4245e5 100644 --- a/net-irc/conspire/ChangeLog +++ b/net-irc/conspire/ChangeLog @@ -1,11 +1,14 @@ # ChangeLog for net-irc/conspire # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/conspire/ChangeLog,v 1.16 2011/02/05 17:38:40 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/conspire/ChangeLog,v 1.17 2011/03/28 20:23:30 ssuominen Exp $ + + 28 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> conspire-1.0.1.ebuild: + Fix python.eclass usage wrt #315305. Remove USE="gnutls" and always enable it + wrt #339204. 05 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> conspire-1.0.1.ebuild, +files/conspire-1.0.1-libnotify-0.7.patch: - Fix building with x11-libs/libnotify >= 0.7. Enable USE="gnutls" by default - until #339204 is solved. + Fix building with x11-libs/libnotify >= 0.7. 26 Sep 2010; <chainsaw@gentoo.org> -conspire-0.12.0.ebuild, -conspire-0.13.1.ebuild, -conspire-1.0_beta1.ebuild: diff --git a/net-irc/conspire/conspire-1.0.1.ebuild b/net-irc/conspire/conspire-1.0.1.ebuild index ca873034a4de..c350aebbe5d2 100644 --- a/net-irc/conspire/conspire-1.0.1.ebuild +++ b/net-irc/conspire/conspire-1.0.1.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/conspire/conspire-1.0.1.ebuild,v 1.3 2011/02/05 17:40:34 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/conspire/conspire-1.0.1.ebuild,v 1.4 2011/03/28 20:23:30 ssuominen Exp $ -EAPI=2 -inherit eutils +EAPI=3 +PYTHON_DEPEND="python? 2:2.6" +inherit eutils python MY_P=${P/_/-} -S=${WORKDIR}/${MY_P} DESCRIPTION="A high quality IRC client which uses a multitude of interfaces" HOMEPAGE="http://www.nenolod.net/conspire/" @@ -15,36 +15,44 @@ SRC_URI="http://distfiles.atheme.org/${MY_P}.tbz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ia64 ~sparc ~x86" -# Enable gnutls by default until bug 339204 is solved. -IUSE="python +gnutls ipv6 nls mmx socks5 dbus" +IUSE="dbus ipv6 mmx nls python socks5" -RDEPEND=">=dev-libs/libmowgli-0.6.0 +RDEPEND=">=dev-libs/glib-2.14 + >=dev-libs/libmowgli-0.6.0 + net-libs/gnutls >=x11-libs/gtk+-2.10:2 - >=dev-libs/glib-2.14 - x11-libs/libnotify + >=x11-libs/libnotify-0.4.5 x11-libs/libsexy - dbus? ( >=dev-libs/dbus-glib-0.88 ) - gnutls? ( net-libs/gnutls ) - python? ( >=dev-lang/python-2.2 )" + dbus? ( >=dev-libs/dbus-glib-0.88 )" DEPEND="${RDEPEND} dev-util/pkgconfig nls? ( dev-util/intltool )" +S=${WORKDIR}/${MY_P} + +pkg_setup() { + if use python; then + python_set_active_version 2 + python_pkg_setup + fi +} + src_prepare() { epatch "${FILESDIR}"/${P}-libnotify-0.7.patch } src_configure() { econf \ + --disable-dependency-tracking \ + $(use_enable nls) \ $(use_enable socks5 socks) \ $(use_enable ipv6) \ - $(use_enable gnutls) \ + --enable-gnutls \ $(use_enable python) \ $(use_enable mmx) \ - $(use_enable nls) \ - $(use_enable dbus) \ --enable-spell=libsexy \ - --enable-regex + --enable-regex \ + $(use_enable dbus) } src_install() { |