[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Gilles Dartiguelongue]

commit:     f4330ebed9638a5e468ec34bf171ca7e6b0d4b00
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 23 19:29:27 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov 23 19:29:27 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f4330ebe

gnome-base/gnome-desktop: 3.14.1 → 3.14.2

---
 .../{gnome-desktop-3.14.1.ebuild => gnome-desktop-3.14.2.ebuild}          | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.14.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.14.2.ebuild
similarity index 100%
rename from gnome-base/gnome-desktop/gnome-desktop-3.14.1.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.14.2.ebuild

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Gilles Dartiguelongue]

commit:     5d4a5ed1cb0998a29010b18c705bea8d4786a81c
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 10 14:39:38 2018 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Sep 10 14:53:50 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=5d4a5ed1

gnome-base/gnome-desktop: add explicit note about seccomp dependency

Package-Manager: Portage-2.3.49, Repoman-2.3.10
Manifest-Sign-Key: 0x5A56C8CD0C13248A

 gnome-base/gnome-desktop/gnome-desktop-3.26.2.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.26.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.26.2.ebuild
index b24a5392..fd198574 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.26.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.26.2.ebuild
@@ -9,10 +9,11 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="3/12" # subslot = libgnome-desktop-3 soname version
-IUSE="debug +introspection udev"
+IUSE="debug +introspection seccomp udev"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
 
 # cairo[X] needed for gnome-bg
+# automagic dependency on seccomp
 COMMON_DEPEND="
 	app-text/iso-codes
 	>=dev-libs/glib-2.53.0:2[dbus]
@@ -23,6 +24,7 @@ COMMON_DEPEND="
 	x11-misc/xkeyboard-config
 	>=gnome-base/gsettings-desktop-schemas-3.5.91
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+	seccomp? ( sys-libs/libseccomp )
 	udev? (
 		sys-apps/hwids
 		virtual/libudev:= )

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Sobhan Mohammadpour]

commit:     dd652554928f7e52b14e9e59bfa3c7fb15978e71
Author:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  9 15:46:02 2018 +0000
Commit:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
CommitDate: Fri Feb  9 15:46:02 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=dd652554

gnome-base/gnome-desktop: bump

Package-Manager: Portage-2.3.23, Repoman-2.3.6
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 .../gnome-desktop/gnome-desktop-3.26.2.ebuild      | 59 ++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.26.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.26.2.ebuild
new file mode 100644
index 00000000..31b0c59a
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.26.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 virtualx
+
+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/12" # subslot = libgnome-desktop-3 soname version
+IUSE="debug +introspection udev"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
+
+# cairo[X] needed for gnome-bg
+COMMON_DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.53.0:2[dbus]
+	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
+	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
+	x11-libs/cairo:=[X]
+	x11-libs/libX11
+	x11-misc/xkeyboard-config
+	>=gnome-base/gsettings-desktop-schemas-3.5.91
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+	udev? (
+		sys-apps/hwids
+		virtual/libudev:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40.6
+	dev-util/itstool
+	sys-devel/gettext
+	x11-proto/xproto
+	virtual/pkgconfig
+"
+
+# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-gnome-distributor=Gentoo \
+		--enable-desktop-docs \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable debug debug-tools) \
+		$(use_enable introspection) \
+		$(use_enable udev)
+}
+
+src_test() {
+	virtx emake check
+}

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Dennis Lamm]

commit:     1d96f39a363bc0224af841950f9fa5b1ed7806be
Author:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 12:43:33 2018 +0000
Commit:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 12:43:33 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=1d96f39a

gnome-base/gnome-desktop: drop old

Package-Manager: Portage-2.3.13, Repoman-2.3.3
RepoMan-Options: --force

 .../gnome-desktop/gnome-desktop-3.20.0.ebuild      | 66 ----------------------
 gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |  3 +-
 2 files changed, 1 insertion(+), 68 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.20.0.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.20.0.ebuild
deleted file mode 100644
index 72688e0c..00000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.20.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2 virtualx
-
-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/12" # subslot = libgnome-desktop-3 soname version
-IUSE="+introspection"
-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.44.0:2[dbus]
-	>=x11-libs/gdk-pixbuf-2.33.0:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
-	>=x11-libs/libXext-1.1
-	>=x11-libs/libXrandr-1.3
-	x11-libs/cairo:=[X]
-	x11-libs/libX11
-	x11-misc/xkeyboard-config
-	>=gnome-base/gsettings-desktop-schemas-3.5.91
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40.6
-	dev-util/itstool
-	sys-devel/gettext
-	x11-proto/xproto
-	>=x11-proto/randrproto-1.2
-	virtual/pkgconfig
-"
-
-# 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_configure() {
-	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)
-	# will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
-	gnome2_src_configure \
-		--disable-debug-tools \
-		--disable-static \
-		--with-gnome-distributor=Gentoo \
-		--enable-desktop-docs \
-		$(use_enable introspection)
-}
-
-src_test() {
-	Xemake check
-}

diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index f43ffd95..c68633a6 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="5"
 GCONF_DEBUG="yes"

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Ole Reifschneider]

commit:     40ff1364afaf2cd2e3256205396924adb41978f4
Author:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 22:14:15 2016 +0000
Commit:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 00:55:46 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=40ff1364

gnome-base/gnome-desktop: Bump version to 3.20.0

Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42

 ...-desktop-3.18.0.ebuild => gnome-desktop-3.20.0.ebuild} | 15 ++++++++-------
 gnome-base/gnome-desktop/gnome-desktop-9999.ebuild        | 12 +++++++-----
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.18.0.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.20.0.ebuild
similarity index 84%
rename from gnome-base/gnome-desktop/gnome-desktop-3.18.0.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.20.0.ebuild
index ab955a7..72688e0 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.18.0.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,16 +18,16 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~
 # cairo[X] needed for gnome-bg
 COMMON_DEPEND="
 	app-text/iso-codes
-	>=dev-libs/glib-2.44:2
-	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[introspection?]
+	>=dev-libs/glib-2.44.0:2[dbus]
+	>=x11-libs/gdk-pixbuf-2.33.0:2[introspection?]
+	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
 	>=x11-libs/libXext-1.1
 	>=x11-libs/libXrandr-1.3
 	x11-libs/cairo:=[X]
 	x11-libs/libX11
 	x11-misc/xkeyboard-config
 	>=gnome-base/gsettings-desktop-schemas-3.5.91
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 "
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
@@ -37,6 +37,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gdbus-codegen
 	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.40.6
