| 1 |
commit: 68fa669ae6a34f72c0e004fb345722ae33ddcd5d |
| 2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 5 14:50:42 2011 +0000 |
| 4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 5 14:50:42 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=68fa669a |
| 7 |
|
| 8 |
gnome-base/gnome-desktop: QAed |
| 9 |
|
| 10 |
* Sort DEPEND |
| 11 |
* Re-enable desktop-docs |
| 12 |
* Explicitely set internal for pnp.ids |
| 13 |
|
| 14 |
(Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key C6085806) |
| 15 |
|
| 16 |
--- |
| 17 |
.../gnome-desktop/gnome-desktop-3.0.0.ebuild | 21 +++++++++---------- |
| 18 |
gnome-base/gnome-desktop/gnome-desktop-9999.ebuild | 1 - |
| 19 |
2 files changed, 10 insertions(+), 12 deletions(-) |
| 20 |
|
| 21 |
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.0.0.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.0.0.ebuild |
| 22 |
index 641d07c..077b595 100644 |
| 23 |
--- a/gnome-base/gnome-desktop/gnome-desktop-3.0.0.ebuild |
| 24 |
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.0.0.ebuild |
| 25 |
@@ -2,7 +2,8 @@ |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
# $Header: $ |
| 28 |
|
| 29 |
-EAPI="2" |
| 30 |
+EAPI="3" |
| 31 |
+GCONF_DEBUG="yes" |
| 32 |
GNOME2_LA_PUNT="yes" |
| 33 |
|
| 34 |
inherit gnome2 |
| 35 |
@@ -32,28 +33,26 @@ RDEPEND=" |
| 36 |
>=gnome-base/gsettings-desktop-schemas-2.91.92 |
| 37 |
introspection? ( >=dev-libs/gobject-introspection-0.9.7 )" |
| 38 |
DEPEND="${RDEPEND} |
| 39 |
- sys-devel/gettext |
| 40 |
+ ~app-text/docbook-xml-dtd-4.1.2 |
| 41 |
+ >=app-text/gnome-doc-utils-0.3.2 |
| 42 |
>=dev-util/intltool-0.40 |
| 43 |
>=dev-util/pkgconfig-0.9 |
| 44 |
- >=app-text/gnome-doc-utils-0.3.2 |
| 45 |
- doc? ( >=dev-util/gtk-doc-1.4 ) |
| 46 |
- ~app-text/docbook-xml-dtd-4.1.2 |
| 47 |
+ sys-devel/gettext |
| 48 |
x11-proto/xproto |
| 49 |
- >=x11-proto/randrproto-1.2" |
| 50 |
+ >=x11-proto/randrproto-1.2 |
| 51 |
+ doc? ( >=dev-util/gtk-doc-1.4 )" |
| 52 |
|
| 53 |
# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto |
| 54 |
# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and |
| 55 |
# eventually libXrandr shouldn't RDEPEND on randrproto) |
| 56 |
|
| 57 |
-DOCS="AUTHORS ChangeLog HACKING NEWS README" |
| 58 |
- |
| 59 |
pkg_setup() { |
| 60 |
+ DOCS="AUTHORS ChangeLog HACKING NEWS README" |
| 61 |
G2CONF="${G2CONF} |
| 62 |
--disable-scrollkeeper |
| 63 |
--disable-static |
| 64 |
- --disable-desktop-docs |
| 65 |
- --with-pnp-ids-path=/usr/share/libgnome-desktop/pnp.ids |
| 66 |
+ --with-pnp-ids-path=internal |
| 67 |
--with-gnome-distributor=Gentoo |
| 68 |
+ $(use_enable doc desktop-docs) |
| 69 |
$(use_enable introspection)" |
| 70 |
} |
| 71 |
- |
| 72 |
|
| 73 |
diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |
| 74 |
index c8bf51b..5b7781b 100644 |
| 75 |
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |
| 76 |
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |
| 77 |
@@ -55,4 +55,3 @@ pkg_setup() { |
| 78 |
--with-gnome-distributor=Gentoo |
| 79 |
$(use_enable introspection)" |
| 80 |
} |
| 81 |
- |
Archives