| 1 |
ssuominen 11/02/05 17:38:40 |
| 2 |
|
| 3 |
Modified: ChangeLog conspire-1.0.1.ebuild |
| 4 |
Log: |
| 5 |
Fix building with x11-libs/libnotify >= 0.7. Enable USE="gnutls" by default until #339204 is solved. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.16 net-irc/conspire/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/conspire/ChangeLog?rev=1.16&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/conspire/ChangeLog?rev=1.16&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/conspire/ChangeLog?r1=1.15&r2=1.16 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-irc/conspire/ChangeLog,v |
| 19 |
retrieving revision 1.15 |
| 20 |
retrieving revision 1.16 |
| 21 |
diff -u -r1.15 -r1.16 |
| 22 |
--- ChangeLog 26 Sep 2010 21:50:45 -0000 1.15 |
| 23 |
+++ ChangeLog 5 Feb 2011 17:38:40 -0000 1.16 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for net-irc/conspire |
| 26 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-irc/conspire/ChangeLog,v 1.15 2010/09/26 21:50:45 chainsaw Exp $ |
| 28 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/net-irc/conspire/ChangeLog,v 1.16 2011/02/05 17:38:40 ssuominen Exp $ |
| 30 |
+ |
| 31 |
+ 05 Feb 2011; Samuli Suominen <ssuominen@g.o> conspire-1.0.1.ebuild, |
| 32 |
+ +files/conspire-1.0.1-libnotify-0.7.patch: |
| 33 |
+ Fix building with x11-libs/libnotify >= 0.7. Enable USE="gnutls" by default |
| 34 |
+ until #339204 is solved. |
| 35 |
|
| 36 |
26 Sep 2010; <chainsaw@g.o> -conspire-0.12.0.ebuild, |
| 37 |
-conspire-0.13.1.ebuild, -conspire-1.0_beta1.ebuild: |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.2 net-irc/conspire/conspire-1.0.1.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/conspire/conspire-1.0.1.ebuild?rev=1.2&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/conspire/conspire-1.0.1.ebuild?rev=1.2&content-type=text/plain |
| 45 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/conspire/conspire-1.0.1.ebuild?r1=1.1&r2=1.2 |
| 46 |
|
| 47 |
Index: conspire-1.0.1.ebuild |
| 48 |
=================================================================== |
| 49 |
RCS file: /var/cvsroot/gentoo-x86/net-irc/conspire/conspire-1.0.1.ebuild,v |
| 50 |
retrieving revision 1.1 |
| 51 |
retrieving revision 1.2 |
| 52 |
diff -u -r1.1 -r1.2 |
| 53 |
--- conspire-1.0.1.ebuild 26 Sep 2010 21:39:10 -0000 1.1 |
| 54 |
+++ conspire-1.0.1.ebuild 5 Feb 2011 17:38:40 -0000 1.2 |
| 55 |
@@ -1,29 +1,39 @@ |
| 56 |
-# Copyright 1999-2010 Gentoo Foundation |
| 57 |
+# Copyright 1999-2011 Gentoo Foundation |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
-# $Header: /var/cvsroot/gentoo-x86/net-irc/conspire/conspire-1.0.1.ebuild,v 1.1 2010/09/26 21:39:10 chainsaw Exp $ |
| 60 |
+# $Header: /var/cvsroot/gentoo-x86/net-irc/conspire/conspire-1.0.1.ebuild,v 1.2 2011/02/05 17:38:40 ssuominen Exp $ |
| 61 |
|
| 62 |
+EAPI=2 |
| 63 |
inherit eutils |
| 64 |
|
| 65 |
-MY_P="${P/_/-}" |
| 66 |
-S="${WORKDIR}/${MY_P}" |
| 67 |
+MY_P=${P/_/-} |
| 68 |
+S=${WORKDIR}/${MY_P} |
| 69 |
+ |
| 70 |
DESCRIPTION="A high quality IRC client which uses a multitude of interfaces" |
| 71 |
HOMEPAGE="http://www.nenolod.net/conspire/" |
| 72 |
SRC_URI="http://distfiles.atheme.org/${MY_P}.tbz2" |
| 73 |
+ |
| 74 |
LICENSE="GPL-2" |
| 75 |
SLOT="0" |
| 76 |
KEYWORDS="~amd64 ~ia64 ~sparc ~x86" |
| 77 |
-IUSE="python gnutls ipv6 nls mmx socks5 dbus" |
| 78 |
-DEPEND="nls? ( dev-util/intltool ) |
| 79 |
- dev-util/pkgconfig" |
| 80 |
+# Enable gnutls by default until bug 339204 is solved. |
| 81 |
+IUSE="python +gnutls ipv6 nls mmx socks5 dbus" |
| 82 |
+ |
| 83 |
RDEPEND=">=dev-libs/libmowgli-0.6.0 |
| 84 |
- >=x11-libs/gtk+-2.10 |
| 85 |
+ >=x11-libs/gtk+-2.10:2 |
| 86 |
>=dev-libs/glib-2.14 |
| 87 |
x11-libs/libnotify |
| 88 |
x11-libs/libsexy |
| 89 |
- dbus? ( >=dev-libs/dbus-glib-0.60 ) |
| 90 |
+ dbus? ( >=dev-libs/dbus-glib-0.88 ) |
| 91 |
python? ( >=dev-lang/python-2.2 )" |
| 92 |
+DEPEND="${RDEPEND} |
| 93 |
+ dev-util/pkgconfig |
| 94 |
+ nls? ( dev-util/intltool )" |
| 95 |
+ |
| 96 |
+src_prepare() { |
| 97 |
+ epatch "${FILESDIR}"/${P}-libnotify-0.7.patch |
| 98 |
+} |
| 99 |
|
| 100 |
-src_compile() { |
| 101 |
+src_configure() { |
| 102 |
econf \ |
| 103 |
$(use_enable socks5 socks) \ |
| 104 |
$(use_enable ipv6) \ |
| 105 |
@@ -33,12 +43,10 @@ |
| 106 |
$(use_enable nls) \ |
| 107 |
$(use_enable dbus) \ |
| 108 |
--enable-spell=libsexy \ |
| 109 |
- --enable-regex \ |
| 110 |
- || die |
| 111 |
- emake || die "emake failed" |
| 112 |
+ --enable-regex |
| 113 |
} |
| 114 |
|
| 115 |
src_install() { |
| 116 |
- emake DESTDIR="${D}" install || die "emake install failed" |
| 117 |
+ emake DESTDIR="${D}" install || die |
| 118 |
dodoc NEWS TODO |
| 119 |
} |
Archives