public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-applets/
@ 2011-07-26  8:29 Alexandre Restovtsev
  0 siblings, 0 replies; 4+ messages in thread
From: Alexandre Restovtsev @ 2011-07-26  8:29 UTC (permalink / raw
  To: gentoo-commits

commit:     13fa500e0156a503c292cb5cbfc0cff603007367
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Jul 26 05:22:23 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Jul 26 05:33:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=13fa500e

gnome-base/gnome-applets: add 3.1.4

Add gnome-3.1.x version. Update dependencies. Remove gstreamer
mixer support since gnome3 uses pulseuadio. Investment applet uses
gtk3 now, so re-enable python. Gswitchit is gone.

---
 ...lets-9999.ebuild => gnome-applets-3.1.4.ebuild} |   46 +++++++++----------
 gnome-base/gnome-applets/gnome-applets-9999.ebuild |   46 +++++++++----------
 2 files changed, 44 insertions(+), 48 deletions(-)

diff --git a/gnome-base/gnome-applets/gnome-applets-9999.ebuild b/gnome-base/gnome-applets/gnome-applets-3.1.4.ebuild
similarity index 76%
copy from gnome-base/gnome-applets/gnome-applets-9999.ebuild
copy to gnome-base/gnome-applets/gnome-applets-3.1.4.ebuild
index 0712c20..c18413c 100644
--- a/gnome-base/gnome-applets/gnome-applets-9999.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-3.1.4.ebuild
@@ -3,11 +3,12 @@
 # $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 $
 
 EAPI="3"
+GNOME_TARBALL_SUFFIX="xz"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="no" # bug 340725, no other la files
-#PYTHON_DEPEND="2:2.4"
+PYTHON_DEPEND="2:2.4"
 
-inherit eutils gnome2 #python
+inherit eutils gnome2 python
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -17,14 +18,13 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
 SLOT="0"
-IUSE="gnome gstreamer ipv6 networkmanager policykit"
+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"
 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
@@ -44,29 +44,26 @@ RDEPEND=">=x11-libs/gtk+-3.0.0:3
 
 	gnome?	(
 		gnome-base/gnome-settings-daemon
-		gnome-base/libgnome
 
 		>=gnome-extra/gucharmap-2.33.0:2.90
-		>=gnome-base/libgtop-2.11.92 )
-	gstreamer?	(
-		>=media-libs/gstreamer-0.10.2
-		>=media-libs/gst-plugins-base-0.10.14
-		|| (
-			>=media-plugins/gst-plugins-alsa-0.10.14
-			>=media-plugins/gst-plugins-oss-0.10.14 ) )
+		>=gnome-base/libgtop-2.11.92
+
+		>=dev-python/pygobject-2.26[introspection]
+		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 )"
-#		>=dev-python/pygobject-2.6
-#		>=dev-python/pygtk-2.6
-#		>=dev-python/gconf-python-2.10
-#		>=dev-python/gnome-applets-python-2.10
 DEPEND="${RDEPEND}
 	>=app-text/scrollkeeper-0.1.4
 	>=app-text/gnome-doc-utils-0.3.2
 	>=dev-util/pkgconfig-0.19
 	>=dev-util/intltool-0.35
 	dev-libs/libxslt