+	dev-util/itstool
 	sys-devel/gettext
 	x11-proto/xproto
 	>=x11-proto/randrproto-1.2
@@ -53,11 +54,11 @@ src_configure() {
 	# file (needed by other packages such as >=gnome-settings-daemon-3.1.2)
 	# will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
 	gnome2_src_configure \
+		--disable-debug-tools \
 		--disable-static \
 		--with-gnome-distributor=Gentoo \
 		--enable-desktop-docs \
-		$(use_enable introspection) \
-		ITSTOOL=$(type -P true)
+		$(use_enable introspection)
 }
 
 src_test() {

diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index cd36410..f43ffd9 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-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,16 +26,16 @@ fi
 # cairo[X] needed for gnome-bg
 COMMON_DEPEND="
 	app-text/iso-codes
-	>=dev-libs/glib-2.38:2
-	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[introspection?]
+	>=dev-libs/glib-2.44.0:2[dbus]
+	>=x11-libs/gdk-pixbuf-2.33.0:2[introspection?]
+	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
 	>=x11-libs/libXext-1.1
 	>=x11-libs/libXrandr-1.3
 	x11-libs/cairo:=[X]
 	x11-libs/libX11
 	x11-misc/xkeyboard-config
 	>=gnome-base/gsettings-desktop-schemas-3.5.91
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 "
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
@@ -45,6 +45,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gdbus-codegen
 	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.40.6
+	dev-util/itstool
 	sys-devel/gettext
 	x11-proto/xproto
 	>=x11-proto/randrproto-1.2
@@ -97,6 +98,7 @@ src_configure() {
 	# file (needed by other packages such as >=gnome-settings-daemon-3.1.2)
 	# will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
 	gnome2_src_configure \
+		--disable-debug-tools \
 		--disable-static \
 		--with-gnome-distributor=Gentoo \
 		--enable-desktop-docs \

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Ole Reifschneider]

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"

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Gilles Dartiguelongue]

commit:     6fb6d48864905d4858ba036abdd3f756b37d8cc8
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue May 12 19:07:49 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue May 12 19:07:49 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=6fb6d488

gnome-base/gnome-desktop: 3.16.1 → 3.16.2

 .../{gnome-desktop-3.16.1.ebuild => gnome-desktop-3.16.2.ebuild}          | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.16.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.16.2.ebuild
similarity index 100%
rename from gnome-base/gnome-desktop/gnome-desktop-3.16.1.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.16.2.ebuild

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Gilles Dartiguelongue]

commit:     5cfa824edb4b89ad1c6ac6c9648eb44fb850b94b
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 22:11:52 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 10 22:11:52 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=5cfa824e

gnome-base/gnome-desktop: fix unittests

 gnome-base/gnome-desktop/gnome-desktop-3.16.1.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.16.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.16.1.ebuild
index c1fb82a..803ab47 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.16.1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.16.1.ebuild
@@ -61,8 +61,5 @@ src_configure() {
 }
 
 src_test() {
-	# Makes unittest fail without this locale installed
-	rm "${S}"/tests/he_IL* || die
-
 	Xemake check
 }

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Ole Reifschneider]

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

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Gilles Dartiguelongue]

commit:     6efdde04a1c60ba12d22165775b08369942b860b
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 22 23:05:25 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 22 23:05:25 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6efdde04

gnome-base/gnome-desktop: moved to gentoo-x86

---
 .../gnome-desktop/gnome-desktop-3.14.2.ebuild      | 68 ----------------------
 1 file changed, 68 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.14.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.14.2.ebuild
deleted file mode 100644
index 80549dc..0000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.14.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2 virtualx
-
-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
-IUSE="+introspection"
-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
-	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[introspection?]
-	>=x11-libs/libXext-1.1
-	>=x11-libs/libXrandr-1.3
-	x11-libs/cairo:=[X]
-	x11-libs/libX11
-	x11-misc/xkeyboard-config
-	>=gnome-base/gsettings-desktop-schemas-3.5.91
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.6
-	sys-devel/gettext
-	x11-proto/xproto
-	>=x11-proto/randrproto-1.2
-	virtual/pkgconfig
-"
-
-# 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_configure() {
-	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)
-	# will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
-	gnome2_src_configure \
-		--disable-static \
-		--with-gnome-distributor=Gentoo \
-		--enable-desktop-docs \
-		$(use_enable introspection) \
-		ITSTOOL=$(type -P true)
-}
-
-src_test() {
-	# Makes unittest fail without this locale installed
-	rm "${S}"/tests/he_IL* || die
-
-	Xemake check
-}

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Gilles Dartiguelongue]

commit:     5974248ccd1c69e025a38042f9c6c969e0f633d5
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 26 17:25:49 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 26 17:25:49 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5974248c

gnome-base/gnome-desktop: fix a typo

---
 gnome-base/gnome-desktop/gnome-desktop-3.14.1.ebuild | 2 +-
 gnome-base/gnome-desktop/gnome-desktop-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.14.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.14.1.ebuild
index 7337ead..80549dc 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.14.1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.14.1.ebuild
@@ -62,7 +62,7 @@ src_configure() {
 
 src_test() {
 	# Makes unittest fail without this locale installed
-	rm ${S}/tests/he_IL* || due
+	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 d6779da..57ebca8 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
@@ -106,7 +106,7 @@ src_configure() {
 
 src_test() {
 	# Makes unittest fail without this locale installed
-	rm ${S}/tests/he_IL* || due
+	rm "${S}"/tests/he_IL* || die
 
 	Xemake check
 }

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Gilles Dartiguelongue]

commit:     35d6043e61644d561f5ed4006860e5f24233bb4a
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 15 22:19:48 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Oct 15 22:19:48 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=35d6043e

gnome-base/gnome-desktop: 3.14.0 → 3.14.1

---
 .../{gnome-desktop-3.14.0.ebuild => gnome-desktop-3.14.1.ebuild}          | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.14.0.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.14.1.ebuild
similarity index 100%
rename from gnome-base/gnome-desktop/gnome-desktop-3.14.0.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.14.1.ebuild

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Gilles Dartiguelongue]

commit:     16e5ff76343bfdd281d2173b411535ffe6790aee
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 11 16:21:59 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Oct 11 16:34:10 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=16e5ff76

gnome-base/gnome-desktop: 3.12.2 → 3.14.0

---
 ...ome-desktop-3.12.1.ebuild => gnome-desktop-3.14.0.ebuild} | 12 ++++++++++--
 gnome-base/gnome-desktop/gnome-desktop-9999.ebuild           | 12 ++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.12.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.14.0.ebuild
similarity index 90%
rename from gnome-base/gnome-desktop/gnome-desktop-3.12.1.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.14.0.ebuild
index 4d99099..7337ead 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.12.1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.14.0.ebuild
@@ -5,7 +5,7 @@
 EAPI="5"
 GCONF_DEBUG="yes"
 
-inherit gnome2
+inherit gnome2 virtualx
 
 DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
 HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
@@ -18,7 +18,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~
 # cairo[X] needed for gnome-bg
 COMMON_DEPEND="
 	app-text/iso-codes
-	>=dev-libs/glib-2.35:2
+	>=dev-libs/glib-2.38:2
 	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
 	>=x11-libs/gtk+-3.3.6:3[introspection?]
 	>=x11-libs/libXext-1.1
@@ -34,6 +34,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/intltool-0.40.6
 	sys-devel/gettext
@@ -58,3 +59,10 @@ src_configure() {
 		$(use_enable introspection) \
 		ITSTOOL=$(type -P true)
 }
+
+src_test() {
+	# Makes unittest fail without this locale installed
+	rm ${S}/tests/he_IL* || due
+
+	Xemake check
+}

diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index 6733c1e..d6779da 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI="5"
 GCONF_DEBUG="yes"
 
-inherit gnome2
+inherit gnome2 virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit git-2 gnome2-live
 fi
@@ -26,7 +26,7 @@ fi
 # cairo[X] needed for gnome-bg
 COMMON_DEPEND="
 	app-text/iso-codes
-	>=dev-libs/glib-2.35:2
+	>=dev-libs/glib-2.38:2
 	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
 	>=x11-libs/gtk+-3.3.6:3[introspection?]
 	>=x11-libs/libXext-1.1
@@ -42,6 +42,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/intltool-0.40.6
 	sys-devel/gettext
@@ -102,3 +103,10 @@ src_configure() {
 		$(use_enable introspection) \
 		${myconf}
 }
+
+src_test() {
+	# Makes unittest fail without this locale installed
+	rm ${S}/tests/he_IL* || due
+
+	Xemake check
+}

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Gilles Dartiguelongue]

commit:     bcc3f9bd854fe4e8d9f84c99ffadc1720d95b08a
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 22 21:37:11 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Apr 22 21:37:11 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bcc3f9bd

gnome-base/gnome-desktop: 3.12.0 → 3.12.1

---
 .../{gnome-desktop-3.12.0.ebuild => gnome-desktop-3.12.1.ebuild}          | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.12.0.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.12.1.ebuild
similarity index 100%
rename from gnome-base/gnome-desktop/gnome-desktop-3.12.0.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.12.1.ebuild

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Gilles Dartiguelongue]

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

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Gilles Dartiguelongue]

commit:     2cb23969c057f4b857158a2e96f0e62a21749ae9
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 20:19:56 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 20:27:09 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2cb23969

gnome-base/gnome-desktop: moved to gentoo-x86

---
 .../gnome-desktop/gnome-desktop-3.10.2.ebuild      | 61 ----------------------
 1 file changed, 61 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.10.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.10.2.ebuild
deleted file mode 100644
index adcfa20..0000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.10.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-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
-IUSE="+introspection"
-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.35:2
-	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[introspection?]
-	>=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
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.6
-	sys-devel/gettext
-	x11-proto/xproto
-	>=x11-proto/randrproto-1.2
-	virtual/pkgconfig
-"
-
-# 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_configure() {
-	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)
-	# will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
-	gnome2_src_configure \
-		--disable-static \
-		--with-gnome-distributor=Gentoo \
-		--enable-desktop-docs \
-		$(use_enable introspection) \
-		ITSTOOL=$(type -P true)
-}

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Gilles Dartiguelongue]

commit:     25faa3b863886779ec33c41624e39d2f6b1c4620
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  8 21:57:43 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 22:59:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=25faa3b8

gnome-base/gnome-desktop: 3.8.4 → 3.10.2

---
 .../gnome-desktop/gnome-desktop-3.10.2.ebuild      | 61 ++++++++++++++++++++++
 gnome-base/gnome-desktop/gnome-desktop-9999.ebuild | 48 +++++++----------
 2 files changed, 81 insertions(+), 28 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.10.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.10.2.ebuild
new file mode 100644
index 0000000..adcfa20
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.10.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+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
+IUSE="+introspection"
+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.35:2
+	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
+	>=x11-libs/gtk+-3.3.6:3[introspection?]
+	>=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
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/intltool-0.40.6
+	sys-devel/gettext
+	x11-proto/xproto
+	>=x11-proto/randrproto-1.2
+	virtual/pkgconfig
+"
+
+# 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_configure() {
+	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)
+	# will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
+	gnome2_src_configure \
+		--disable-static \
+		--with-gnome-distributor=Gentoo \
+		--enable-desktop-docs \
+		$(use_enable introspection) \
+		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 f628d98..9b92736 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
 
 inherit eutils gnome2 multilib
 if [[ ${PV} = 9999 ]]; then
@@ -12,21 +11,22 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="3/4" # subslot = libgnome-desktop-3 soname version
+SLOT="3/8" # 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 ~x86-linux ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
 fi
 
 # cairo[X] needed for gnome-bg
 COMMON_DEPEND="
-	>=dev-libs/glib-2.33.3:2
+	app-text/iso-codes
+	>=dev-libs/glib-2.35:2
 	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
 	>=x11-libs/gtk+-3.3.6:3[introspection?]
 	>=x11-libs/libXext-1.1
@@ -84,30 +84,22 @@ src_unpack() {
 }
 
 src_configure() {
-	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)
-	# will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
-	G2CONF="${G2CONF}
-		--disable-static
-		--with-gnome-distributor=Gentoo
-		--enable-desktop-docs
-		$(use_enable introspection)"
+	local myconf=""
+
 	if [[ ${PV} = 9999 ]]; then
-		G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
+		myconf="${myconf} $(use_enable doc gtk-doc)"
 	else
-		G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+		myconf="${myconf} ITSTOOL=$(type -P true)"
 	fi
 
