commit: bfa6fbd55587397dc3d0f4663108292ac0b11455
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 12 23:15:57 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Apr 15 22:00:24 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bfa6fbd5
gnome-base/gnome-desktop: 3.10.2 → 3.12.0
---
...top-9999.ebuild => gnome-desktop-3.12.0.ebuild} | 55 ++--------------------
gnome-base/gnome-desktop/gnome-desktop-9999.ebuild | 7 ++-
2 files changed, 8 insertions(+), 54 deletions(-)
diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
b/gnome-base/gnome-desktop/gnome-desktop-3.12.0.ebuild
similarity index 55%
copy from gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
copy to gnome-base/gnome-desktop/gnome-desktop-3.12.0.ebuild
index 9b92736..4d99099 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.12.0.ebuild
@@ -1,27 +1,19 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
GCONF_DEBUG="yes"
-inherit eutils gnome2 multilib
-if [[ ${PV} = 9999 ]]; then
- inherit git-2 gnome2-live
-fi
+inherit gnome2
DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
HOMEPAGE="https://git.gnome.org/browse/gnome-desktop";
LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="3/8" # subslot = libgnome-desktop-3 soname version
+SLOT="3/10" # subslot = libgnome-desktop-3 soname version
IUSE="+introspection"
-if [[ ${PV} = 9999 ]]; then
- IUSE="${IUSE} doc"
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
# cairo[X] needed for gnome-bg
COMMON_DEPEND="
@@ -32,7 +24,6 @@ COMMON_DEPEND="
>=x11-libs/libXext-1.1
>=x11-libs/libXrandr-1.3
x11-libs/cairo:=[X]
- x11-libs/libxkbfile
x11-libs/libX11
x11-misc/xkeyboard-config
>=gnome-base/gsettings-desktop-schemas-3.5.91
@@ -51,47 +42,11 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
"
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- doc? ( >=dev-util/gtk-doc-1.4 )
- app-text/yelp-tools"
-fi
-
# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
# eventually libXrandr shouldn't RDEPEND on randrproto)
-src_unpack() {
- gnome2_src_unpack
-
- if [[ ${PV} = 9999 ]]; then
- # pnp.ids are only provided with the gnome-desktop tarball;
- # for the live version, we have to get them from hwdata git
- unset gnome_desktop_LIVE_BRANCH
- unset gnome_destkop_LIVE_COMMIT
- unset gnome_desktop_LIVE_REPO
- unset EGIT_BRANCH
- unset EGIT_COMMIT
- unset EGIT_DIR
- unset EGIT_MASTER
- EGIT_PROJECT="gnome-desktop_hwdata"
- EGIT_REPO_URI="git://git.fedorahosted.org/hwdata.git"
- EGIT_SOURCEDIR="${WORKDIR}/hwdata"
- git-2_src_unpack
- ln -sf "${WORKDIR}/hwdata/pnp.ids" "${S}/libgnome-desktop/" ||
- die "ln -sf failed"
- fi
-}
-
src_configure() {
- local myconf=""
-
- if [[ ${PV} = 9999 ]]; then
- myconf="${myconf} $(use_enable doc gtk-doc)"
- else
- myconf="${myconf} ITSTOOL=$(type -P true)"
- fi
-
DOCS="AUTHORS ChangeLog HACKING NEWS README"
# Note: do *not* use "--with-pnp-ids-path" argument. Otherwise, the
pnp.ids
# file (needed by other packages such as >=gnome-settings-daemon-3.1.2)
@@ -101,5 +56,5 @@ src_configure() {
--with-gnome-distributor=Gentoo \
--enable-desktop-docs \
$(use_enable introspection) \
- ${myconf}
+ ITSTOOL=$(type -P true)
}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index 9b92736..6733c1e 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
GCONF_DEBUG="yes"
-inherit eutils gnome2 multilib
+inherit gnome2
if [[ ${PV} = 9999 ]]; then
inherit git-2 gnome2-live
fi
@@ -14,7 +14,7 @@ DESCRIPTION="Libraries for the gnome desktop that are not
part of the UI"
HOMEPAGE="https://git.gnome.org/browse/gnome-desktop";
LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="3/8" # subslot = libgnome-desktop-3 soname version
+SLOT="3/10" # subslot = libgnome-desktop-3 soname version
IUSE="+introspection"
if [[ ${PV} = 9999 ]]; then
IUSE="${IUSE} doc"
@@ -32,7 +32,6 @@ COMMON_DEPEND="
>=x11-libs/libXext-1.1
>=x11-libs/libXrandr-1.3
x11-libs/cairo:=[X]
- x11-libs/libxkbfile
x11-libs/libX11
x11-misc/xkeyboard-config
>=gnome-base/gsettings-desktop-schemas-3.5.91
