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 71E7D138010 for ; Sat, 22 Sep 2012 15:55:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 252DFE04D2; Sat, 22 Sep 2012 15:54:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D8A28E04D2 for ; Sat, 22 Sep 2012 15:54:01 +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 1E93233D31C for ; Sat, 22 Sep 2012 15:54:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D6497E5448 for ; Sat, 22 Sep 2012 15:53:59 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <1348329200.fc70e5725d385c7ebc6f38fe5cca184df15eefbf.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: sys-apps/gnome-disk-utility/ X-VCS-Repository: proj/gnome X-VCS-Files: sys-apps/gnome-disk-utility/gnome-disk-utility-3.6.0.ebuild sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild X-VCS-Directories: sys-apps/gnome-disk-utility/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: fc70e5725d385c7ebc6f38fe5cca184df15eefbf X-VCS-Branch: master Date: Sat, 22 Sep 2012 15:53:59 +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: a2b42711-d48c-4ab7-81d8-e71c0b299291 X-Archives-Hash: 15a396cace63e5ceea58ffc449ac71d2 commit: fc70e5725d385c7ebc6f38fe5cca184df15eefbf Author: Nirbheek Chauhan gentoo org> AuthorDate: Fri Sep 21 04:42:25 2012 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Sat Sep 22 15:53:20 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fc70e572 Add sys-apps/gnome-disk-utility-3.6.0 --- .../gnome-disk-utility-3.6.0.ebuild | 45 +++++++++++ .../gnome-disk-utility-9999.ebuild | 82 ++++++-------------- 2 files changed, 68 insertions(+), 59 deletions(-) diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.6.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.6.0.ebuild new file mode 100644 index 0000000..07cbfd8 --- /dev/null +++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.6.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-3.4.1.ebuild,v 1.4 2012/06/15 06:40:33 mr_bones_ Exp $ + +EAPI="4" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit gnome2 +if [[ ${PV} = 9999 ]]; then + inherit gnome2-live +fi + +DESCRIPTION="Disk Utility for GNOME using udisks" +HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility" + +LICENSE="LGPL-2" +SLOT="0" +IUSE="fat" +if [[ ${PV} = 9999 ]]; then + KEYWORDS="" +else + KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~x86" +fi + +COMMON_DEPEND=" + >=dev-libs/glib-2.31:2 + >=sys-fs/udisks-1.99.0:2 + >=x11-libs/gtk+-3.5.8:3 + >=app-crypt/libsecret-0.7 + dev-libs/libpwquality" +RDEPEND="${COMMON_DEPEND} + >=x11-themes/gnome-icon-theme-symbolic-2.91 + fat? ( sys-fs/dosfstools )" +DEPEND="${COMMON_DEPEND} + >=dev-util/intltool-0.50 + dev-libs/libxslt + virtual/pkgconfig" + +pkg_setup() { + G2CONF="${G2CONF} + --disable-libsystemd-login + --disable-maintainer-mode + --disable-schemas-compile" +} diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild index 976575e..07cbfd8 100644 --- a/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild +++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild @@ -1,81 +1,45 @@ -# 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/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.0.ebuild,v 1.3 2011/01/07 21:04:46 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-3.4.1.ebuild,v 1.4 2012/06/15 06:40:33 mr_bones_ Exp $ EAPI="4" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" -inherit autotools eutils gnome2 +inherit gnome2 if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi -DESCRIPTION="Disk Utility for GNOME using devicekit-disks" +DESCRIPTION="Disk Utility for GNOME using udisks" HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility" -LICENSE="LGPL-2.1" +LICENSE="LGPL-2" SLOT="0" -IUSE="avahi doc fat gnome-keyring nautilus remote-access" +IUSE="fat" if [[ ${PV} = 9999 ]]; then KEYWORDS="" else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~x86" fi -CDEPEND=" - >=dev-libs/glib-2.22:2 - >=dev-libs/dbus-glib-0.74 - >=dev-libs/libunique-2.90.1:3 - >=x11-libs/gtk+-2.90.7:3 - =sys-fs/udisks-1.0*[remote-access?] - >=dev-libs/libatasmart-0.14 - >=x11-libs/libnotify-0.6.1 - - avahi? ( >=net-dns/avahi-0.6.25[gtk3] ) - gnome-keyring? ( || ( - gnome-base/libgnome-keyring - =gnome-base/nautilus-2.91.0 ) -" -RDEPEND="${CDEPEND} - x11-misc/xdg-utils - fat? ( sys-fs/dosfstools ) - !!sys-apps/udisks" -DEPEND="${CDEPEND} - sys-devel/gettext - gnome-base/gnome-common - app-text/docbook-xml-dtd:4.1.2 - app-text/scrollkeeper - app-text/gnome-doc-utils - - >=dev-util/intltool-0.35 - virtual/pkgconfig - >=dev-util/gtk-doc-am-1.13 - - doc? ( >=dev-util/gtk-doc-1.3 )" +COMMON_DEPEND=" + >=dev-libs/glib-2.31:2 + >=sys-fs/udisks-1.99.0:2 + >=x11-libs/gtk+-3.5.8:3 + >=app-crypt/libsecret-0.7 + dev-libs/libpwquality" +RDEPEND="${COMMON_DEPEND} + >=x11-themes/gnome-icon-theme-symbolic-2.91 + fat? ( sys-fs/dosfstools )" +DEPEND="${COMMON_DEPEND} + >=dev-util/intltool-0.50 + dev-libs/libxslt + virtual/pkgconfig" pkg_setup() { G2CONF="${G2CONF} - --disable-static - $(use_enable avahi avahi-ui) - $(use_enable nautilus) - $(use_enable remote-access) - $(use_enable gnome-keyring)" - DOCS="AUTHORS NEWS README TODO" -} - -src_prepare() { - sed -e '/printf/s:nautilus:xdg-open:' \ - -i src/palimpsest/gdu-section-volumes.c || die "#350919" - - # Keep avahi optional, upstream bug #631986 - epatch "${FILESDIR}/${PN}-2.91.6-optional-avahi.patch" - - if [[ ${PV} != 9999 ]]; then - intltoolize --force --copy --automake || die - eautoreconf - fi - - gnome2_src_prepare + --disable-libsystemd-login + --disable-maintainer-mode + --disable-schemas-compile" }