-	gnome2_src_prepare
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-	preserve_old_lib /usr/$(get_libdir)/libgnome-desktop-3.so.2
-}
-
-pkg_postinst() {
-	gnome2_pkg_preinst
-	preserve_old_lib_notify /usr/$(get_libdir)/libgnome-desktop-3.so.2
+	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)
+	# will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
+	gnome2_src_configure \
+		--disable-static \
+		--with-gnome-distributor=Gentoo \
+		--enable-desktop-docs \
+		$(use_enable introspection) \
+		${myconf}
 }

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Alexandre Rostovtsev]

commit:     6facd47f06d46fac923112cd5dab0b8f8f8f86f4
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 19 08:37:40 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Wed Dec 19 08:37:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6facd47f

gnome-base/gnome-desktop: moved to gx86

Sync live ebuild with gx86. Always install license help files.

---
 .../gnome-desktop/gnome-desktop-3.6.2.ebuild       |  106 --------------------
 gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |   25 +++--
 gnome-base/gnome-desktop/metadata.xml              |    4 -
 3 files changed, 16 insertions(+), 119 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.6.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.6.2.ebuild
deleted file mode 100644
index 338bee2..0000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.6.2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 multilib
-if [[ ${PV} = 9999 ]]; then
-	inherit git-2 gnome2-live
-fi
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="3/4" # subslot = libgnome-desktop-3 soname version
-IUSE="doc +introspection"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-fi
-
-# cairo[X] needed for gnome-bg
-RDEPEND="
-	>=dev-libs/glib-2.33.3:2
-	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[introspection?]
-	>=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-2.91.92
-	doc? ( !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.6
-	sys-devel/gettext
-	x11-proto/xproto
-	>=x11-proto/randrproto-1.2
-	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_prepare() {
-	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)
-	# will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
-	G2CONF="${G2CONF}
-		--disable-static
-		--with-gnome-distributor=Gentoo
-		$(use_enable doc desktop-docs)
-		$(use_enable introspection)"
-	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
-
-	gnome2_src_prepare
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-	preserve_old_lib /usr/$(get_libdir)/libgnome-desktop-3.so.2
-}
-
-pkg_postinst() {
-	gnome2_pkg_preinst
-	preserve_old_lib_notify /usr/$(get_libdir)/libgnome-desktop-3.so.2
-}

diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index 338bee2..f628d98 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
@@ -16,29 +16,32 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="3/4" # subslot = libgnome-desktop-3 soname version
-IUSE="doc +introspection"
+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 ~x86-linux ~x86-solaris"
 fi
 
 # cairo[X] needed for gnome-bg
-RDEPEND="
+COMMON_DEPEND="
 	>=dev-libs/glib-2.33.3:2
 	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
 	>=x11-libs/gtk+-3.3.6:3[introspection?]
 	>=x11-libs/libXext-1.1
 	>=x11-libs/libXrandr-1.3
-	x11-libs/cairo[X]
+	x11-libs/cairo:=[X]
 	x11-libs/libxkbfile
 	x11-libs/libX11
 	x11-misc/xkeyboard-config
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	doc? ( !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] )
+	>=gnome-base/gsettings-desktop-schemas-3.5.91
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
 "
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
+"
+DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	>=dev-util/gtk-doc-am-1.4
 	>=dev-util/intltool-0.40.6
@@ -80,7 +83,7 @@ src_unpack() {
 	fi
 }
 
-src_prepare() {
+src_configure() {
 	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)
@@ -88,9 +91,13 @@ src_prepare() {
 	G2CONF="${G2CONF}
 		--disable-static
 		--with-gnome-distributor=Gentoo
-		$(use_enable doc desktop-docs)
+		--enable-desktop-docs
 		$(use_enable introspection)"
-	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+	if [[ ${PV} = 9999 ]]; then
+		G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
+	else
+		G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+	fi
 
 	gnome2_src_prepare
 }

diff --git a/gnome-base/gnome-desktop/metadata.xml b/gnome-base/gnome-desktop/metadata.xml
index 99b3795..6e0e2ec 100644
--- a/gnome-base/gnome-desktop/metadata.xml
+++ b/gnome-base/gnome-desktop/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>gnome</herd>
-  <use>
-    <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-			for introspection</flag>
-  </use>
 </pkgmetadata>

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Alexandre Rostovtsev]

commit:     d80a4bf8863842b2aed6e76174d64611f4b4324b
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  7 19:34:02 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sat Dec  8 17:29:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d80a4bf8

gnome-base/gnome-desktop: update to EAPI5, add subslot

---
 .../gnome-desktop/gnome-desktop-3.6.2.ebuild       |    4 ++--
 gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |   18 ++++++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.6.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.6.2.ebuild
index 4629565..338bee2 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.6.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.6.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
@@ -15,7 +15,7 @@ DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="3"
+SLOT="3/4" # subslot = libgnome-desktop-3 soname version
 IUSE="doc +introspection"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""

diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index 0e5a192..338bee2 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit eutils gnome2 multilib
 if [[ ${PV} = 9999 ]]; then
 	inherit git-2 gnome2-live
 fi
@@ -15,7 +15,7 @@ DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="3"
+SLOT="3/4" # subslot = libgnome-desktop-3 soname version
 IUSE="doc +introspection"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
@@ -93,4 +93,14 @@ src_prepare() {
 	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
 
 	gnome2_src_prepare
-}
\ No newline at end of file
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+	preserve_old_lib /usr/$(get_libdir)/libgnome-desktop-3.so.2
+}
+
+pkg_postinst() {
+	gnome2_pkg_preinst
+	preserve_old_lib_notify /usr/$(get_libdir)/libgnome-desktop-3.so.2
+}

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Gilles Dartiguelongue]

commit:     548bd93c31f867b85fc7e56066314f031dab5ede
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 27 19:09:14 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Oct 27 19:09:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=548bd93c

gnome-base/gnome-desktop: add missing preserved_libs calls

---
 .../gnome-desktop/gnome-desktop-3.6.0.1.ebuild     |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.6.0.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.6.0.1.ebuild
index 604519f..3e135ce 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.6.0.1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.6.0.1.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit eutils gnome2 multilib
 if [[ ${PV} = 9999 ]]; then
 	inherit git-2 gnome2-live
 fi
