commit: 32ec4afd9a64345f2ef4050f25e46ba1edf1c45b
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 2 09:45:18 2015 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Fri Oct 2 09:45:18 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=32ec4afd
gnome-base/gnome-desktop: Bump version to 3.18.0
Package-Manager: portage-2.2.22
Manifest-Sign-Key: 7E8B4D42
...top-9999.ebuild => gnome-desktop-3.18.0.ebuild} | 55 ++--------------------
gnome-base/gnome-desktop/gnome-desktop-9999.ebuild | 2 +-
2 files changed, 5 insertions(+), 52 deletions(-)
diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
b/gnome-base/gnome-desktop/gnome-desktop-3.18.0.ebuild
similarity index 56%
copy from gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
copy to gnome-base/gnome-desktop/gnome-desktop-3.18.0.ebuild
index d7d9f33..ab955a7 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.18.0.ebuild
@@ -6,27 +6,19 @@ 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";
LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="3/10" # subslot = libgnome-desktop-3 soname version
+SLOT="3/12" # 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="
app-text/iso-codes
- >=dev-libs/glib-2.38:2
+ >=dev-libs/glib-2.44:2
>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
>=x11-libs/gtk+-3.3.6:3[introspection?]
>=x11-libs/libXext-1.1
@@ -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,12 +57,9 @@ src_configure() {
--with-gnome-distributor=Gentoo \
--enable-desktop-docs \
$(use_enable introspection) \
- ${myconf}
+ ITSTOOL=$(type -P true)
}
src_test() {
- # Makes unittest fail without this locale installed
- rm "${S}"/tests/he_IL* || die
-
Xemake check
}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index d7d9f33..cd36410 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
@@ -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/10" # subslot = libgnome-desktop-3 soname version
+SLOT="3/12" # subslot = libgnome-desktop-3 soname version
IUSE="+introspection"
if [[ ${PV} = 9999 ]]; then
IUSE="${IUSE} doc"
