| 1 |
commit: f04f0c144b1e221389df9390b387c71c793576fb |
| 2 |
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 26 21:43:39 2012 +0000 |
| 4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sun Feb 26 21:50:25 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f04f0c14 |
| 7 |
|
| 8 |
app-editors/gedit: 3.3.2 → 3.3.4 |
| 9 |
|
| 10 |
Bump and sync with gx86. |
| 11 |
|
| 12 |
--- |
| 13 |
.../{gedit-3.3.2.ebuild => gedit-3.3.4.ebuild} | 29 +++++++++---------- |
| 14 |
app-editors/gedit/gedit-9999.ebuild | 29 +++++++++---------- |
| 15 |
2 files changed, 28 insertions(+), 30 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-editors/gedit/gedit-3.3.2.ebuild b/app-editors/gedit/gedit-3.3.4.ebuild |
| 18 |
similarity index 78% |
| 19 |
rename from app-editors/gedit/gedit-3.3.2.ebuild |
| 20 |
rename to app-editors/gedit/gedit-3.3.4.ebuild |
| 21 |
index 5df7790..8a77bb3 100644 |
| 22 |
--- a/app-editors/gedit/gedit-3.3.2.ebuild |
| 23 |
+++ b/app-editors/gedit/gedit-3.3.4.ebuild |
| 24 |
@@ -7,7 +7,7 @@ GCONF_DEBUG="no" |
| 25 |
GNOME2_LA_PUNT="yes" # plugins are dlopened |
| 26 |
PYTHON_DEPEND="2" |
| 27 |
|
| 28 |
-inherit gnome2 python eutils virtualx |
| 29 |
+inherit gnome2 multilib python eutils virtualx |
| 30 |
if [[ ${PV} = 9999 ]]; then |
| 31 |
inherit gnome2-live |
| 32 |
fi |
| 33 |
@@ -17,11 +17,11 @@ HOMEPAGE="http://www.gnome.org/" |
| 34 |
|
| 35 |
LICENSE="GPL-2" |
| 36 |
SLOT="0" |
| 37 |
-IUSE="doc +introspection +python spell" |
| 38 |
+IUSE="doc +introspection +python spell zeitgeist" |
| 39 |
if [[ ${PV} = 9999 ]]; then |
| 40 |
KEYWORDS="" |
| 41 |
else |
| 42 |
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux" |
| 43 |
+ KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux" |
| 44 |
fi |
| 45 |
|
| 46 |
# X libs are not needed for OSX (aqua) |
| 47 |
@@ -47,38 +47,38 @@ COMMON_DEPEND=" |
| 48 |
>=dev-libs/gobject-introspection-0.9.3 |
| 49 |
>=x11-libs/gtk+-3.0:3[introspection] |
| 50 |
>=x11-libs/gtksourceview-2.91.9:3.0[introspection] |
| 51 |
- >=dev-python/pygobject-3.0.0:3 ) |
| 52 |
+ dev-python/pycairo |
| 53 |
+ >=dev-python/pygobject-3.0.0:3[cairo] ) |
| 54 |
spell? ( |
| 55 |
>=app-text/enchant-1.2 |
| 56 |
- >=app-text/iso-codes-0.35 |
| 57 |
- )" |
| 58 |
+ >=app-text/iso-codes-0.35 ) |
| 59 |
+ zeitgeist? ( dev-libs/libzeitgeist )" |
| 60 |
|
| 61 |
RDEPEND="${COMMON_DEPEND} |
| 62 |
x11-themes/gnome-icon-theme-symbolic" |
| 63 |
|
| 64 |
DEPEND="${COMMON_DEPEND} |
| 65 |
>=sys-devel/gettext-0.17 |
| 66 |
+ dev-libs/libxml2 |
| 67 |
>=dev-util/intltool-0.40 |
| 68 |
+ dev-util/itstool |
| 69 |
>=dev-util/pkgconfig-0.9 |
| 70 |
>=app-text/scrollkeeper-0.3.11 |
| 71 |
- >=app-text/gnome-doc-utils-0.9.0 |
| 72 |
~app-text/docbook-xml-dtd-4.1.2 |
| 73 |
doc? ( >=dev-util/gtk-doc-1 )" |
| 74 |
-# gnome-common and gtk-doc-am needed to eautoreconf |
| 75 |
+# yelp-tools, gnome-common and gtk-doc-am needed to eautoreconf |
| 76 |
|
| 77 |
pkg_setup() { |
| 78 |
DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README" |
| 79 |
- # TODO: Zeitgeist support, if GNOME 3 adds it to moduleset (3.2?) |
| 80 |
G2CONF="${G2CONF} |
| 81 |
- --disable-zeitgeist |
| 82 |
--disable-deprecations |
| 83 |
--disable-schemas-compile |
| 84 |
- --disable-scrollkeeper |
| 85 |
--enable-updater |
| 86 |
--enable-gvfs-metadata |
| 87 |
$(use_enable introspection) |
| 88 |
$(use_enable python) |
| 89 |
- $(use_enable spell)" |
| 90 |
+ $(use_enable spell) |
| 91 |
+ $(use_enable zeitgeist)" |
| 92 |
|
| 93 |
python_set_active_version 2 |
| 94 |
python_pkg_setup |
| 95 |
@@ -87,15 +87,14 @@ pkg_setup() { |
| 96 |
src_prepare() { |
| 97 |
gnome2_src_prepare |
| 98 |
|
| 99 |
- # disable pyc compiling |
| 100 |
- mv "${S}"/py-compile "${S}"/py-compile.orig |
| 101 |
- ln -s $(type -P true) "${S}"/py-compile |
| 102 |
+ use python && python_clean_py-compile_files |
| 103 |
} |
| 104 |
|
| 105 |
src_test() { |
| 106 |
# FIXME: this should be handled at eclass level |
| 107 |
"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die |
| 108 |
|
| 109 |
+ unset DBUS_SESSION_BUS_ADDRESS |
| 110 |
GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check |
| 111 |
} |
| 112 |
|
| 113 |
|
| 114 |
diff --git a/app-editors/gedit/gedit-9999.ebuild b/app-editors/gedit/gedit-9999.ebuild |
| 115 |
index 5df7790..8a77bb3 100644 |
| 116 |
--- a/app-editors/gedit/gedit-9999.ebuild |
| 117 |
+++ b/app-editors/gedit/gedit-9999.ebuild |
| 118 |
@@ -7,7 +7,7 @@ GCONF_DEBUG="no" |
| 119 |
GNOME2_LA_PUNT="yes" # plugins are dlopened |
| 120 |
PYTHON_DEPEND="2" |
| 121 |
|
| 122 |
-inherit gnome2 python eutils virtualx |
| 123 |
+inherit gnome2 multilib python eutils virtualx |
| 124 |
if [[ ${PV} = 9999 ]]; then |
| 125 |
inherit gnome2-live |
| 126 |
fi |
| 127 |
@@ -17,11 +17,11 @@ HOMEPAGE="http://www.gnome.org/" |
| 128 |
|
| 129 |
LICENSE="GPL-2" |
| 130 |
SLOT="0" |
| 131 |
-IUSE="doc +introspection +python spell" |
| 132 |
+IUSE="doc +introspection +python spell zeitgeist" |
| 133 |
if [[ ${PV} = 9999 ]]; then |
| 134 |
KEYWORDS="" |
| 135 |
else |
| 136 |
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux" |
| 137 |
+ KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux" |
| 138 |
fi |
| 139 |
|
| 140 |
# X libs are not needed for OSX (aqua) |
| 141 |
@@ -47,38 +47,38 @@ COMMON_DEPEND=" |
| 142 |
>=dev-libs/gobject-introspection-0.9.3 |
| 143 |
>=x11-libs/gtk+-3.0:3[introspection] |
| 144 |
>=x11-libs/gtksourceview-2.91.9:3.0[introspection] |
| 145 |
- >=dev-python/pygobject-3.0.0:3 ) |
| 146 |
+ dev-python/pycairo |
| 147 |
+ >=dev-python/pygobject-3.0.0:3[cairo] ) |
| 148 |
spell? ( |
| 149 |
>=app-text/enchant-1.2 |
| 150 |
- >=app-text/iso-codes-0.35 |
| 151 |
- )" |
| 152 |
+ >=app-text/iso-codes-0.35 ) |
| 153 |
+ zeitgeist? ( dev-libs/libzeitgeist )" |
| 154 |
|
| 155 |
RDEPEND="${COMMON_DEPEND} |
| 156 |
x11-themes/gnome-icon-theme-symbolic" |
| 157 |
|
| 158 |
DEPEND="${COMMON_DEPEND} |
| 159 |
>=sys-devel/gettext-0.17 |
| 160 |
+ dev-libs/libxml2 |
| 161 |
>=dev-util/intltool-0.40 |
| 162 |
+ dev-util/itstool |
| 163 |
>=dev-util/pkgconfig-0.9 |
| 164 |
>=app-text/scrollkeeper-0.3.11 |
| 165 |
- >=app-text/gnome-doc-utils-0.9.0 |
| 166 |
~app-text/docbook-xml-dtd-4.1.2 |
| 167 |
doc? ( >=dev-util/gtk-doc-1 )" |
| 168 |
-# gnome-common and gtk-doc-am needed to eautoreconf |
| 169 |
+# yelp-tools, gnome-common and gtk-doc-am needed to eautoreconf |
| 170 |
|
| 171 |
pkg_setup() { |
| 172 |
DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README" |
| 173 |
- # TODO: Zeitgeist support, if GNOME 3 adds it to moduleset (3.2?) |
| 174 |
G2CONF="${G2CONF} |
| 175 |
- --disable-zeitgeist |
| 176 |
--disable-deprecations |
| 177 |
--disable-schemas-compile |
| 178 |
- --disable-scrollkeeper |
| 179 |
--enable-updater |
| 180 |
--enable-gvfs-metadata |
| 181 |
$(use_enable introspection) |
| 182 |
$(use_enable python) |
| 183 |
- $(use_enable spell)" |
| 184 |
+ $(use_enable spell) |
| 185 |
+ $(use_enable zeitgeist)" |
| 186 |
|
| 187 |
python_set_active_version 2 |
| 188 |
python_pkg_setup |
| 189 |
@@ -87,15 +87,14 @@ pkg_setup() { |
| 190 |
src_prepare() { |
| 191 |
gnome2_src_prepare |
| 192 |
|
| 193 |
- # disable pyc compiling |
| 194 |
- mv "${S}"/py-compile "${S}"/py-compile.orig |
| 195 |
- ln -s $(type -P true) "${S}"/py-compile |
| 196 |
+ use python && python_clean_py-compile_files |
| 197 |
} |
| 198 |
|
| 199 |
src_test() { |
| 200 |
# FIXME: this should be handled at eclass level |
| 201 |
"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die |
| 202 |
|
| 203 |
+ unset DBUS_SESSION_BUS_ADDRESS |
| 204 |
GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check |
| 205 |
} |
Archives