From: "Gilles Dartiguelongue" <eva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-panel/
Date: Mon, 24 Dec 2012 14:47:26 +0000 (UTC) [thread overview]
Message-ID: <1356360414.ab7d0531b2e12c6c012765fb45b8ba42668c77ba.eva@gentoo> (raw)
commit: ab7d0531b2e12c6c012765fb45b8ba42668c77ba
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 24 14:46:54 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 24 14:46:54 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ab7d0531
gnome-base/gnome-panel: moved to gx86
* Sync live ebuild with gx86 changes.
* USE=introspection is now global.
---
gnome-base/gnome-panel/gnome-panel-3.6.2.ebuild | 100 -----------------------
gnome-base/gnome-panel/gnome-panel-9999.ebuild | 36 +++------
gnome-base/gnome-panel/metadata.xml | 4 +-
3 files changed, 11 insertions(+), 129 deletions(-)
diff --git a/gnome-base/gnome-panel/gnome-panel-3.6.2.ebuild b/gnome-base/gnome-panel/gnome-panel-3.6.2.ebuild
deleted file mode 100644
index 80be397..0000000
--- a/gnome-base/gnome-panel/gnome-panel-3.6.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
-
-DESCRIPTION="The GNOME panel"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="0"
-IUSE="eds +introspection networkmanager"
-if [[ ${PV} = 9999 ]]; then
- IUSE="${IUSE} doc"
- KEYWORDS=""
-else
- # Odd behaviour w.r.t. panels: https://bugzilla.gnome.org/show_bug.cgi?id=631553
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-fi
-
-RDEPEND=">=dev-libs/glib-2.31.14:2
- >=dev-libs/libgweather-3.5.1:2
- dev-libs/libxml2:2
- >=gnome-base/dconf-0.13.4
- >=gnome-base/gconf-2.6.1:2[introspection?]
- >=gnome-base/gnome-desktop-2.91:3
- >=gnome-base/gnome-menus-3.1.4:3
- gnome-base/gsettings-desktop-schemas
- gnome-base/librsvg:2
- >=net-libs/telepathy-glib-0.14.0
- sys-auth/polkit
- >=x11-libs/cairo-1[X]
- >=x11-libs/gdk-pixbuf-2.25.2:2
- >=x11-libs/gtk+-3.3.8:3[introspection?]
- x11-libs/libXau
- x11-libs/libICE
- x11-libs/libSM
- >=x11-libs/libXrandr-1.2
- >=x11-libs/libwnck-2.91:3
- >=x11-libs/pango-1.15.4[introspection?]
-
- eds? ( >=gnome-extra/evolution-data-server-3.5.3 )
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
- networkmanager? ( >=net-misc/networkmanager-0.6.7 )"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- >=dev-lang/perl-5
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.40
- virtual/pkgconfig"
-# eautoreconf needs
-# gnome-base/gnome-common
-
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- app-text/yelp-tools
- doc? ( >=dev-util/gtk-doc-1 )"
-fi
-
-src_configure() {
- # XXX: Make presence/telepathy-glib support optional?
- # We can do that if we intend to support fallback-only as a setup
- G2CONF="${G2CONF}
- --disable-deprecation-flags
- --disable-static
- --disable-schemas-install
- --with-in-process-applets=clock,notification-area,wncklet
- --enable-telepathy-glib
- $(use_enable networkmanager network-manager)
- $(use_enable introspection)
- $(use_enable eds)"
- [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
- DOCS="AUTHORS ChangeLog HACKING NEWS README"
- gnome2_src_configure
-}
-
-pkg_postinst() {
- local entries="${EROOT}etc/gconf/schemas/panel-default-setup.entries"
- local gconftool="${EROOT}usr/bin/gconftool-2"
-
- if [ -e "$entries" ]; then
- einfo "Setting panel gconf defaults..."
-
- GCONF_CONFIG_SOURCE="$("${gconftool}" --get-default-source | sed "s;:/;:${ROOT};")"
-
- "${gconftool}" --direct --config-source \
- "${GCONF_CONFIG_SOURCE}" --load="${entries}"
- fi
-
- # Calling this late so it doesn't process the GConf schemas file we already
- # took care of.
- gnome2_pkg_postinst
-}
diff --git a/gnome-base/gnome-panel/gnome-panel-9999.ebuild b/gnome-base/gnome-panel/gnome-panel-9999.ebuild
index 80be397..45450d9 100644
--- a/gnome-base/gnome-panel/gnome-panel-9999.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
+EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
@@ -26,15 +26,15 @@ else
fi
RDEPEND=">=dev-libs/glib-2.31.14:2
- >=dev-libs/libgweather-3.5.1:2
+ >=dev-libs/libgweather-3.5.1:2=
dev-libs/libxml2:2
>=gnome-base/dconf-0.13.4
>=gnome-base/gconf-2.6.1:2[introspection?]
- >=gnome-base/gnome-desktop-2.91:3
+ >=gnome-base/gnome-desktop-2.91:3=
>=gnome-base/gnome-menus-3.1.4:3
gnome-base/gsettings-desktop-schemas
gnome-base/librsvg:2
- >=net-libs/telepathy-glib-0.14.0
+ >=net-libs/telepathy-glib-0.14
sys-auth/polkit
>=x11-libs/cairo-1[X]
>=x11-libs/gdk-pixbuf-2.25.2:2
@@ -46,16 +46,19 @@ RDEPEND=">=dev-libs/glib-2.31.14:2
>=x11-libs/libwnck-2.91:3
>=x11-libs/pango-1.15.4[introspection?]
- eds? ( >=gnome-extra/evolution-data-server-3.5.3 )
+ eds? ( >=gnome-extra/evolution-data-server-3.5.3:= )
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
- networkmanager? ( >=net-misc/networkmanager-0.6.7 )"
+ networkmanager? ( >=net-misc/networkmanager-0.6.7 )
+"
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.1.2
>=dev-lang/perl-5
dev-util/gtk-doc-am
>=dev-util/intltool-0.40
- virtual/pkgconfig"
+ virtual/pkgconfig
+"
# eautoreconf needs
+# dev-libs/gobject-introspection-common
# gnome-base/gnome-common
if [[ ${PV} = 9999 ]]; then
@@ -70,7 +73,6 @@ src_configure() {
G2CONF="${G2CONF}
--disable-deprecation-flags
--disable-static
- --disable-schemas-install
--with-in-process-applets=clock,notification-area,wncklet
--enable-telepathy-glib
$(use_enable networkmanager network-manager)
@@ -80,21 +82,3 @@ src_configure() {
DOCS="AUTHORS ChangeLog HACKING NEWS README"
gnome2_src_configure
}
-
-pkg_postinst() {
- local entries="${EROOT}etc/gconf/schemas/panel-default-setup.entries"
- local gconftool="${EROOT}usr/bin/gconftool-2"
-
- if [ -e "$entries" ]; then
- einfo "Setting panel gconf defaults..."
-
- GCONF_CONFIG_SOURCE="$("${gconftool}" --get-default-source | sed "s;:/;:${ROOT};")"
-
- "${gconftool}" --direct --config-source \
- "${GCONF_CONFIG_SOURCE}" --load="${entries}"
- fi
-
- # Calling this late so it doesn't process the GConf schemas file we already
- # took care of.
- gnome2_pkg_postinst
-}
diff --git a/gnome-base/gnome-panel/metadata.xml b/gnome-base/gnome-panel/metadata.xml
index 6d6c1a0..649ec2c 100644
--- a/gnome-base/gnome-panel/metadata.xml
+++ b/gnome-base/gnome-panel/metadata.xml
@@ -4,8 +4,6 @@
<herd>gnome</herd>
<use>
<flag name="bonobo">Enable Bonobo compatibility modules for applets
- still not ported to DBUS.</flag>
- <flag name="introspection">Use
- <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
+ still not ported to DBUS.</flag>
</use>
</pkgmetadata>
next reply other threads:[~2012-12-24 14:47 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-24 14:47 Gilles Dartiguelongue [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-04-25 22:44 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-panel/ Gilles Dartiguelongue
2014-02-12 20:58 Gilles Dartiguelongue
2012-11-22 23:04 Gilles Dartiguelongue
2012-10-16 3:01 Alexandre Rostovtsev
2012-09-22 15:54 Nirbheek Chauhan
2012-09-10 10:43 Priit Laes
2012-09-08 8:43 Nirbheek Chauhan
2012-08-18 10:40 Priit Laes
2012-05-24 9:11 Alexandre Restovtsev
2011-10-18 7:37 Alexandre Restovtsev
2011-05-30 18:39 Nirbheek Chauhan
2011-05-19 12:33 Gilles Dartiguelongue
2011-04-19 6:52 Gilles Dartiguelongue
2011-04-06 12:14 Nirbheek Chauhan
2011-04-05 0:57 Nirbheek Chauhan
2011-04-01 14:48 Nirbheek Chauhan
2011-03-29 8:36 Nirbheek Chauhan
2011-03-23 5:20 Nirbheek Chauhan
2011-03-09 11:34 Nirbheek Chauhan
2011-03-04 14:57 Nirbheek Chauhan
2011-02-27 3:02 Jonathan Callen
2011-02-23 14:40 Nirbheek Chauhan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1356360414.ab7d0531b2e12c6c012765fb45b8ba42668c77ba.eva@gentoo \
--to=eva@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox