| 1 |
commit: 807afc92cb926d553c31b2a848d682a21e603779 |
| 2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 13 10:09:30 2013 +0000 |
| 4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 1 17:40:59 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=807afc92 |
| 7 |
|
| 8 |
app-editors/gedit: 3.8.3 → 3.10.2 |
| 9 |
|
| 10 |
--- |
| 11 |
.../{gedit-9999.ebuild => gedit-3.10.2.ebuild} | 77 ++++++++-------------- |
| 12 |
app-editors/gedit/gedit-9999.ebuild | 65 +++++++++--------- |
| 13 |
2 files changed, 60 insertions(+), 82 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-editors/gedit/gedit-9999.ebuild b/app-editors/gedit/gedit-3.10.2.ebuild |
| 16 |
similarity index 51% |
| 17 |
copy from app-editors/gedit/gedit-9999.ebuild |
| 18 |
copy to app-editors/gedit/gedit-3.10.2.ebuild |
| 19 |
index 7580adc..aec6234 100644 |
| 20 |
--- a/app-editors/gedit/gedit-9999.ebuild |
| 21 |
+++ b/app-editors/gedit/gedit-3.10.2.ebuild |
| 22 |
@@ -1,45 +1,37 @@ |
| 23 |
-# Copyright 1999-2012 Gentoo Foundation |
| 24 |
+# Copyright 1999-2013 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
# $Header: $ |
| 27 |
|
| 28 |
EAPI="5" |
| 29 |
GCONF_DEBUG="no" |
| 30 |
GNOME2_LA_PUNT="yes" # plugins are dlopened |
| 31 |
-PYTHON_COMPAT=( python{2_6,2_7} ) |
| 32 |
+PYTHON_COMPAT=( python3_{2,3} ) |
| 33 |
|
| 34 |
-inherit eutils gnome2 multilib python-single-r1 virtualx |
| 35 |
-if [[ ${PV} = 9999 ]]; then |
| 36 |
- inherit gnome2-live |
| 37 |
-fi |
| 38 |
+inherit eutils gnome2 multilib python-r1 virtualx |
| 39 |
|
| 40 |
DESCRIPTION="A text editor for the GNOME desktop" |
| 41 |
HOMEPAGE="http://live.gnome.org/Gedit" |
| 42 |
|
| 43 |
-LICENSE="GPL-2+ CCPL-Attribution-ShareAlike-3.0" |
| 44 |
+LICENSE="GPL-2+ CC-BY-SA-3.0" |
| 45 |
SLOT="0" |
| 46 |
+ |
| 47 |
IUSE="+introspection +python spell zeitgeist" |
| 48 |
-if [[ ${PV} = 9999 ]]; then |
| 49 |
- IUSE="${IUSE} doc" |
| 50 |
- KEYWORDS="" |
| 51 |
-else |
| 52 |
- KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux" |
| 53 |
-fi |
| 54 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 55 |
+ |
| 56 |
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux" |
| 57 |
|
| 58 |
# X libs are not needed for OSX (aqua) |
| 59 |
COMMON_DEPEND=" |
| 60 |
- >=x11-libs/libSM-1.0 |
| 61 |
>=dev-libs/libxml2-2.5.0:2 |
| 62 |
- >=dev-libs/glib-2.28:2 |
| 63 |
- >=x11-libs/gtk+-3.3.15:3[introspection?] |
| 64 |
- >=x11-libs/gtksourceview-3.0.0:3.0[introspection?] |
| 65 |
- >=dev-libs/libpeas-1.1.0[gtk] |
| 66 |
+ >=dev-libs/glib-2.37.5:2 |
| 67 |
+ >=x11-libs/gtk+-3.9.9:3[introspection?] |
| 68 |
+ >=x11-libs/gtksourceview-3.9.91:3.0[introspection?] |
| 69 |
+ >=dev-libs/libpeas-1.7.0[gtk] |
| 70 |
|
| 71 |
gnome-base/gsettings-desktop-schemas |
| 72 |
gnome-base/gvfs |
| 73 |
|
| 74 |
x11-libs/libX11 |
| 75 |
- x11-libs/libICE |
| 76 |
- x11-libs/libSM |
| 77 |
|
| 78 |
net-libs/libsoup:2.4 |
| 79 |
|
| 80 |
@@ -49,49 +41,38 @@ COMMON_DEPEND=" |
| 81 |
>=dev-libs/gobject-introspection-0.9.3 |
| 82 |
>=x11-libs/gtk+-3:3[introspection] |
| 83 |
>=x11-libs/gtksourceview-3.6:3.0[introspection] |
| 84 |
- dev-python/pycairo |
| 85 |
+ dev-python/pycairo[${PYTHON_USEDEP}] |
| 86 |
>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] ) |
| 87 |
spell? ( |
| 88 |
>=app-text/enchant-1.2:= |
| 89 |
>=app-text/iso-codes-0.35 ) |
| 90 |
- zeitgeist? ( dev-libs/libzeitgeist )" |
| 91 |
+ zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 ) |
| 92 |
+" |
| 93 |
RDEPEND="${COMMON_DEPEND} |
| 94 |
- x11-themes/gnome-icon-theme-symbolic" |
| 95 |
+ x11-themes/gnome-icon-theme-symbolic |
| 96 |
+" |
| 97 |
DEPEND="${COMMON_DEPEND} |
| 98 |
app-text/docbook-xml-dtd:4.1.2 |
| 99 |
>=app-text/scrollkeeper-0.3.11 |
| 100 |
dev-libs/libxml2:2 |
| 101 |
>=dev-util/gtk-doc-am-1 |
| 102 |
- >=dev-util/intltool-0.40 |
| 103 |
- >=sys-devel/gettext-0.17 |
| 104 |
+ >=dev-util/intltool-0.50.1 |
| 105 |
+ >=sys-devel/gettext-0.18 |
| 106 |
virtual/pkgconfig |
| 107 |
" |
| 108 |
# yelp-tools, gnome-common needed to eautoreconf |
| 109 |
|
| 110 |
-if [[ ${PV} = 9999 ]]; then |
| 111 |
- DEPEND="${DEPEND} |
| 112 |
- doc? ( >=dev-util/gtk-doc-1 ) |
| 113 |
- app-text/yelp-tools" |
| 114 |
-fi |
| 115 |
- |
| 116 |
-pkg_setup() { |
| 117 |
- python_set_active_version 2 |
| 118 |
- python_pkg_setup |
| 119 |
-} |
| 120 |
- |
| 121 |
-src_prepare() { |
| 122 |
+src_configure() { |
| 123 |
DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README" |
| 124 |
- G2CONF="${G2CONF} |
| 125 |
- --disable-deprecations |
| 126 |
- --enable-updater |
| 127 |
- --enable-gvfs-metadata |
| 128 |
- $(use_enable introspection) |
| 129 |
- $(use_enable python) |
| 130 |
- $(use_enable spell) |
| 131 |
- $(use_enable zeitgeist)" |
| 132 |
- [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" |
| 133 |
- |
| 134 |
- gnome2_src_prepare |
| 135 |
+ gnome2_src_configure \ |
| 136 |
+ --disable-deprecations \ |
| 137 |
+ --enable-updater \ |
| 138 |
+ --enable-gvfs-metadata \ |
| 139 |
+ $(use_enable introspection) \ |
| 140 |
+ $(use_enable python) \ |
| 141 |
+ $(use_enable spell) \ |
| 142 |
+ $(use_enable zeitgeist) \ |
| 143 |
+ ITSTOOL=$(type -P true) |
| 144 |
} |
| 145 |
|
| 146 |
src_test() { |
| 147 |
|
| 148 |
diff --git a/app-editors/gedit/gedit-9999.ebuild b/app-editors/gedit/gedit-9999.ebuild |
| 149 |
index 7580adc..a9e49c8 100644 |
| 150 |
--- a/app-editors/gedit/gedit-9999.ebuild |
| 151 |
+++ b/app-editors/gedit/gedit-9999.ebuild |
| 152 |
@@ -1,13 +1,13 @@ |
| 153 |
-# Copyright 1999-2012 Gentoo Foundation |
| 154 |
+# Copyright 1999-2013 Gentoo Foundation |
| 155 |
# Distributed under the terms of the GNU General Public License v2 |
| 156 |
# $Header: $ |
| 157 |
|
| 158 |
EAPI="5" |
| 159 |
GCONF_DEBUG="no" |
| 160 |
GNOME2_LA_PUNT="yes" # plugins are dlopened |
| 161 |
-PYTHON_COMPAT=( python{2_6,2_7} ) |
| 162 |
+PYTHON_COMPAT=( python3_{2,3} ) |
| 163 |
|
| 164 |
-inherit eutils gnome2 multilib python-single-r1 virtualx |
| 165 |
+inherit eutils gnome2 multilib python-r1 virtualx |
| 166 |
if [[ ${PV} = 9999 ]]; then |
| 167 |
inherit gnome2-live |
| 168 |
fi |
| 169 |
@@ -15,31 +15,30 @@ fi |
| 170 |
DESCRIPTION="A text editor for the GNOME desktop" |
| 171 |
HOMEPAGE="http://live.gnome.org/Gedit" |
| 172 |
|
| 173 |
-LICENSE="GPL-2+ CCPL-Attribution-ShareAlike-3.0" |
| 174 |
+LICENSE="GPL-2+ CC-BY-SA-3.0" |
| 175 |
SLOT="0" |
| 176 |
+ |
| 177 |
IUSE="+introspection +python spell zeitgeist" |
| 178 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 179 |
if [[ ${PV} = 9999 ]]; then |
| 180 |
IUSE="${IUSE} doc" |
| 181 |
KEYWORDS="" |
| 182 |
else |
| 183 |
- KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux" |
| 184 |
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux" |
| 185 |
fi |
| 186 |
|
| 187 |
# X libs are not needed for OSX (aqua) |
| 188 |
COMMON_DEPEND=" |
| 189 |
- >=x11-libs/libSM-1.0 |
| 190 |
>=dev-libs/libxml2-2.5.0:2 |
| 191 |
- >=dev-libs/glib-2.28:2 |
| 192 |
- >=x11-libs/gtk+-3.3.15:3[introspection?] |
| 193 |
- >=x11-libs/gtksourceview-3.0.0:3.0[introspection?] |
| 194 |
- >=dev-libs/libpeas-1.1.0[gtk] |
| 195 |
+ >=dev-libs/glib-2.37.5:2 |
| 196 |
+ >=x11-libs/gtk+-3.9.9:3[introspection?] |
| 197 |
+ >=x11-libs/gtksourceview-3.9.91:3.0[introspection?] |
| 198 |
+ >=dev-libs/libpeas-1.7.0[gtk] |
| 199 |
|
| 200 |
gnome-base/gsettings-desktop-schemas |
| 201 |
gnome-base/gvfs |
| 202 |
|
| 203 |
x11-libs/libX11 |
| 204 |
- x11-libs/libICE |
| 205 |
- x11-libs/libSM |
| 206 |
|
| 207 |
net-libs/libsoup:2.4 |
| 208 |
|
| 209 |
@@ -49,21 +48,23 @@ COMMON_DEPEND=" |
| 210 |
>=dev-libs/gobject-introspection-0.9.3 |
| 211 |
>=x11-libs/gtk+-3:3[introspection] |
| 212 |
>=x11-libs/gtksourceview-3.6:3.0[introspection] |
| 213 |
- dev-python/pycairo |
| 214 |
+ dev-python/pycairo[${PYTHON_USEDEP}] |
| 215 |
>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] ) |
| 216 |
spell? ( |
| 217 |
>=app-text/enchant-1.2:= |
| 218 |
>=app-text/iso-codes-0.35 ) |
| 219 |
- zeitgeist? ( dev-libs/libzeitgeist )" |
| 220 |
+ zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 ) |
| 221 |
+" |
| 222 |
RDEPEND="${COMMON_DEPEND} |
| 223 |
- x11-themes/gnome-icon-theme-symbolic" |
| 224 |
+ x11-themes/gnome-icon-theme-symbolic |
| 225 |
+" |
| 226 |
DEPEND="${COMMON_DEPEND} |
| 227 |
app-text/docbook-xml-dtd:4.1.2 |
| 228 |
>=app-text/scrollkeeper-0.3.11 |
| 229 |
dev-libs/libxml2:2 |
| 230 |
>=dev-util/gtk-doc-am-1 |
| 231 |
- >=dev-util/intltool-0.40 |
| 232 |
- >=sys-devel/gettext-0.17 |
| 233 |
+ >=dev-util/intltool-0.50.1 |
| 234 |
+ >=sys-devel/gettext-0.18 |
| 235 |
virtual/pkgconfig |
| 236 |
" |
| 237 |
# yelp-tools, gnome-common needed to eautoreconf |
| 238 |
@@ -74,24 +75,20 @@ if [[ ${PV} = 9999 ]]; then |
| 239 |
app-text/yelp-tools" |
| 240 |
fi |
| 241 |
|
| 242 |
-pkg_setup() { |
| 243 |
- python_set_active_version 2 |
| 244 |
- python_pkg_setup |
| 245 |
-} |
| 246 |
- |
| 247 |
-src_prepare() { |
| 248 |
+src_configure() { |
| 249 |
+ local myconf="" |
| 250 |
+ [[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)" |
| 251 |
DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README" |
| 252 |
- G2CONF="${G2CONF} |
| 253 |
- --disable-deprecations |
| 254 |
- --enable-updater |
| 255 |
- --enable-gvfs-metadata |
| 256 |
- $(use_enable introspection) |
| 257 |
- $(use_enable python) |
| 258 |
- $(use_enable spell) |
| 259 |
- $(use_enable zeitgeist)" |
| 260 |
- [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" |
| 261 |
- |
| 262 |
- gnome2_src_prepare |
| 263 |
+ gnome2_src_configure \ |
| 264 |
+ --disable-deprecations \ |
| 265 |
+ --enable-updater \ |
| 266 |
+ --enable-gvfs-metadata \ |
| 267 |
+ $(use_enable introspection) \ |
| 268 |
+ $(use_enable python) \ |
| 269 |
+ $(use_enable spell) \ |
| 270 |
+ $(use_enable zeitgeist) \ |
| 271 |
+ ITSTOOL=$(type -P true) \ |
| 272 |
+ ${myconf} |
| 273 |
} |
| 274 |
|
| 275 |
src_test() { |
Archives