From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BCCB21381F3 for ; Mon, 24 Dec 2012 17:20:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7AC3A21C146; Mon, 24 Dec 2012 17:19:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ECC4021C146 for ; Mon, 24 Dec 2012 17:19:29 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D868E33DA6C for ; Mon, 24 Dec 2012 17:19:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 0E3BFE543C for ; Mon, 24 Dec 2012 17:19:26 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1356369559.d5d6672bd98f64d1815ad64fdead73b67b3676c4.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-applets/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-applets/gnome-applets-3.6.0.ebuild gnome-base/gnome-applets/gnome-applets-9999.ebuild gnome-base/gnome-applets/metadata.xml X-VCS-Directories: gnome-base/gnome-applets/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: d5d6672bd98f64d1815ad64fdead73b67b3676c4 X-VCS-Branch: master Date: Mon, 24 Dec 2012 17:19:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 17efd0e6-97c2-46c3-a8a4-7acd69a715c2 X-Archives-Hash: 59acadd006643d6aaa67c9479944a2f1 commit: d5d6672bd98f64d1815ad64fdead73b67b3676c4 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Mon Dec 24 17:16:14 2012 +0000 Commit: Gilles Dartiguelongue gentoo 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 @@ + + + + gnome + + Build cpu frequency scaling monitor applet + +