| 1 |
commit: 5533af041e4340c49d1da4c0c200157e893a3d12 |
| 2 |
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 21 12:05:19 2011 +0000 |
| 4 |
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 21 12:05:19 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5533af04 |
| 7 |
|
| 8 |
Bump evolution & friends, 2.91.6 -> 2.91.90 |
| 9 |
|
| 10 |
* Add live version for evolution-{exchange,mapi} |
| 11 |
|
| 12 |
--- |
| 13 |
...ebuild => evolution-data-server-2.91.90.ebuild} | 5 ++- |
| 14 |
.../evolution-data-server-9999.ebuild | 5 ++- |
| 15 |
....6.ebuild => evolution-exchange-2.91.90.ebuild} | 23 +++++++++---------- |
| 16 |
....91.6.ebuild => evolution-exchange-9999.ebuild} | 23 +++++++++---------- |
| 17 |
...2.91.6.ebuild => evolution-mapi-2.91.90.ebuild} | 7 +++++- |
| 18 |
...pi-2.91.6.ebuild => evolution-mapi-9999.ebuild} | 7 +++++- |
| 19 |
...on-2.91.6.2.ebuild => evolution-2.91.90.ebuild} | 6 ++-- |
| 20 |
mail-client/evolution/evolution-9999.ebuild | 8 +++--- |
| 21 |
8 files changed, 47 insertions(+), 37 deletions(-) |
| 22 |
|
| 23 |
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.91.6.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.91.90.ebuild |
| 24 |
similarity index 97% |
| 25 |
rename from gnome-extra/evolution-data-server/evolution-data-server-2.91.6.ebuild |
| 26 |
rename to gnome-extra/evolution-data-server/evolution-data-server-2.91.90.ebuild |
| 27 |
index 085711c..054aab8 100644 |
| 28 |
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.91.6.ebuild |
| 29 |
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.91.90.ebuild |
| 30 |
@@ -23,8 +23,8 @@ fi |
| 31 |
|
| 32 |
# GNOME3: How do we slot libedataserverui-3.0.so? |
| 33 |
# Also, libedata-cal-1.2.so and libecal-1.2.so use gtk-3, but aren't slotted |
| 34 |
-RDEPEND=">=dev-libs/glib-2.25.12:2 |
| 35 |
- >=x11-libs/gtk+-2.99.2:3 |
| 36 |
+RDEPEND=">=dev-libs/glib-2.28:2 |
| 37 |
+ >=x11-libs/gtk+-3.0:3 |
| 38 |
>=gnome-base/gconf-2 |
| 39 |
>=dev-db/sqlite-3.5 |
| 40 |
>=dev-libs/libgdata-0.7.0 |
| 41 |
@@ -57,6 +57,7 @@ DEPEND="${RDEPEND} |
| 42 |
|
| 43 |
pkg_setup() { |
| 44 |
DOCS="ChangeLog MAINTAINERS NEWS TODO" |
| 45 |
+ # Uh, what to do about dbus-call-timeout ? |
| 46 |
G2CONF="${G2CONF} |
| 47 |
$(use_enable ipv6) |
| 48 |
$(use_with kerberos krb5 /usr) |
| 49 |
|
| 50 |
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild |
| 51 |
index 085711c..054aab8 100644 |
| 52 |
--- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild |
| 53 |
+++ b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild |
| 54 |
@@ -23,8 +23,8 @@ fi |
| 55 |
|
| 56 |
# GNOME3: How do we slot libedataserverui-3.0.so? |
| 57 |
# Also, libedata-cal-1.2.so and libecal-1.2.so use gtk-3, but aren't slotted |
| 58 |
-RDEPEND=">=dev-libs/glib-2.25.12:2 |
| 59 |
- >=x11-libs/gtk+-2.99.2:3 |
| 60 |
+RDEPEND=">=dev-libs/glib-2.28:2 |
| 61 |
+ >=x11-libs/gtk+-3.0:3 |
| 62 |
>=gnome-base/gconf-2 |
| 63 |
>=dev-db/sqlite-3.5 |
| 64 |
>=dev-libs/libgdata-0.7.0 |
| 65 |
@@ -57,6 +57,7 @@ DEPEND="${RDEPEND} |
| 66 |
|
| 67 |
pkg_setup() { |
| 68 |
DOCS="ChangeLog MAINTAINERS NEWS TODO" |
| 69 |
+ # Uh, what to do about dbus-call-timeout ? |
| 70 |
G2CONF="${G2CONF} |
| 71 |
$(use_enable ipv6) |
| 72 |
$(use_with kerberos krb5 /usr) |
| 73 |
|
| 74 |
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.91.6.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.91.90.ebuild |
| 75 |
similarity index 78% |
| 76 |
copy from gnome-extra/evolution-exchange/evolution-exchange-2.91.6.ebuild |
| 77 |
copy to gnome-extra/evolution-exchange/evolution-exchange-2.91.90.ebuild |
| 78 |
index 1b2395b..c57ab10 100644 |
| 79 |
--- a/gnome-extra/evolution-exchange/evolution-exchange-2.91.6.ebuild |
| 80 |
+++ b/gnome-extra/evolution-exchange/evolution-exchange-2.91.90.ebuild |
| 81 |
@@ -6,23 +6,28 @@ EAPI="3" |
| 82 |
GCONF_DEBUG="yes" |
| 83 |
GNOME2_LA_PUNT="yes" |
| 84 |
|
| 85 |
-inherit autotools gnome2 |
| 86 |
+inherit gnome2 |
| 87 |
|
| 88 |
DESCRIPTION="Evolution module for connecting to Microsoft Exchange" |
| 89 |
HOMEPAGE="http://projects.gnome.org/evolution/" |
| 90 |
LICENSE="GPL-2" |
| 91 |
|
| 92 |
SLOT="2.0" |
| 93 |
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 94 |
IUSE="debug doc static" |
| 95 |
+if [[ ${PV} = 9999 ]]; then |
| 96 |
+ inherit gnome2-live |
| 97 |
+ KEYWORDS="" |
| 98 |
+else |
| 99 |
+ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 100 |
+fi |
| 101 |
|
| 102 |
RDEPEND=" |
| 103 |
>=mail-client/evolution-${PV}:2.0 |
| 104 |
>=gnome-extra/evolution-data-server-${PV}[ldap,kerberos] |
| 105 |
- >=dev-libs/glib-2.16:2 |
| 106 |
- >=x11-libs/gtk+-2.99.2:3 |
| 107 |
- >=gnome-base/gconf-2 |
| 108 |
- dev-libs/libxml2 |
| 109 |
+ >=dev-libs/glib-2.28:2 |
| 110 |
+ >=x11-libs/gtk+-3.0:3 |
| 111 |
+ >=gnome-base/gconf-2:2 |
| 112 |
+ dev-libs/libxml2:2 |
| 113 |
net-libs/libsoup:2.4 |
| 114 |
>=net-nds/openldap-2.1.30-r2 |
| 115 |
virtual/krb5" |
| 116 |
@@ -46,13 +51,7 @@ pkg_setup() { |
| 117 |
src_prepare() { |
| 118 |
gnome2_src_prepare |
| 119 |
|
| 120 |
- # Fix compilation failure with as-needed |
| 121 |
- epatch "${FILESDIR}/${P}-xntlm-as-needed.patch" |
| 122 |
- |
| 123 |
# FIXME: Fix compilation flags crazyness |
| 124 |
sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \ |
| 125 |
-i configure.ac configure || die "sed 1 failed" |
| 126 |
- |
| 127 |
- # Needed for the as-needed patch |
| 128 |
- eautoreconf |
| 129 |
} |
| 130 |
|
| 131 |
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.91.6.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-9999.ebuild |
| 132 |
similarity index 78% |
| 133 |
rename from gnome-extra/evolution-exchange/evolution-exchange-2.91.6.ebuild |
| 134 |
rename to gnome-extra/evolution-exchange/evolution-exchange-9999.ebuild |
| 135 |
index 1b2395b..c57ab10 100644 |
| 136 |
--- a/gnome-extra/evolution-exchange/evolution-exchange-2.91.6.ebuild |
| 137 |
+++ b/gnome-extra/evolution-exchange/evolution-exchange-9999.ebuild |
| 138 |
@@ -6,23 +6,28 @@ EAPI="3" |
| 139 |
GCONF_DEBUG="yes" |
| 140 |
GNOME2_LA_PUNT="yes" |
| 141 |
|
| 142 |
-inherit autotools gnome2 |
| 143 |
+inherit gnome2 |
| 144 |
|
| 145 |
DESCRIPTION="Evolution module for connecting to Microsoft Exchange" |
| 146 |
HOMEPAGE="http://projects.gnome.org/evolution/" |
| 147 |
LICENSE="GPL-2" |
| 148 |
|
| 149 |
SLOT="2.0" |
| 150 |
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 151 |
IUSE="debug doc static" |
| 152 |
+if [[ ${PV} = 9999 ]]; then |
| 153 |
+ inherit gnome2-live |
| 154 |
+ KEYWORDS="" |
| 155 |
+else |
| 156 |
+ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 157 |
+fi |
| 158 |
|
| 159 |
RDEPEND=" |
| 160 |
>=mail-client/evolution-${PV}:2.0 |
| 161 |
>=gnome-extra/evolution-data-server-${PV}[ldap,kerberos] |
| 162 |
- >=dev-libs/glib-2.16:2 |
| 163 |
- >=x11-libs/gtk+-2.99.2:3 |
| 164 |
- >=gnome-base/gconf-2 |
| 165 |
- dev-libs/libxml2 |
| 166 |
+ >=dev-libs/glib-2.28:2 |
| 167 |
+ >=x11-libs/gtk+-3.0:3 |
| 168 |
+ >=gnome-base/gconf-2:2 |
| 169 |
+ dev-libs/libxml2:2 |
| 170 |
net-libs/libsoup:2.4 |
| 171 |
>=net-nds/openldap-2.1.30-r2 |
| 172 |
virtual/krb5" |
| 173 |
@@ -46,13 +51,7 @@ pkg_setup() { |
| 174 |
src_prepare() { |
| 175 |
gnome2_src_prepare |
| 176 |
|
| 177 |
- # Fix compilation failure with as-needed |
| 178 |
- epatch "${FILESDIR}/${P}-xntlm-as-needed.patch" |
| 179 |
- |
| 180 |
# FIXME: Fix compilation flags crazyness |
| 181 |
sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \ |
| 182 |
-i configure.ac configure || die "sed 1 failed" |
| 183 |
- |
| 184 |
- # Needed for the as-needed patch |
| 185 |
- eautoreconf |
| 186 |
} |
| 187 |
|
| 188 |
diff --git a/gnome-extra/evolution-mapi/evolution-mapi-2.91.6.ebuild b/gnome-extra/evolution-mapi/evolution-mapi-2.91.90.ebuild |
| 189 |
similarity index 89% |
| 190 |
copy from gnome-extra/evolution-mapi/evolution-mapi-2.91.6.ebuild |
| 191 |
copy to gnome-extra/evolution-mapi/evolution-mapi-2.91.90.ebuild |
| 192 |
index 67c67f9..cf58ef0 100644 |
| 193 |
--- a/gnome-extra/evolution-mapi/evolution-mapi-2.91.6.ebuild |
| 194 |
+++ b/gnome-extra/evolution-mapi/evolution-mapi-2.91.90.ebuild |
| 195 |
@@ -13,8 +13,13 @@ HOMEPAGE="http://projects.gnome.org/evolution/" |
| 196 |
LICENSE="GPL-2" |
| 197 |
|
| 198 |
SLOT="1.0" |
| 199 |
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 200 |
IUSE="doc" |
| 201 |
+if [[ ${PV} = 9999 ]]; then |
| 202 |
+ inherit gnome2-live |
| 203 |
+ KEYWORDS="" |
| 204 |
+else |
| 205 |
+ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 206 |
+fi |
| 207 |
|
| 208 |
RDEPEND=" |
| 209 |
>=mail-client/evolution-${PV}:2.0 |
| 210 |
|
| 211 |
diff --git a/gnome-extra/evolution-mapi/evolution-mapi-2.91.6.ebuild b/gnome-extra/evolution-mapi/evolution-mapi-9999.ebuild |
| 212 |
similarity index 89% |
| 213 |
rename from gnome-extra/evolution-mapi/evolution-mapi-2.91.6.ebuild |
| 214 |
rename to gnome-extra/evolution-mapi/evolution-mapi-9999.ebuild |
| 215 |
index 67c67f9..cf58ef0 100644 |
| 216 |
--- a/gnome-extra/evolution-mapi/evolution-mapi-2.91.6.ebuild |
| 217 |
+++ b/gnome-extra/evolution-mapi/evolution-mapi-9999.ebuild |
| 218 |
@@ -13,8 +13,13 @@ HOMEPAGE="http://projects.gnome.org/evolution/" |
| 219 |
LICENSE="GPL-2" |
| 220 |
|
| 221 |
SLOT="1.0" |
| 222 |
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 223 |
IUSE="doc" |
| 224 |
+if [[ ${PV} = 9999 ]]; then |
| 225 |
+ inherit gnome2-live |
| 226 |
+ KEYWORDS="" |
| 227 |
+else |
| 228 |
+ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 229 |
+fi |
| 230 |
|
| 231 |
RDEPEND=" |
| 232 |
>=mail-client/evolution-${PV}:2.0 |
| 233 |
|
| 234 |
diff --git a/mail-client/evolution/evolution-2.91.6.2.ebuild b/mail-client/evolution/evolution-2.91.90.ebuild |
| 235 |
similarity index 98% |
| 236 |
rename from mail-client/evolution/evolution-2.91.6.2.ebuild |
| 237 |
rename to mail-client/evolution/evolution-2.91.90.ebuild |
| 238 |
index caf648f..6e201f1 100644 |
| 239 |
--- a/mail-client/evolution/evolution-2.91.6.2.ebuild |
| 240 |
+++ b/mail-client/evolution/evolution-2.91.90.ebuild |
| 241 |
@@ -32,9 +32,9 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pi |
| 242 |
# glade-3 support is for maintainers only per configure.ac |
| 243 |
# mono plugin disabled as it's incompatible with 2.8 and lacks maintainance (see bgo#634571) |
| 244 |
# pst is not mature enough and changes API/ABI frequently |
| 245 |
-RDEPEND=">=dev-libs/glib-2.26.0:2 |
| 246 |
+RDEPEND=">=dev-libs/glib-2.28:2 |
| 247 |
>=x11-libs/cairo-1.9.15 |
| 248 |
- >=x11-libs/gtk+-2.99.3:3 |
| 249 |
+ >=x11-libs/gtk+-3.0:3 |
| 250 |
>=dev-libs/libunique-2.91.4:3 |
| 251 |
>=gnome-base/gnome-desktop-2.91.3:3 |
| 252 |
>=dev-libs/libgweather-2.90.0:3 |
| 253 |
@@ -45,7 +45,7 @@ RDEPEND=">=dev-libs/glib-2.26.0:2 |
| 254 |
>=gnome-base/gconf-2 |
| 255 |
dev-libs/atk |
| 256 |
>=dev-libs/libxml2-2.7.3 |
| 257 |
- >=net-libs/libsoup-2.4:2.4 |
| 258 |
+ >=net-libs/libsoup-gnome-2.4:2.4 |
| 259 |
>=x11-misc/shared-mime-info-0.22 |
| 260 |
>=x11-themes/gnome-icon-theme-2.30.2.1 |
| 261 |
>=dev-libs/libgdata-0.4 |
| 262 |
|
| 263 |
diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild |
| 264 |
index d07a487..6e201f1 100644 |
| 265 |
--- a/mail-client/evolution/evolution-9999.ebuild |
| 266 |
+++ b/mail-client/evolution/evolution-9999.ebuild |
| 267 |
@@ -32,20 +32,20 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pi |
| 268 |
# glade-3 support is for maintainers only per configure.ac |
| 269 |
# mono plugin disabled as it's incompatible with 2.8 and lacks maintainance (see bgo#634571) |
| 270 |
# pst is not mature enough and changes API/ABI frequently |
| 271 |
-RDEPEND=">=dev-libs/glib-2.26.0:2 |
| 272 |
+RDEPEND=">=dev-libs/glib-2.28:2 |
| 273 |
>=x11-libs/cairo-1.9.15 |
| 274 |
- >=x11-libs/gtk+-2.99.3:3 |
| 275 |
+ >=x11-libs/gtk+-3.0:3 |
| 276 |
>=dev-libs/libunique-2.91.4:3 |
| 277 |
>=gnome-base/gnome-desktop-2.91.3:3 |
| 278 |
>=dev-libs/libgweather-2.90.0:3 |
| 279 |
media-libs/libcanberra[gtk3] |
| 280 |
>=x11-libs/libnotify-0.7 |
| 281 |
- >=gnome-extra/evolution-data-server-${PV}[weather] |
| 282 |
+ >=gnome-extra/evolution-data-server-${MY_MAJORV}[weather] |
| 283 |
>=gnome-extra/gtkhtml-3.31.3:4.0 |
| 284 |
>=gnome-base/gconf-2 |
| 285 |
dev-libs/atk |
| 286 |
>=dev-libs/libxml2-2.7.3 |
| 287 |
- >=net-libs/libsoup-2.4:2.4 |
| 288 |
+ >=net-libs/libsoup-gnome-2.4:2.4 |
| 289 |
>=x11-misc/shared-mime-info-0.22 |
| 290 |
>=x11-themes/gnome-icon-theme-2.30.2.1 |
| 291 |
>=dev-libs/libgdata-0.4 |
Archives