@@ -91,3 +91,13 @@ src_unpack() {
 			die "ln -sf failed"
 	fi
 }
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+	preserve_old_lib /usr/$(get_libdir)/libgnome-desktop-3.so.2
+}
+
+pkg_postinst() {
+	gnome2_pkg_preinst
+	preserve_old_lib_notify /usr/$(get_libdir)/libgnome-desktop-3.so.2
+}

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Alexandre Rostovtsev]

commit:     3138b45884af9f721cccfe872d00602545480a83
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 29 23:31:12 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sat Sep 29 23:31:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3138b458

gnome-base/gnome-desktop: 3.5.91 → 3.6.0.1

Update license.

---
 ...-3.5.91.ebuild => gnome-desktop-3.6.0.1.ebuild} |    2 +-
 gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.5.91.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.6.0.1.ebuild
similarity index 98%
rename from gnome-base/gnome-desktop/gnome-desktop-3.5.91.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.6.0.1.ebuild
index c97e502..604519f 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.5.91.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.6.0.1.ebuild
@@ -14,7 +14,7 @@ fi
 DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="3"
 IUSE="doc +introspection"
 if [[ ${PV} = 9999 ]]; then

diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index c97e502..604519f 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
@@ -14,7 +14,7 @@ fi
 DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="3"
 IUSE="doc +introspection"
 if [[ ${PV} = 9999 ]]; then

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Nirbheek Chauhan]

commit:     060981ab0438120d29a3cfadb55109836e63bd5e
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  4 22:45:31 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Sep  5 15:48:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=060981ab

gnome-base/gnome-desktop: 3.5.90 → 3.5.91

---
 ...p-3.5.90.ebuild => gnome-desktop-3.5.91.ebuild} |    7 ++++++-
 gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |    7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.5.90.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.5.91.ebuild
similarity index 94%
rename from gnome-base/gnome-desktop/gnome-desktop-3.5.90.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.5.91.ebuild
index 8af80b4..c97e502 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.5.90.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.5.91.ebuild
@@ -40,7 +40,6 @@ RDEPEND="
 	doc? ( !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
 DEPEND="${RDEPEND}
-	app-text/yelp-tools
 	app-text/docbook-xml-dtd:4.1.2
 	>=dev-util/intltool-0.40.6
 	sys-devel/gettext
@@ -49,6 +48,11 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1.4 )"
 
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${DEPEND}
+		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)
@@ -63,6 +67,7 @@ pkg_setup() {
 		--with-gnome-distributor=Gentoo
 		$(use_enable doc desktop-docs)
 		$(use_enable introspection)"
+	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
 }
 
 src_unpack() {

diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index 8af80b4..c97e502 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
@@ -40,7 +40,6 @@ RDEPEND="
 	doc? ( !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
 DEPEND="${RDEPEND}
-	app-text/yelp-tools
 	app-text/docbook-xml-dtd:4.1.2
 	>=dev-util/intltool-0.40.6
 	sys-devel/gettext
@@ -49,6 +48,11 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1.4 )"
 
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${DEPEND}
+		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)
@@ -63,6 +67,7 @@ pkg_setup() {
 		--with-gnome-distributor=Gentoo
 		$(use_enable doc desktop-docs)
 		$(use_enable introspection)"
+	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
 }
 
 src_unpack() {

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Nirbheek Chauhan]

commit:     e0465c498ec62a9446921e47b9d4bf4bbc7f5e51
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  2 18:44:21 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sun Sep  2 18:50:18 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e0465c49

gnome-base/gnome-desktop: 3.5.5 → 3.5.90

---
 ...op-3.5.5.ebuild => gnome-desktop-3.5.90.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.5.5.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.5.90.ebuild
similarity index 100%
rename from gnome-base/gnome-desktop/gnome-desktop-3.5.5.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.5.90.ebuild

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Priit Laes]

commit:     979f5ce9455e6d5f03fdb1bed72b3c96d16e79be
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sat Aug 18 11:52:57 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sat Aug 18 11:52:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=979f5ce9

gnome-base/gnome-desktop: Add 3.5.5 to overlay

---
 ...ktop-9999.ebuild => gnome-desktop-3.5.5.ebuild} |    9 +++++----
 gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |    9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.5.5.ebuild
similarity index 96%
copy from gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
copy to gnome-base/gnome-desktop/gnome-desktop-3.5.5.ebuild
index 4da0173..8af80b4 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.5.5.ebuild
@@ -27,19 +27,21 @@ fi
 # Latest schemas needed due to commit 7f3e3d52
 # cairo[X] needed for gnome-bg
 RDEPEND="
