* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-applets/
@ 2011-03-04 14:57 Nirbheek Chauhan
0 siblings, 0 replies; 9+ messages in thread
From: Nirbheek Chauhan @ 2011-03-04 14:57 UTC (permalink / raw
To: gentoo-commits
commit: 4ddf235a85794060a3bda988c81bce2e45b347db
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 4 11:58:41 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Mar 4 13:11:17 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4ddf235a
gnome-base/gnome-applets: update gnome-panel deps
---
gnome-base/gnome-applets/gnome-applets-9999.ebuild | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/gnome-base/gnome-applets/gnome-applets-9999.ebuild b/gnome-base/gnome-applets/gnome-applets-9999.ebuild
index 883c757..52b0a2c 100644
--- a/gnome-base/gnome-applets/gnome-applets-9999.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-9999.ebuild
@@ -24,10 +24,12 @@ fi
# XXX: invest applet not yet ported to GNOME 3, disabled upstream
# null applet still needs bonobo support for gnome-panel?
+#
+# Latest gnome-panel needed due to commit 45a4988a6
RDEPEND=">=x11-libs/gtk+-2.20:3
>=dev-libs/glib-2.22:2
>=gnome-base/gconf-2.8:2
- >=gnome-base/gnome-panel-2.91.4
+ >=gnome-base/gnome-panel-2.91.91
>=x11-libs/libxklavier-4.0
>=x11-libs/libwnck-2.91.0:3
>=x11-libs/libnotify-0.7
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-applets/
@ 2011-03-05 19:59 Nirbheek Chauhan
0 siblings, 0 replies; 9+ messages in thread
From: Nirbheek Chauhan @ 2011-03-05 19:59 UTC (permalink / raw
To: gentoo-commits
commit: 3a1629e475f815667767dd2b06140d3f70c5b593
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 5 19:52:48 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Mar 5 19:55:49 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3a1629e4
gnome-base/gnome-applets: don't remove la files that aren't la files
* Update gtk+ dependency
---
gnome-base/gnome-applets/gnome-applets-9999.ebuild | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnome-base/gnome-applets/gnome-applets-9999.ebuild b/gnome-base/gnome-applets/gnome-applets-9999.ebuild
index 52b0a2c..266b21f 100644
--- a/gnome-base/gnome-applets/gnome-applets-9999.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-9999.ebuild
@@ -4,7 +4,7 @@
EAPI="3"
GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
+GNOME2_LA_PUNT="no" # bug 340725, no other la files
#PYTHON_DEPEND="2:2.4"
inherit eutils gnome2 #python
@@ -26,7 +26,7 @@ fi
# null applet still needs bonobo support for gnome-panel?
#
# Latest gnome-panel needed due to commit 45a4988a6
-RDEPEND=">=x11-libs/gtk+-2.20:3
+RDEPEND=">=x11-libs/gtk+-3.0.0:3
>=dev-libs/glib-2.22:2
>=gnome-base/gconf-2.8:2
>=gnome-base/gnome-panel-2.91.91
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-applets/
@ 2011-05-04 21:43 Gilles Dartiguelongue
0 siblings, 0 replies; 9+ messages in thread
From: Gilles Dartiguelongue @ 2011-05-04 21:43 UTC (permalink / raw
To: gentoo-commits
commit: 4fa9ab17c6a0b463cda14ebd8f05133d300efcdb
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed May 4 21:42:28 2011 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed May 4 21:42:34 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4fa9ab17
gnome-base/gnome-applets: drop libgweather slot
Until we decide to do a slot 3 at least.
---
gnome-base/gnome-applets/gnome-applets-9999.ebuild | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gnome-base/gnome-applets/gnome-applets-9999.ebuild b/gnome-base/gnome-applets/gnome-applets-9999.ebuild
index bb5c5b2..e44d64b 100644
--- a/gnome-base/gnome-applets/gnome-applets-9999.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-9999.ebuild
@@ -39,7 +39,7 @@ RDEPEND=">=x11-libs/gtk+-3.0.0:3
>=dev-libs/dbus-glib-0.74
>=dev-libs/libxml2-2.5.0
>=x11-themes/gnome-icon-theme-2.15.91
- >=dev-libs/libgweather-2.91.0:3
+ >=dev-libs/libgweather-2.91.0
x11-libs/libX11
gnome? (
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-applets/
@ 2011-10-19 20:41 Alexandre Restovtsev
0 siblings, 0 replies; 9+ messages in thread
From: Alexandre Restovtsev @ 2011-10-19 20:41 UTC (permalink / raw
To: gentoo-commits
commit: 54d4bfc8252e4f92d92a3fb24ca56fe097b71740
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 19 20:39:24 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Oct 19 20:39:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=54d4bfc8
gnome-base/gnome-applets: 3.2.0 → 3.2.1
Bump and change pygobject dependency to use the correct slot.
---
...ets-3.2.0.ebuild => gnome-applets-3.2.1.ebuild} | 2 +-
gnome-base/gnome-applets/gnome-applets-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnome-base/gnome-applets/gnome-applets-3.2.0.ebuild b/gnome-base/gnome-applets/gnome-applets-3.2.1.ebuild
similarity index 98%
rename from gnome-base/gnome-applets/gnome-applets-3.2.0.ebuild
rename to gnome-base/gnome-applets/gnome-applets-3.2.1.ebuild
index cbc3052..4003bf5 100644
--- a/gnome-base/gnome-applets/gnome-applets-3.2.0.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-3.2.1.ebuild
@@ -52,7 +52,7 @@ RDEPEND=">=x11-libs/gtk+-3.0.0:3
>=gnome-extra/gucharmap-2.33.0:2.90
>=gnome-base/libgtop-2.11.92
- >=dev-python/pygobject-2.26[introspection]
+ >=dev-python/pygobject-2.26:2[introspection]
gnome-base/gconf[introspection]
gnome-base/gnome-panel[introspection]
x11-libs/gdk-pixbuf[introspection]
diff --git a/gnome-base/gnome-applets/gnome-applets-9999.ebuild b/gnome-base/gnome-applets/gnome-applets-9999.ebuild
index cbc3052..4003bf5 100644
--- a/gnome-base/gnome-applets/gnome-applets-9999.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-9999.ebuild
@@ -52,7 +52,7 @@ RDEPEND=">=x11-libs/gtk+-3.0.0:3
>=gnome-extra/gucharmap-2.33.0:2.90
>=gnome-base/libgtop-2.11.92
- >=dev-python/pygobject-2.26[introspection]
+ >=dev-python/pygobject-2.26:2[introspection]
gnome-base/gconf[introspection]
gnome-base/gnome-panel[introspection]
x11-libs/gdk-pixbuf[introspection]
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-applets/
@ 2012-05-24 9:11 Alexandre Restovtsev
0 siblings, 0 replies; 9+ messages in thread
From: Alexandre Restovtsev @ 2012-05-24 9:11 UTC (permalink / raw
To: gentoo-commits
commit: d6fc064fefc2726e3801f20d24aced54950d80f5
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 08:44:12 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu May 24 08:44:12 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d6fc064f
gnome-base/gnome-applets: update
---
gnome-base/gnome-applets/gnome-applets-9999.ebuild | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/gnome-base/gnome-applets/gnome-applets-9999.ebuild b/gnome-base/gnome-applets/gnome-applets-9999.ebuild
index 82f0820..99e1323 100644
--- a/gnome-base/gnome-applets/gnome-applets-9999.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild,v 1.6 2011/02/08 19:04:13 ssuominen Exp $
+# $Header: $
EAPI="4"
GCONF_DEBUG="no"
@@ -60,12 +60,12 @@ RDEPEND=">=x11-libs/gtk+-3.0.0:3
networkmanager? ( >=net-misc/networkmanager-0.7.0 )
policykit? ( >=sys-auth/polkit-0.92 )"
DEPEND="${RDEPEND}
- >=app-text/scrollkeeper-0.1.4
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/docbook-xml-dtd:4.3
>=app-text/gnome-doc-utils-0.3.2
+ >=app-text/scrollkeeper-0.1.4
>=dev-util/intltool-0.35
dev-libs/libxslt
- app-text/docbook-xml-dtd:4.1.2
- app-text/docbook-xml-dtd:4.3
virtual/pkgconfig"
pkg_setup() {
@@ -90,9 +90,7 @@ pkg_setup() {
src_prepare() {
gnome2_src_prepare
- # disable pyc compiling
- mv py-compile py-compile.orig
- ln -s $(type -P true) py-compile
+ python_clean_py-compile_files
# Invest applet tests need gconf/proxy/...
# Note: for now, invest tests are commented out by upstream
@@ -111,7 +109,7 @@ src_install() {
gnome2_src_install
local APPLETS="accessx-status charpick cpufreq drivemount geyes
- gkb-new gweather invest-applet mini-commander
+ gweather invest-applet mini-commander
multiload null_applet stickynotes trashapplet"
# mixer is out because gnome3 uses pulseaudio
@@ -137,4 +135,4 @@ pkg_postinst() {
pkg_postrm() {
gnome2_pkg_postrm
python_mod_cleanup invest
-}
+}
\ No newline at end of file
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-applets/
@ 2012-09-21 13:55 Priit Laes
0 siblings, 0 replies; 9+ messages in thread
From: Priit Laes @ 2012-09-21 13:55 UTC (permalink / raw
To: gentoo-commits
commit: 88c0cb8d31f3476d2c17139e35a858e07ac941dc
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Sep 21 13:54:12 2012 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Sep 21 13:54:12 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=88c0cb8d
gnome-base/gnome-applets: Add 3.5.92
---
...ets-9999.ebuild => gnome-applets-3.5.92.ebuild} | 4 ++--
gnome-base/gnome-applets/gnome-applets-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnome-base/gnome-applets/gnome-applets-9999.ebuild b/gnome-base/gnome-applets/gnome-applets-3.5.92.ebuild
similarity index 99%
copy from gnome-base/gnome-applets/gnome-applets-9999.ebuild
copy to gnome-base/gnome-applets/gnome-applets-3.5.92.ebuild
index 99e1323..3564045 100644
--- a/gnome-base/gnome-applets/gnome-applets-9999.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-3.5.92.ebuild
@@ -42,7 +42,7 @@ RDEPEND=">=x11-libs/gtk+-3.0.0:3
>=dev-libs/dbus-glib-0.74
>=dev-libs/libxml2-2.5.0
>=x11-themes/gnome-icon-theme-2.15.91
- >=dev-libs/libgweather-2.91.0
+ >=dev-libs/libgweather-3.5.0
x11-libs/libX11
gnome? (
@@ -135,4 +135,4 @@ pkg_postinst() {
pkg_postrm() {
gnome2_pkg_postrm
python_mod_cleanup invest
-}
\ No newline at end of file
+}
diff --git a/gnome-base/gnome-applets/gnome-applets-9999.ebuild b/gnome-base/gnome-applets/gnome-applets-9999.ebuild
index 99e1323..3564045 100644
--- a/gnome-base/gnome-applets/gnome-applets-9999.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-9999.ebuild
@@ -42,7 +42,7 @@ RDEPEND=">=x11-libs/gtk+-3.0.0:3
>=dev-libs/dbus-glib-0.74
>=dev-libs/libxml2-2.5.0
>=x11-themes/gnome-icon-theme-2.15.91
- >=dev-libs/libgweather-2.91.0
+ >=dev-libs/libgweather-3.5.0
x11-libs/libX11
gnome? (
@@ -135,4 +135,4 @@ pkg_postinst() {
pkg_postrm() {
gnome2_pkg_postrm
python_mod_cleanup invest
-}
\ No newline at end of file
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-applets/
@ 2012-12-09 20:08 Alexandre Rostovtsev
0 siblings, 0 replies; 9+ messages in thread
From: Alexandre Rostovtsev @ 2012-12-09 20:08 UTC (permalink / raw
To: gentoo-commits
commit: 6f952c669be8286f529e458af9e1eb68c36a34e1
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 9 20:08:00 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sun Dec 9 20:08:00 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6f952c66
gnome-base/gnome-applets: 3.5.92 → 3.6.0
Upstream hasn't generated an official tarball for some reason, even though
3.6.0 has been tagged in git for months.
---
...ts-3.5.92.ebuild => gnome-applets-3.6.0.ebuild} | 2 ++
gnome-base/gnome-applets/gnome-applets-9999.ebuild | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/gnome-base/gnome-applets/gnome-applets-3.5.92.ebuild b/gnome-base/gnome-applets/gnome-applets-3.6.0.ebuild
similarity index 95%
rename from gnome-base/gnome-applets/gnome-applets-3.5.92.ebuild
rename to gnome-base/gnome-applets/gnome-applets-3.6.0.ebuild
index 3564045..9893917 100644
--- a/gnome-base/gnome-applets/gnome-applets-3.5.92.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-3.6.0.ebuild
@@ -22,6 +22,8 @@ if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+ # 3.6 is tagged in upstream git, but the tarballs have not been uploaded :/
+ SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}-unofficial.tar.xz"
fi
# null applet still needs bonobo support for gnome-panel?
diff --git a/gnome-base/gnome-applets/gnome-applets-9999.ebuild b/gnome-base/gnome-applets/gnome-applets-9999.ebuild
index 3564045..9893917 100644
--- a/gnome-base/gnome-applets/gnome-applets-9999.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-9999.ebuild
@@ -22,6 +22,8 @@ if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+ # 3.6 is tagged in upstream git, but the tarballs have not been uploaded :/
+ SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}-unofficial.tar.xz"
fi
# null applet still needs bonobo support for gnome-panel?
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-applets/
@ 2012-12-10 1:56 Alexandre Rostovtsev
0 siblings, 0 replies; 9+ messages in thread
From: Alexandre Rostovtsev @ 2012-12-10 1:56 UTC (permalink / raw
To: gentoo-commits
commit: 28e0d2b7f333845e26f365dd7abf245ebd3dc2b5
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 10 01:55:09 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Mon Dec 10 01:55:09 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=28e0d2b7
gnome-base/gnome-applets: punt silly check for pygobject:2
Sed to avoid autoreconf; patch submitted upstream at
https://bugzilla.gnome.org/show_bug.cgi?id=660550
---
.../gnome-applets/gnome-applets-3.6.0.ebuild | 15 +++++++++------
gnome-base/gnome-applets/gnome-applets-9999.ebuild | 15 +++++++++------
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/gnome-base/gnome-applets/gnome-applets-3.6.0.ebuild b/gnome-base/gnome-applets/gnome-applets-3.6.0.ebuild
index 9893917..132a845 100644
--- a/gnome-base/gnome-applets/gnome-applets-3.6.0.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-3.6.0.ebuild
@@ -53,7 +53,7 @@ RDEPEND=">=x11-libs/gtk+-3.0.0:3
>=gnome-extra/gucharmap-2.33.0:2.90
>=gnome-base/libgtop-2.11.92
- >=dev-python/pygobject-2.26:2[introspection]
+ dev-python/pygobject:3
gnome-base/gconf[introspection]
gnome-base/gnome-panel[introspection]
x11-libs/gdk-pixbuf[introspection]
@@ -71,6 +71,11 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
DOCS="AUTHORS ChangeLog NEWS README"
# We don't want HAL or battstat.
# mixer applet uses gstreamer, conflicts with the mixer provided by g-s-d
@@ -85,11 +90,9 @@ pkg_setup() {
$(use_enable networkmanager)
$(use_enable policykit polkit)"
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
+ # Remove silly check for pygobject:2
+ # https://bugzilla.gnome.org/show_bug.cgi?id=660550
+ sed -e 's/pygobject-2.0/pygobject-3.0/' -i configure || die "sed failed"
gnome2_src_prepare
python_clean_py-compile_files
diff --git a/gnome-base/gnome-applets/gnome-applets-9999.ebuild b/gnome-base/gnome-applets/gnome-applets-9999.ebuild
index 9893917..132a845 100644
--- a/gnome-base/gnome-applets/gnome-applets-9999.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-9999.ebuild
@@ -53,7 +53,7 @@ RDEPEND=">=x11-libs/gtk+-3.0.0:3
>=gnome-extra/gucharmap-2.33.0:2.90
>=gnome-base/libgtop-2.11.92
- >=dev-python/pygobject-2.26:2[introspection]
+ dev-python/pygobject:3
gnome-base/gconf[introspection]
gnome-base/gnome-panel[introspection]
x11-libs/gdk-pixbuf[introspection]
@@ -71,6 +71,11 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
DOCS="AUTHORS ChangeLog NEWS README"
# We don't want HAL or battstat.
# mixer applet uses gstreamer, conflicts with the mixer provided by g-s-d
@@ -85,11 +90,9 @@ pkg_setup() {
$(use_enable networkmanager)
$(use_enable policykit polkit)"
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
+ # Remove silly check for pygobject:2
+ # https://bugzilla.gnome.org/show_bug.cgi?id=660550
+ sed -e 's/pygobject-2.0/pygobject-3.0/' -i configure || die "sed failed"
gnome2_src_prepare
python_clean_py-compile_files
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-applets/
@ 2012-12-24 17:19 Gilles Dartiguelongue
0 siblings, 0 replies; 9+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-24 17:19 UTC (permalink / raw
To: gentoo-commits
commit: d5d6672bd98f64d1815ad64fdead73b67b3676c4
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 24 17:16:14 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 24 17:19:19 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d5d6672b
gnome-base/gnome-applets: moved to gx86
* Sync live ebuild with gx86 changes.
* Add metadata.xml.
---
.../gnome-applets/gnome-applets-3.6.0.ebuild | 143 --------------------
gnome-base/gnome-applets/gnome-applets-9999.ebuild | 70 ++++------
gnome-base/gnome-applets/metadata.xml | 8 +
3 files changed, 33 insertions(+), 188 deletions(-)
diff --git a/gnome-base/gnome-applets/gnome-applets-3.6.0.ebuild b/gnome-base/gnome-applets/gnome-applets-3.6.0.ebuild
deleted file mode 100644
index 132a845..0000000
--- a/gnome-base/gnome-applets/gnome-applets-3.6.0.ebuild
+++ /dev/null
@@ -1,143 +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="no" # bug 340725, no other la files
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils gnome2 python
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
-
-DESCRIPTION="Applets for the GNOME Desktop and Panel"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-IUSE="gnome ipv6 networkmanager policykit"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
- # 3.6 is tagged in upstream git, but the tarballs have not been uploaded :/
- SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}-unofficial.tar.xz"
-fi
-
-# null applet still needs bonobo support for gnome-panel?
-#
-# Latest gnome-panel needed due to commit 45a4988a6
-# atk, cairo, pango used in multiple applets
-RDEPEND=">=x11-libs/gtk+-3.0.0:3
- dev-libs/atk
- >=dev-libs/glib-2.22:2
- >=gnome-base/gconf-2.8:2
- >=gnome-base/gnome-panel-2.91.91
- x11-libs/cairo
- >=x11-libs/libxklavier-4.0
- >=x11-libs/libwnck-2.91.0:3
- >=x11-libs/libnotify-0.7
- x11-libs/pango
- >=sys-apps/dbus-1.1.2
- >=dev-libs/dbus-glib-0.74
- >=dev-libs/libxml2-2.5.0
- >=x11-themes/gnome-icon-theme-2.15.91
- >=dev-libs/libgweather-3.5.0
- x11-libs/libX11
-
- gnome? (
- gnome-base/gnome-settings-daemon
-
- >=gnome-extra/gucharmap-2.33.0:2.90
- >=gnome-base/libgtop-2.11.92
-
- dev-python/pygobject:3
- gnome-base/gconf[introspection]
- gnome-base/gnome-panel[introspection]
- x11-libs/gdk-pixbuf[introspection]
- x11-libs/gtk+:3[introspection]
- x11-libs/pango[introspection] )
- networkmanager? ( >=net-misc/networkmanager-0.7.0 )
- policykit? ( >=sys-auth/polkit-0.92 )"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/docbook-xml-dtd:4.3
- >=app-text/gnome-doc-utils-0.3.2
- >=app-text/scrollkeeper-0.1.4
- >=dev-util/intltool-0.35
- dev-libs/libxslt
- virtual/pkgconfig"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- DOCS="AUTHORS ChangeLog NEWS README"
- # We don't want HAL or battstat.
- # mixer applet uses gstreamer, conflicts with the mixer provided by g-s-d
- # GNOME 3 has a hard-dependency on pulseaudio, so gstmixer applet is useless
- G2CONF="${G2CONF}
- --disable-scrollkeeper
- --disable-schemas-install
- --without-hal
- --disable-battstat
- --disable-mixer-applet
- $(use_enable ipv6)
- $(use_enable networkmanager)
- $(use_enable policykit polkit)"
-
- # Remove silly check for pygobject:2
- # https://bugzilla.gnome.org/show_bug.cgi?id=660550
- sed -e 's/pygobject-2.0/pygobject-3.0/' -i configure || die "sed failed"
- gnome2_src_prepare
-
- python_clean_py-compile_files
-
- # Invest applet tests need gconf/proxy/...
- # Note: for now, invest tests are commented out by upstream
- #sed 's/^TESTS.*/TESTS=/g' -i invest-applet/invest/Makefile.am \
- # invest-applet/invest/Makefile.in || die "disabling invest tests failed"
-
- python_convert_shebangs -r 2 .
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- emake check
-}
-
-src_install() {
- gnome2_src_install
-
- local APPLETS="accessx-status charpick cpufreq drivemount geyes
- gweather invest-applet mini-commander
- multiload null_applet stickynotes trashapplet"
-
- # mixer is out because gnome3 uses pulseaudio
- # modemlights is out because it needs system-tools-backends-1
- # battstat is disabled because we don't want HAL anywhere
-
- for applet in ${APPLETS} ; do
- docinto ${applet}
-
- for d in AUTHORS ChangeLog NEWS README README.themes TODO ; do
- [ -s ${applet}/${d} ] && dodoc ${applet}/${d}
- done
- done
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- # check for new python modules on bumps
- python_mod_optimize invest
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
- python_mod_cleanup invest
-}
diff --git a/gnome-base/gnome-applets/gnome-applets-9999.ebuild b/gnome-base/gnome-applets/gnome-applets-9999.ebuild
index 132a845..1bebf68 100644
--- a/gnome-base/gnome-applets/gnome-applets-9999.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-9999.ebuild
@@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
+EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="no" # bug 340725, no other la files
-PYTHON_DEPEND="2:2.5"
+PYTHON_COMPAT=( python2_{6,7} )
-inherit eutils gnome2 python
+inherit eutils gnome2 python-single-r1
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -30,21 +30,22 @@ fi
#
# Latest gnome-panel needed due to commit 45a4988a6
# atk, cairo, pango used in multiple applets
-RDEPEND=">=x11-libs/gtk+-3.0.0:3
+RDEPEND="
+ >=x11-libs/gtk+-3:3
dev-libs/atk
>=dev-libs/glib-2.22:2
>=gnome-base/gconf-2.8:2
>=gnome-base/gnome-panel-2.91.91
x11-libs/cairo
- >=x11-libs/libxklavier-4.0
+ >=x11-libs/libxklavier-4
>=x11-libs/libwnck-2.91.0:3
- >=x11-libs/libnotify-0.7
+ >=x11-libs/libnotify-0.7:=
x11-libs/pango
>=sys-apps/dbus-1.1.2
>=dev-libs/dbus-glib-0.74
- >=dev-libs/libxml2-2.5.0
+ >=dev-libs/libxml2-2.5
>=x11-themes/gnome-icon-theme-2.15.91
- >=dev-libs/libgweather-3.5.0
+ >=dev-libs/libgweather-3.5:=
x11-libs/libX11
gnome? (
@@ -53,14 +54,16 @@ RDEPEND=">=x11-libs/gtk+-3.0.0:3
>=gnome-extra/gucharmap-2.33.0:2.90
>=gnome-base/libgtop-2.11.92
- dev-python/pygobject:3
+ ${PYTHON_DEPS}
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
gnome-base/gconf[introspection]
gnome-base/gnome-panel[introspection]
x11-libs/gdk-pixbuf[introspection]
x11-libs/gtk+:3[introspection]
x11-libs/pango[introspection] )
networkmanager? ( >=net-misc/networkmanager-0.7.0 )
- policykit? ( >=sys-auth/polkit-0.92 )"
+ policykit? ( >=sys-auth/polkit-0.92 )
+"
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.1.2
app-text/docbook-xml-dtd:4.3
@@ -68,49 +71,38 @@ DEPEND="${RDEPEND}
>=app-text/scrollkeeper-0.1.4
>=dev-util/intltool-0.35
dev-libs/libxslt
- virtual/pkgconfig"
+ virtual/pkgconfig
+"
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
+src_prepare() {
+ # Remove silly check for pygobject:2
+ # https://bugzilla.gnome.org/show_bug.cgi?id=660550
+ sed -e 's/pygobject-2.0/pygobject-3.0/' -i configure || die "sed failed"
+ gnome2_src_prepare
}
-src_prepare() {
- DOCS="AUTHORS ChangeLog NEWS README"
+src_configure() {
# We don't want HAL or battstat.
# mixer applet uses gstreamer, conflicts with the mixer provided by g-s-d
# GNOME 3 has a hard-dependency on pulseaudio, so gstmixer applet is useless
G2CONF="${G2CONF}
- --disable-scrollkeeper
- --disable-schemas-install
--without-hal
--disable-battstat
--disable-mixer-applet
$(use_enable ipv6)
$(use_enable networkmanager)
$(use_enable policykit polkit)"
-
- # Remove silly check for pygobject:2
- # https://bugzilla.gnome.org/show_bug.cgi?id=660550
- sed -e 's/pygobject-2.0/pygobject-3.0/' -i configure || die "sed failed"
- gnome2_src_prepare
-
- python_clean_py-compile_files
-
- # Invest applet tests need gconf/proxy/...
- # Note: for now, invest tests are commented out by upstream
- #sed 's/^TESTS.*/TESTS=/g' -i invest-applet/invest/Makefile.am \
- # invest-applet/invest/Makefile.in || die "disabling invest tests failed"
-
- python_convert_shebangs -r 2 .
+ gnome2_src_configure
}
src_test() {
unset DBUS_SESSION_BUS_ADDRESS
- emake check
+ default
}
src_install() {
+ python_fix_shebang invest-applet
+
gnome2_src_install
local APPLETS="accessx-status charpick cpufreq drivemount geyes
@@ -129,15 +121,3 @@ src_install() {
done
done
}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- # check for new python modules on bumps
- python_mod_optimize invest
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
- python_mod_cleanup invest
-}
diff --git a/gnome-base/gnome-applets/metadata.xml b/gnome-base/gnome-applets/metadata.xml
new file mode 100644
index 0000000..d66d25f
--- /dev/null
+++ b/gnome-base/gnome-applets/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <use>
+ <flag name="cpufreq">Build cpu frequency scaling monitor applet</flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-12-24 17:20 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-09 20:08 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-applets/ Alexandre Rostovtsev
-- strict thread matches above, loose matches on Subject: below --
2012-12-24 17:19 Gilles Dartiguelongue
2012-12-10 1:56 Alexandre Rostovtsev
2012-09-21 13:55 Priit Laes
2012-05-24 9:11 Alexandre Restovtsev
2011-10-19 20:41 Alexandre Restovtsev
2011-05-04 21:43 Gilles Dartiguelongue
2011-03-05 19:59 Nirbheek Chauhan
2011-03-04 14:57 Nirbheek Chauhan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox