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 | 2cdf61c78ef2a19b59a7cda219005b2d8e6e5e90 (patch) | |
| tree | 7b8dbfafd10ad996afd5fac98aa753ea4c7a0cd0 /net-irc | |
| parent | stable x86, security bug 360241 (diff) | |
| download | historical-2cdf61c78ef2a19b59a7cda219005b2d8e6e5e90.tar.gz historical-2cdf61c78ef2a19b59a7cda219005b2d8e6e5e90.tar.bz2 historical-2cdf61c78ef2a19b59a7cda219005b2d8e6e5e90.zip | |
Fix python.eclass usage wrt #315305. Remove USE="gnutls" and always enable it wrt #339204.
Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64
Diffstat (limited to 'net-irc')
| -rw-r--r-- | net-irc/conspire/ChangeLog | 9 | ||||
| -rw-r--r-- | net-irc/conspire/Manifest | 4 | ||||
| -rw-r--r-- | net-irc/conspire/conspire-1.0.1.ebuild | 40 |
3 files changed, 32 insertions, 21 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/Manifest b/net-irc/conspire/Manifest index d1ea25be20bd..d5b745ce9566 100644 --- a/net-irc/conspire/Manifest +++ b/net-irc/conspire/Manifest @@ -3,6 +3,6 @@ AUX conspire-1.0.1-libnotify-0.7.patch 650 RMD160 c47b55f40b25f70acc540ca669ecf0 DIST conspire-0.20.tbz2 1150730 RMD160 5731688fcd487eb508a884e1e04106f955222b5c SHA1 0c68cc683568ac28a24e6294619ff0c893a3451b SHA256 8029f3ce87c6392e4305ae49a826832e14342b224a315f8020d9804eb30f2065 DIST conspire-1.0.1.tbz2 1170860 RMD160 f23f137b94ac4e4027a442af41cd8ff78b233c5f SHA1 2fb3fa272b4fe4e80139c831c9d89712d26179c5 SHA256 579f47fae2737ef94483821092138877745079e7171e673ff960c53084e4b19b EBUILD conspire-0.20.ebuild 1265 RMD160 551476c78997f418be36a994d8e37eddcf64d722 SHA1 2989adf8464ab2ddfb0acfe8fe51e6b08abd4cbb SHA256 b9ee938183daddc5f5b2db8405855edc0eba6d86999cf7050b91da3236c97cbf -EBUILD conspire-1.0.1.ebuild 1294 RMD160 23eff23733bf0ae38f23724e30deb6fd7371c237 SHA1 46a84d515cecdf6346111f26b40d348fc2c71c57 SHA256 05673ed4307222143ee7a01d4d77e1ae64a790fc2e34d18dcc84d4b31ad02b19 -MISC ChangeLog 3217 RMD160 fac63c570505bae6c7ebb14b0ae7fa3874ef85f3 SHA1 80cdc37d6c3e755242984f5d5cbd8f1160754778 SHA256 77b1c7bd507ed0213dec249eb404f0ba0dac003531652f89bb8b12b5a19560fe +EBUILD conspire-1.0.1.ebuild 1350 RMD160 fa9ee0b8de0957ddc9c3301db915990e06c7769c SHA1 651086432ff7a35556db178017a665b116b1fe82 SHA256 4ee8547e1d44a499be3f7d556fba072a7a85eae042cd1053d18b2198864efe1f +MISC ChangeLog 3332 RMD160 1d9fa184898953150d5f98614c00180b8b368c39 SHA1 a3cb541d1ccc5f742f3b78b5383797d6927c7eb6 SHA256 ee5a315f6aaaa13424c3c17a057c0d17ffdc73db8b3d615081e5c8f7fcb0ad07 MISC metadata.xml 250 RMD160 bbb8dc8eb566565cca20e2b1946b628de99d67b9 SHA1 d25f4394511b1f01d39ef163eada07751c158862 SHA256 304cf815927a5988355b9fd06d13eea56178bff87b2fe5262f9d0b6640c3050d 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() { |