-	>=dev-libs/glib-2.19.1:2
-	x11-libs/cairo[X]
+	>=dev-libs/glib-2.33.3:2
 	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
 	>=x11-libs/gtk+-3.3.6:3[introspection?]
 	>=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-2.91.92
 	doc? ( !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
 DEPEND="${RDEPEND}
+	app-text/yelp-tools
 	app-text/docbook-xml-dtd:4.1.2
-	>=app-text/gnome-doc-utils-0.3.2
 	>=dev-util/intltool-0.40.6
 	sys-devel/gettext
 	x11-proto/xproto
@@ -57,7 +59,6 @@ pkg_setup() {
 	# file (needed by other packages such as >=gnome-settings-daemon-3.1.2)
 	# will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
 	G2CONF="${G2CONF}
-		--disable-scrollkeeper
 		--disable-static
 		--with-gnome-distributor=Gentoo
 		$(use_enable doc desktop-docs)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index 4da0173..8af80b4 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
@@ -27,19 +27,21 @@ fi
 # Latest schemas needed due to commit 7f3e3d52
 # cairo[X] needed for gnome-bg
 RDEPEND="
-	>=dev-libs/glib-2.19.1:2
-	x11-libs/cairo[X]
+	>=dev-libs/glib-2.33.3:2
 	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
 	>=x11-libs/gtk+-3.3.6:3[introspection?]
 	>=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-2.91.92
 	doc? ( !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
 DEPEND="${RDEPEND}
+	app-text/yelp-tools
 	app-text/docbook-xml-dtd:4.1.2
-	>=app-text/gnome-doc-utils-0.3.2
 	>=dev-util/intltool-0.40.6
 	sys-devel/gettext
 	x11-proto/xproto
@@ -57,7 +59,6 @@ pkg_setup() {
 	# file (needed by other packages such as >=gnome-settings-daemon-3.1.2)
 	# will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
 	G2CONF="${G2CONF}
-		--disable-scrollkeeper
 		--disable-static
 		--with-gnome-distributor=Gentoo
 		$(use_enable doc desktop-docs)

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Alexandre Restovtsev]

commit:     06d6130d5875ea28f560d20e5df9e612555395e9
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 07:44:42 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu May 24 07:44:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=06d6130d

gnome-base/gnome-desktop: moved to gx86; update live ebuild

---
 .../gnome-desktop/gnome-desktop-3.4.0.ebuild       |   87 --------------------
 gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |    4 +-
 2 files changed, 2 insertions(+), 89 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.4.0.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.4.0.ebuild
deleted file mode 100644
index 7c99f7b..0000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.4.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit git-2 gnome2-live
-fi
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="3"
-IUSE="doc +introspection"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-fi
-
-# TODO: Add RDEPEND on pciutils (requires support for reading gzipped pnp.ids)
-# Latest schemas needed due to commit 7f3e3d52
-# cairo[X] needed for gnome-bg
-RDEPEND="
-	>=dev-libs/glib-2.19.1:2
-	x11-libs/cairo[X]
-	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[introspection?]
-	>=x11-libs/libXext-1.1
-	>=x11-libs/libXrandr-1.3
-	x11-libs/libX11
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	doc? ( !<gnome-base/gnome-desktop-2.32.1-r50:2[doc] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=app-text/gnome-doc-utils-0.3.2
-	>=dev-util/intltool-0.40.6
-	sys-devel/gettext
-	x11-proto/xproto
-	>=x11-proto/randrproto-1.2
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-
-# 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)
-
-pkg_setup() {
-	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)
-	# will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-static
-		--with-gnome-distributor=Gentoo
-		$(use_enable doc desktop-docs)
-		$(use_enable introspection)"
-}
-
-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
-}

diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index 7c99f7b..4da0173 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-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -35,7 +35,7 @@ RDEPEND="
 	>=x11-libs/libXrandr-1.3
 	x11-libs/libX11
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	doc? ( !<gnome-base/gnome-desktop-2.32.1-r50:2[doc] )
+	doc? ( !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Alexandre Restovtsev]

commit:     6d6051b1252b334462735eac53412524275584cc
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  6 09:02:47 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Apr  6 09:02:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6d6051b1

gnome-base/gnome-desktop: 3.3.92 → 3.4.0

---
 ...op-3.3.92.ebuild => gnome-desktop-3.4.0.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.3.92.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.4.0.ebuild
similarity index 100%
rename from gnome-base/gnome-desktop/gnome-desktop-3.3.92.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.4.0.ebuild

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Nirbheek Chauhan]

commit:     fec858ed6a7d26be53e161db0fccb678f6264552
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 25 06:40:30 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Mar 26 08:19:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fec858ed

Add gnome-base/gnome-desktop-3.3.92

---
 ...top-9999.ebuild => gnome-desktop-3.3.92.ebuild} |    4 ++--
 gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.3.92.ebuild
similarity index 97%
copy from gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
copy to gnome-base/gnome-desktop/gnome-desktop-3.3.92.ebuild
index 300f0d8..35e2c66 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.3.92.ebuild
@@ -30,9 +30,9 @@ RDEPEND="
 	>=dev-libs/glib-2.19.1:2
 	x11-libs/cairo[X]
 	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
-	>=x11-libs/gtk+-3.0.0:3[introspection?]
+	>=x11-libs/gtk+-3.3.6:3[introspection?]
 	>=x11-libs/libXext-1.1
-	>=x11-libs/libXrandr-1.2
+	>=x11-libs/libXrandr-1.3
 	x11-libs/libX11
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
 	doc? ( !<gnome-base/gnome-desktop-2.32.1-r50:2[doc] )

diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index 300f0d8..35e2c66 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
@@ -30,9 +30,9 @@ RDEPEND="
 	>=dev-libs/glib-2.19.1:2
 	x11-libs/cairo[X]
 	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
-	>=x11-libs/gtk+-3.0.0:3[introspection?]
+	>=x11-libs/gtk+-3.3.6:3[introspection?]
 	>=x11-libs/libXext-1.1
-	>=x11-libs/libXrandr-1.2
+	>=x11-libs/libXrandr-1.3
 	x11-libs/libX11
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
 	doc? ( !<gnome-base/gnome-desktop-2.32.1-r50:2[doc] )

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Alexandre Restovtsev]

commit:     5f1d9cc9c9bdc2b04223d85cc5e47de3d39ad0a2
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Jun 28 02:46:58 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Jun 28 03:25:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5f1d9cc9

gnome-base/gnome-desktop: install pnp.ids file

A number of Gnome 3.1 packages require the pnp.ids file that on Gentoo
is provided by gnome-desktop; ensure that it is installed correctly by
*not* using --with-pnp-ids-path configure argument (if it's set to
anything, pnp.ids will not be installed).

Since the set of installed files changed, bump the revision.

Also, update the live ebuild with changes from 3.0.x, update the
intltool dependency, and get the pnp.ids file from Fedora's hwdata git
(requiring an additional call to git-2_src_unpack), because the file is
only included in the gnome-desktop tarballs, not in gnome-desktop git.

---
 ...-3.0.2.ebuild => gnome-desktop-3.0.2-r1.ebuild} |   28 ++++++++++-
 gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |   51 +++++++++++++++-----
 2 files changed, 64 insertions(+), 15 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.0.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.0.2-r1.ebuild
similarity index 66%
rename from gnome-base/gnome-desktop/gnome-desktop-3.0.2.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.0.2-r1.ebuild
index 3e0de57..22cf74e 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.0.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.0.2-r1.ebuild
@@ -8,7 +8,7 @@ GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
+	inherit git-2 gnome2-live
 fi
 
 DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
@@ -51,11 +51,35 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	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)
+	# will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
 	G2CONF="${G2CONF}
 		--disable-scrollkeeper
 		--disable-static
-		--with-pnp-ids-path=internal
 		--with-gnome-distributor=Gentoo
 		$(use_enable doc desktop-docs)
 		$(use_enable introspection)"
 }
+
+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
+}

diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index 89c74f4..07e3051 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
@@ -2,12 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
+	inherit git-2 gnome2-live
 fi
 
 DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
@@ -23,6 +24,7 @@ else
 fi
 
 # TODO: Add RDEPEND on pciutils (requires support for reading gzipped pnp.ids)
+# Latest schemas needed due to commit 7f3e3d52
 RDEPEND="
 	>=dev-libs/glib-2.19.1:2
 	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
@@ -30,31 +32,54 @@ RDEPEND="
 	>=x11-libs/libXrandr-1.2
 	>=x11-libs/startup-notification-0.5
 	x11-libs/libX11
-	>=gnome-base/gsettings-desktop-schemas-0.1.4
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
 	doc? ( !<gnome-base/gnome-desktop-2.32.1-r50:2[doc] )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.9
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? ( >=dev-util/gtk-doc-1.4 )
 	~app-text/docbook-xml-dtd-4.1.2
+	>=app-text/gnome-doc-utils-0.3.2
+	>=dev-util/intltool-0.40.6
+	>=dev-util/pkgconfig-0.9
+	sys-devel/gettext
 	x11-proto/xproto
-	>=x11-proto/randrproto-1.2"
+	>=x11-proto/randrproto-1.2
+	doc? ( >=dev-util/gtk-doc-1.4 )"
 
 # 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)
 
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
 pkg_setup() {
+	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)
+	# will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
 	G2CONF="${G2CONF}
 		--disable-scrollkeeper
 		--disable-static
-		--disable-desktop-docs
-		--with-pnp-ids-path=/usr/share/libgnome-desktop/pnp.ids
 		--with-gnome-distributor=Gentoo
+		$(use_enable doc desktop-docs)
 		$(use_enable introspection)"
 }
+
+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
+}

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Alexandre Restovtsev]

commit:     0b0564908a5f65e253b18b6059e2df86849395a4
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Jun 15 05:59:14 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Jun 19 02:19:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0b056490

gnome-base/gnome-desktop: better fix for bug #362383

Better fix for #362383, as proposed by Nirbheek on IRC; have the gnome
help and omf files only be installed by gnome-desktop[doc]:3, on which
gnome-desktop[doc]:2 will PDEPEND (pdepend to ensure that file
collisions do not aries when upgrading from the gx86 version of
gnome-desktop:2).

---
 .../gnome-desktop/gnome-desktop-2.32.1-r50.ebuild  |   56 ++++++++++++++++++++
 .../gnome-desktop/gnome-desktop-3.0.2.ebuild       |    1 +
 gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |    1 +
 3 files changed, 58 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r50.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r50.ebuild
new file mode 100644
index 0000000..c62610c
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r50.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.32.1.ebuild,v 1.10 2011/04/10 09:22:09 ssuominen Exp $
+
+EAPI="3"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2"
+
+inherit gnome2 python
+
+DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc"
+
+# Note: gnome-desktop:2 and :3 install identical files in /usr/share/gnome/help
+# and /usr/share/omf when --enable-desktop-docs is passed to configure. To avoid
+# file conflict and pointless duplication, gnome-desktop:2[doc] will simply use
+# the files that are installed by :3[doc]
+RDEPEND=">=x11-libs/gtk+-2.18:2
+	>=dev-libs/glib-2.19.1:2
+	>=x11-libs/libXrandr-1.2
+	>=gnome-base/gconf-2:2
+	>=x11-libs/startup-notification-0.5"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.9
+	>=app-text/gnome-doc-utils-0.3.2
+	~app-text/docbook-xml-dtd-4.1.2
+	x11-proto/xproto
+	>=x11-proto/randrproto-1.2"
+PDEPEND=">=dev-python/pygtk-2.8:2
+	>=dev-python/pygobject-2.14:2
+	doc? ( gnome-base/gnome-desktop:3[doc] )"
+
+# 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)
+
+pkg_setup() {
+	python_set_active_version 2
+
+	G2CONF="${G2CONF}
+		PYTHON=$(PYTHON -a)
+		--with-gnome-distributor=Gentoo
+		--disable-scrollkeeper
+		--disable-static
+		--disable-deprecations
+		--disable-desktop-docs"
+	# If USE=doc, desktop-docs will be built by gnome-desktop:3
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+}

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.0.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.0.2.ebuild
index 87d2013..3e0de57 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.0.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.0.2.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
 	>=x11-libs/startup-notification-0.5
 	x11-libs/libX11
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	doc? ( !<gnome-base/gnome-desktop-2.32.1-r50:2[doc] )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
 DEPEND="${RDEPEND}
 	~app-text/docbook-xml-dtd-4.1.2

diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index a82c2cb..89c74f4 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 	>=x11-libs/startup-notification-0.5
 	x11-libs/libX11
 	>=gnome-base/gsettings-desktop-schemas-0.1.4
+	doc? ( !<gnome-base/gnome-desktop-2.32.1-r50:2[doc] )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Gilles Dartiguelongue]

commit:     459349892623710d2b84b1479cfd9b2eb1cfd4fd
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 21:26:21 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 21:26:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=45934989

gnome-base/gnome-desktop: 3.0.0 → 3.0.1

---
 ...top-3.0.0.ebuild => gnome-desktop-3.0.1.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.0.0.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.0.1.ebuild
similarity index 100%
rename from gnome-base/gnome-desktop/gnome-desktop-3.0.0.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.0.1.ebuild

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Gilles Dartiguelongue]

commit:     68fa669ae6a34f72c0e004fb345722ae33ddcd5d
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 14:50:42 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 14:50:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=68fa669a

gnome-base/gnome-desktop: QAed

	* Sort DEPEND
	* Re-enable desktop-docs
	* Explicitely set internal for pnp.ids

(Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key C6085806)

---
 .../gnome-desktop/gnome-desktop-3.0.0.ebuild       |   21 +++++++++----------
 gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |    1 -
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.0.0.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.0.0.ebuild
index 641d07c..077b595 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.0.0.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.0.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
@@ -32,28 +33,26 @@ RDEPEND="
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
+	~app-text/docbook-xml-dtd-4.1.2
+	>=app-text/gnome-doc-utils-0.3.2
 	>=dev-util/intltool-0.40
 	>=dev-util/pkgconfig-0.9
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? ( >=dev-util/gtk-doc-1.4 )
-	~app-text/docbook-xml-dtd-4.1.2
+	sys-devel/gettext
 	x11-proto/xproto
-	>=x11-proto/randrproto-1.2"
+	>=x11-proto/randrproto-1.2
+	doc? ( >=dev-util/gtk-doc-1.4 )"
 
 # 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)
 
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 	G2CONF="${G2CONF}
 		--disable-scrollkeeper
 		--disable-static
-		--disable-desktop-docs
-		--with-pnp-ids-path=/usr/share/libgnome-desktop/pnp.ids
+		--with-pnp-ids-path=internal
 		--with-gnome-distributor=Gentoo
+		$(use_enable doc desktop-docs)
 		$(use_enable introspection)"
 }
-

diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index c8bf51b..5b7781b 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
@@ -55,4 +55,3 @@ pkg_setup() {
 		--with-gnome-distributor=Gentoo
 		$(use_enable introspection)"
 }
-

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Nirbheek Chauhan]

commit:     b556bcb6a4567422d5a898c5374e465195f2cc56
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 21:19:37 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 21:20:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b556bcb6

gnome-base/gnome-desktop: 2.91.93 → 3.0.0

---
 ...p-2.91.93.ebuild => gnome-desktop-3.0.0.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.91.93.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.0.0.ebuild
similarity index 100%
rename from gnome-base/gnome-desktop/gnome-desktop-2.91.93.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.0.0.ebuild

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Nirbheek Chauhan]

commit:     857d951fb29756a44e09a7a4caf86cbb4efd5b49
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 03:09:39 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 03:09:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=857d951f

gnome-base/gnome-desktop: 2.91.92 → 2.91.93, fix background-crash issue

---
 ...2.91.92.ebuild => gnome-desktop-2.91.93.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.91.92.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.91.93.ebuild
similarity index 100%
rename from gnome-base/gnome-desktop/gnome-desktop-2.91.92.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-2.91.93.ebuild

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Nirbheek Chauhan]

commit:     cfdd8ca2b11e80e9a8df3ea6800cf4eeb7236826
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 03:54:52 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 04:18:34 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=cfdd8ca2

gnome-base/gnome-desktop: 2.91.91 → 2.91.92

---
 ...2.91.91.ebuild => gnome-desktop-2.91.92.ebuild} |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.91.91.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.91.92.ebuild
similarity index 94%
rename from gnome-base/gnome-desktop/gnome-desktop-2.91.91.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-2.91.92.ebuild
index c8bf51b..641d07c 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.91.91.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.91.92.ebuild
@@ -21,6 +21,7 @@ else
 fi
 
 # TODO: Add RDEPEND on pciutils (requires support for reading gzipped pnp.ids)
+# Latest schemas needed due to commit 7f3e3d52
 RDEPEND="
 	>=dev-libs/glib-2.19.1:2
 	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
@@ -28,7 +29,7 @@ RDEPEND="
 	>=x11-libs/libXrandr-1.2
 	>=x11-libs/startup-notification-0.5
 	x11-libs/libX11
-	>=gnome-base/gsettings-desktop-schemas-0.1.4
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Nirbheek Chauhan]

commit:     b7d9a443a49963c88e19bd794282b4f91a6e219a
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  8 12:55:41 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Mar  8 13:19:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b7d9a443

gnome-base/gnome-desktop 2.91.90 → 2.91.91

---
 ...2.91.90.ebuild => gnome-desktop-2.91.91.ebuild} |    9 ++++-----
 gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |    9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.91.90.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.91.91.ebuild
similarity index 87%
rename from gnome-base/gnome-desktop/gnome-desktop-2.91.90.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-2.91.91.ebuild
index e35c726..c8bf51b 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.91.90.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.91.91.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -21,11 +21,10 @@ else
 fi
 
 # TODO: Add RDEPEND on pciutils (requires support for reading gzipped pnp.ids)
-# XXX: gtk+-2.91.6 is needed for gdk_x11_window_get_xid()
 RDEPEND="
-	>=dev-libs/glib-2.19.1
-	>=x11-libs/gdk-pixbuf-2.21.3[introspection?]
-	>=x11-libs/gtk+-2.91.6:3[introspection?]
+	>=dev-libs/glib-2.19.1:2
+	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
+	>=x11-libs/gtk+-3.0.0:3[introspection?]
 	>=x11-libs/libXrandr-1.2
 	>=x11-libs/startup-notification-0.5
 	x11-libs/libX11

diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index e35c726..c8bf51b 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-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -21,11 +21,10 @@ else
 fi
 
 # TODO: Add RDEPEND on pciutils (requires support for reading gzipped pnp.ids)
-# XXX: gtk+-2.91.6 is needed for gdk_x11_window_get_xid()
 RDEPEND="
-	>=dev-libs/glib-2.19.1
-	>=x11-libs/gdk-pixbuf-2.21.3[introspection?]
-	>=x11-libs/gtk+-2.91.6:3[introspection?]
+	>=dev-libs/glib-2.19.1:2
+	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
+	>=x11-libs/gtk+-3.0.0:3[introspection?]
 	>=x11-libs/libXrandr-1.2
 	>=x11-libs/startup-notification-0.5
 	x11-libs/libX11

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Nirbheek Chauhan]

commit:     82d4dadd1f9e37cf5c5d0fbc0dcd51bc2cf69349
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 23:57:54 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 23:57:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=82d4dadd

gnome-base/gnome-desktop: 2.91.6.1 -> 2.91.90

---
 ....91.6.1.ebuild => gnome-desktop-2.91.90.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.91.6.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.91.90.ebuild
similarity index 100%
rename from gnome-base/gnome-desktop/gnome-desktop-2.91.6.1.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-2.91.90.ebuild

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Nirbheek Chauhan]

commit:     b8da564addf8cf042d41015acd5126d6be761dd0
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  7 18:05:34 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Feb  7 18:17:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b8da564a

gnome-base/gnome-desktop: fix distributor configure switch

---
 .../gnome-desktop/gnome-desktop-2.91.6.1.ebuild    |    2 +-
 gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.91.6.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.91.6.1.ebuild
index ca8d2b8..e35c726 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.91.6.1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.91.6.1.ebuild
@@ -53,7 +53,7 @@ pkg_setup() {
 		--disable-static
 		--disable-desktop-docs
 		--with-pnp-ids-path=/usr/share/libgnome-desktop/pnp.ids
-		--with-distributor=Gentoo
+		--with-gnome-distributor=Gentoo
 		$(use_enable introspection)"
 }
 

diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index ca8d2b8..e35c726 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
@@ -53,7 +53,7 @@ pkg_setup() {
 		--disable-static
 		--disable-desktop-docs
 		--with-pnp-ids-path=/usr/share/libgnome-desktop/pnp.ids
-		--with-distributor=Gentoo
+		--with-gnome-distributor=Gentoo
 		$(use_enable introspection)"
 }