-	~app-text/docbook-xml-dtd-4.3"
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xml-dtd:4.3"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README"
@@ -83,7 +80,7 @@ pkg_setup() {
 		$(use_enable networkmanager)
 		$(use_enable policykit polkit)"
 
-	#python_set_active_version 2
+	python_set_active_version 2
 }
 
 src_prepare() {
@@ -94,10 +91,11 @@ src_prepare() {
 	ln -s $(type -P true) py-compile
 
 	# 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 .
+	python_convert_shebangs -r 2 .
 }
 
 src_test() {
@@ -109,11 +107,11 @@ src_install() {
 	gnome2_src_install
 
 	local APPLETS="accessx-status charpick cpufreq drivemount geyes
-			 gkb-new gswitchit gweather mini-commander
-			 mixer multiload null_applet stickynotes trashapplet"
+			 gkb-new 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
-	# invest-applet not ported to GNOME 3, so disabled by upstream
 	# battstat is disabled because we don't want HAL anywhere
 
 	for applet in ${APPLETS} ; do
@@ -129,10 +127,10 @@ pkg_postinst() {
 	gnome2_pkg_postinst
 
 	# check for new python modules on bumps
-	#python_mod_optimize invest
+	python_mod_optimize invest
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	#python_mod_cleanup invest
+	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 0712c20..c18413c 100644
--- a/gnome-base/gnome-applets/gnome-applets-9999.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-9999.ebuild
@@ -3,11 +3,12 @@
 # $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 $
 
 EAPI="3"
+GNOME_TARBALL_SUFFIX="xz"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="no" # bug 340725, no other la files
-#PYTHON_DEPEND="2:2.4"
+PYTHON_DEPEND="2:2.4"
 
-inherit eutils gnome2 #python
+inherit eutils gnome2 python
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -17,14 +18,13 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
 SLOT="0"
-IUSE="gnome gstreamer ipv6 networkmanager policykit"
+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"
 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
@@ -44,29 +44,26 @@ RDEPEND=">=x11-libs/gtk+-3.0.0:3
 
 	gnome?	(
 		gnome-base/gnome-settings-daemon
-		gnome-base/libgnome
 
 		>=gnome-extra/gucharmap-2.33.0:2.90
-		>=gnome-base/libgtop-2.11.92 )
-	gstreamer?	(
-		>=media-libs/gstreamer-0.10.2
-		>=media-libs/gst-plugins-base-0.10.14
-		|| (
-			>=media-plugins/gst-plugins-alsa-0.10.14
-			>=media-plugins/gst-plugins-oss-0.10.14 ) )
+		>=gnome-base/libgtop-2.11.92
+
+		>=dev-python/pygobject-2.26[introspection]
+		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 )"
-#		>=dev-python/pygobject-2.6
-#		>=dev-python/pygtk-2.6
-#		>=dev-python/gconf-python-2.10
-#		>=dev-python/gnome-applets-python-2.10
 DEPEND="${RDEPEND}
 	>=app-text/scrollkeeper-0.1.4
 	>=app-text/gnome-doc-utils-0.3.2
 	>=dev-util/pkgconfig-0.19
 	>=dev-util/intltool-0.35
 	dev-libs/libxslt
-	~app-text/docbook-xml-dtd-4.3"
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xml-dtd:4.3"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README"
@@ -83,7 +80,7 @@ pkg_setup() {
 		$(use_enable networkmanager)
 		$(use_enable policykit polkit)"
 
-	#python_set_active_version 2
+	python_set_active_version 2
 }
 
 src_prepare() {
@@ -94,10 +91,11 @@ src_prepare() {
 	ln -s $(type -P true) py-compile
 
 	# 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 .
+	python_convert_shebangs -r 2 .
 }
 
 src_test() {
@@ -109,11 +107,11 @@ src_install() {
 	gnome2_src_install
 
 	local APPLETS="accessx-status charpick cpufreq drivemount geyes
-			 gkb-new gswitchit gweather mini-commander
-			 mixer multiload null_applet stickynotes trashapplet"
+			 gkb-new 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
-	# invest-applet not ported to GNOME 3, so disabled by upstream
 	# battstat is disabled because we don't want HAL anywhere
 
 	for applet in ${APPLETS} ; do
@@ -129,10 +127,10 @@ pkg_postinst() {
 	gnome2_pkg_postinst
 
 	# check for new python modules on bumps
-	#python_mod_optimize invest
+	python_mod_optimize invest
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	#python_mod_cleanup invest
+	python_mod_cleanup invest
 }



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-applets/
@ 2011-08-15  1:07 Alexandre Restovtsev
  0 siblings, 0 replies; 4+ messages in thread
From: Alexandre Restovtsev @ 2011-08-15  1:07 UTC (permalink / raw
  To: gentoo-commits

commit:     365100f6677fa7a1118b0297da40cf5c14406611
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sun Aug 14 21:28:42 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Aug 14 21:28:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=365100f6

gnome-base/gnome-applets: 3.1.4 → 3.1.5

Version bump, translation updates only.

---
 ...ets-3.1.4.ebuild => gnome-applets-3.1.5.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-applets/gnome-applets-3.1.4.ebuild b/gnome-base/gnome-applets/gnome-applets-3.1.5.ebuild
similarity index 100%
rename from gnome-base/gnome-applets/gnome-applets-3.1.4.ebuild
rename to gnome-base/gnome-applets/gnome-applets-3.1.5.ebuild



^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-applets/
@ 2011-08-30  9:21 Alexandre Restovtsev
  0 siblings, 0 replies; 4+ messages in thread
From: Alexandre Restovtsev @ 2011-08-30  9:21 UTC (permalink / raw
  To: gentoo-commits

commit:     4a4432217acc8fe007e711d7bdf0275a311f6086
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Aug 30 08:56:58 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Aug 30 08:56:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4a443221

gnome-base/gnome-applets: 3.1.5 → 3.1.90

Version bump, translation updates only. Add missing cairo, pango, atk
dependencies.

---
 ...ts-3.1.5.ebuild => gnome-applets-3.1.90.ebuild} |    4 ++++
 gnome-base/gnome-applets/gnome-applets-9999.ebuild |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-applets/gnome-applets-3.1.5.ebuild b/gnome-base/gnome-applets/gnome-applets-3.1.90.ebuild
similarity index 97%
rename from gnome-base/gnome-applets/gnome-applets-3.1.5.ebuild
rename to gnome-base/gnome-applets/gnome-applets-3.1.90.ebuild
index c18413c..cbc3052 100644
--- a/gnome-base/gnome-applets/gnome-applets-3.1.5.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-3.1.90.ebuild
@@ -28,13 +28,17 @@ 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

diff --git a/gnome-base/gnome-applets/gnome-applets-9999.ebuild b/gnome-base/gnome-applets/gnome-applets-9999.ebuild
index c18413c..cbc3052 100644
--- a/gnome-base/gnome-applets/gnome-applets-9999.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-9999.ebuild
@@ -28,13 +28,17 @@ 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



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-applets/
@ 2011-09-28 22:21 Alexandre Restovtsev
  0 siblings, 0 replies; 4+ messages in thread
From: Alexandre Restovtsev @ 2011-09-28 22:21 UTC (permalink / raw
  To: gentoo-commits

commit:     b0bb75cc86da734ae05d6d029364ed28d4e050ae
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Sep 28 21:35:14 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Sep 28 21:35:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b0bb75cc

gnome-base/gnome-applets: 3.1.90 → 3.2.0

Bump with a build fix.

---
 ...ts-3.1.90.ebuild => gnome-applets-3.2.0.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-applets/gnome-applets-3.1.90.ebuild b/gnome-base/gnome-applets/gnome-applets-3.2.0.ebuild
similarity index 100%
rename from gnome-base/gnome-applets/gnome-applets-3.1.90.ebuild
rename to gnome-base/gnome-applets/gnome-applets-3.2.0.ebuild



^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2011-09-28 22:21 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-15  1:07 [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-applets/ Alexandre Restovtsev
  -- strict thread matches above, loose matches on Subject: below --
2011-09-28 22:21 Alexandre Restovtsev
2011-08-30  9:21 Alexandre Restovtsev
2011-07-26  8:29 Alexandre Restovtsev

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox