commit: fdb00f5c8d61beda5f8d97550887bf58161d92c2
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 27 20:42:57 2015 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Mon Apr 27 20:42:57 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=fdb00f5c
Bump gnome-desktop to 3.16.1
Package-Manager: portage-2.2.18
Manifest-Sign-Key: 7E8B4D42
...top-9999.ebuild => gnome-desktop-3.16.1.ebuild} | 54 ++--------------------
gnome-base/gnome-desktop/gnome-desktop-9999.ebuild | 4 +-
2 files changed, 7 insertions(+), 51 deletions(-)
diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
b/gnome-base/gnome-desktop/gnome-desktop-3.16.1.ebuild
similarity index 59%
copy from gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
copy to gnome-base/gnome-desktop/gnome-desktop-3.16.1.ebuild
index 57ebca8..c1fb82a 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.16.1.ebuild
@@ -1,14 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header:
/var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-3.14.2.ebuild,v
1.3 2015/03/15 13:22:37 pacho Exp $
EAPI="5"
GCONF_DEBUG="yes"
inherit gnome2 virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit git-2 gnome2-live
-fi
DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
HOMEPAGE="https://git.gnome.org/browse/gnome-desktop";
@@ -16,12 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-desktop";
LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
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="
@@ -43,7 +35,7 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.1.2
dev-util/gdbus-codegen
- >=dev-util/gtk-doc-am-1.4
+ >=dev-util/gtk-doc-am-1.14
>=dev-util/intltool-0.40.6
sys-devel/gettext
x11-proto/xproto
@@ -51,47 +43,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,7 +57,7 @@ src_configure() {
--with-gnome-distributor=Gentoo \
--enable-desktop-docs \
$(use_enable introspection) \
- ${myconf}
+ ITSTOOL=$(type -P true)
}
src_test() {
diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index 57ebca8..e25fbbf 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -43,7 +43,7 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.1.2
dev-util/gdbus-codegen
- >=dev-util/gtk-doc-am-1.4
+ >=dev-util/gtk-doc-am-1.14
>=dev-util/intltool-0.40.6
sys-devel/gettext
x11-proto/xproto
