From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qld2e-0002rG-Cx for garchives@archives.gentoo.org; Tue, 26 Jul 2011 08:31:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E51E21C2D0; Tue, 26 Jul 2011 08:29:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2E27121C2D0 for ; Tue, 26 Jul 2011 08:29:36 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ABA762AC00B for ; Tue, 26 Jul 2011 08:29:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1D3CE80042 for ; Tue, 26 Jul 2011 08:29:35 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <13fa500e0156a503c292cb5cbfc0cff603007367.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-applets/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-applets/gnome-applets-3.1.4.ebuild gnome-base/gnome-applets/gnome-applets-9999.ebuild X-VCS-Directories: gnome-base/gnome-applets/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 13fa500e0156a503c292cb5cbfc0cff603007367 Date: Tue, 26 Jul 2011 08:29:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: ab5c45bd666693221e44bb735ea2a3b2 commit: 13fa500e0156a503c292cb5cbfc0cff603007367 Author: Alexandre Rostovtsev gmail com> AuthorDate: Tue Jul 26 05:22:23 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Tue Jul 26 05:33:52 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D13fa500e 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 =3D> 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-b= ase/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-applet= s-2.32.1.1.ebuild,v 1.6 2011/02/08 19:04:13 ssuominen Exp $ =20 EAPI=3D"3" +GNOME_TARBALL_SUFFIX=3D"xz" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"no" # bug 340725, no other la files -#PYTHON_DEPEND=3D"2:2.4" +PYTHON_DEPEND=3D"2:2.4" =20 -inherit eutils gnome2 #python +inherit eutils gnome2 python if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -17,14 +18,13 @@ HOMEPAGE=3D"http://www.gnome.org/" =20 LICENSE=3D"GPL-2 FDL-1.1 LGPL-2" SLOT=3D"0" -IUSE=3D"gnome gstreamer ipv6 networkmanager policykit" +IUSE=3D"gnome ipv6 networkmanager policykit" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd = ~x86-freebsd ~amd64-linux ~x86-linux" fi =20 -# 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=3D">=3Dx11-libs/gtk+-3.0.0:3 =20 gnome? ( gnome-base/gnome-settings-daemon - gnome-base/libgnome =20 >=3Dgnome-extra/gucharmap-2.33.0:2.90 - >=3Dgnome-base/libgtop-2.11.92 ) - gstreamer? ( - >=3Dmedia-libs/gstreamer-0.10.2 - >=3Dmedia-libs/gst-plugins-base-0.10.14 - || ( - >=3Dmedia-plugins/gst-plugins-alsa-0.10.14 - >=3Dmedia-plugins/gst-plugins-oss-0.10.14 ) ) + >=3Dgnome-base/libgtop-2.11.92 + + >=3Ddev-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? ( >=3Dnet-misc/networkmanager-0.7.0 ) policykit? ( >=3Dsys-auth/polkit-0.92 )" -# >=3Ddev-python/pygobject-2.6 -# >=3Ddev-python/pygtk-2.6 -# >=3Ddev-python/gconf-python-2.10 -# >=3Ddev-python/gnome-applets-python-2.10 DEPEND=3D"${RDEPEND} >=3Dapp-text/scrollkeeper-0.1.4 >=3Dapp-text/gnome-doc-utils-0.3.2 >=3Ddev-util/pkgconfig-0.19 >=3Ddev-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" =20 pkg_setup() { DOCS=3D"AUTHORS ChangeLog NEWS README" @@ -83,7 +80,7 @@ pkg_setup() { $(use_enable networkmanager) $(use_enable policykit polkit)" =20 - #python_set_active_version 2 + python_set_active_version 2 } =20 src_prepare() { @@ -94,10 +91,11 @@ src_prepare() { ln -s $(type -P true) py-compile =20 # Invest applet tests need gconf/proxy/... + # Note: for now, invest tests are commented out by upstream #sed 's/^TESTS.*/TESTS=3D/g' -i invest-applet/invest/Makefile.am \ # invest-applet/invest/Makefile.in || die "disabling invest tests faile= d" =20 - #python_convert_shebangs -r 2 . + python_convert_shebangs -r 2 . } =20 src_test() { @@ -109,11 +107,11 @@ src_install() { gnome2_src_install =20 local APPLETS=3D"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" =20 + # 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 =20 for applet in ${APPLETS} ; do @@ -129,10 +127,10 @@ pkg_postinst() { gnome2_pkg_postinst =20 # check for new python modules on bumps - #python_mod_optimize invest + python_mod_optimize invest } =20 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-b= ase/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-applet= s-2.32.1.1.ebuild,v 1.6 2011/02/08 19:04:13 ssuominen Exp $ =20 EAPI=3D"3" +GNOME_TARBALL_SUFFIX=3D"xz" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"no" # bug 340725, no other la files -#PYTHON_DEPEND=3D"2:2.4" +PYTHON_DEPEND=3D"2:2.4" =20 -inherit eutils gnome2 #python +inherit eutils gnome2 python if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -17,14 +18,13 @@ HOMEPAGE=3D"http://www.gnome.org/" =20 LICENSE=3D"GPL-2 FDL-1.1 LGPL-2" SLOT=3D"0" -IUSE=3D"gnome gstreamer ipv6 networkmanager policykit" +IUSE=3D"gnome ipv6 networkmanager policykit" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd = ~x86-freebsd ~amd64-linux ~x86-linux" fi =20 -# 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=3D">=3Dx11-libs/gtk+-3.0.0:3 =20 gnome? ( gnome-base/gnome-settings-daemon - gnome-base/libgnome =20 >=3Dgnome-extra/gucharmap-2.33.0:2.90 - >=3Dgnome-base/libgtop-2.11.92 ) - gstreamer? ( - >=3Dmedia-libs/gstreamer-0.10.2 - >=3Dmedia-libs/gst-plugins-base-0.10.14 - || ( - >=3Dmedia-plugins/gst-plugins-alsa-0.10.14 - >=3Dmedia-plugins/gst-plugins-oss-0.10.14 ) ) + >=3Dgnome-base/libgtop-2.11.92 + + >=3Ddev-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? ( >=3Dnet-misc/networkmanager-0.7.0 ) policykit? ( >=3Dsys-auth/polkit-0.92 )" -# >=3Ddev-python/pygobject-2.6 -# >=3Ddev-python/pygtk-2.6 -# >=3Ddev-python/gconf-python-2.10 -# >=3Ddev-python/gnome-applets-python-2.10 DEPEND=3D"${RDEPEND} >=3Dapp-text/scrollkeeper-0.1.4 >=3Dapp-text/gnome-doc-utils-0.3.2 >=3Ddev-util/pkgconfig-0.19 >=3Ddev-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" =20 pkg_setup() { DOCS=3D"AUTHORS ChangeLog NEWS README" @@ -83,7 +80,7 @@ pkg_setup() { $(use_enable networkmanager) $(use_enable policykit polkit)" =20 - #python_set_active_version 2 + python_set_active_version 2 } =20 src_prepare() { @@ -94,10 +91,11 @@ src_prepare() { ln -s $(type -P true) py-compile =20 # Invest applet tests need gconf/proxy/... + # Note: for now, invest tests are commented out by upstream #sed 's/^TESTS.*/TESTS=3D/g' -i invest-applet/invest/Makefile.am \ # invest-applet/invest/Makefile.in || die "disabling invest tests faile= d" =20 - #python_convert_shebangs -r 2 . + python_convert_shebangs -r 2 . } =20 src_test() { @@ -109,11 +107,11 @@ src_install() { gnome2_src_install =20 local APPLETS=3D"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" =20 + # 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 =20 for applet in ${APPLETS} ; do @@ -129,10 +127,10 @@ pkg_postinst() { gnome2_pkg_postinst =20 # check for new python modules on bumps - #python_mod_optimize invest + python_mod_optimize invest } =20 pkg_postrm() { gnome2_pkg_postrm - #python_mod_cleanup invest + python_mod_cleanup invest }