From: "Gilles Dartiguelongue" <eva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gvfs/
Date: Sun, 10 Apr 2011 18:04:47 +0000 (UTC) [thread overview]
Message-ID: <4be59f2f12cdd39ef8f1e9de0645089d39d9e010.eva@gentoo> (raw)
commit: 4be59f2f12cdd39ef8f1e9de0645089d39d9e010
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 8 11:45:33 2011 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 17:58:43 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4be59f2f
gnome-base/gvfs: QAed
* Sync with gentoo-x86
* Bump to EAPI 3
(Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key C6085806)
---
gnome-base/gvfs/gvfs-1.8.0.ebuild | 24 ++++++++++--------------
gnome-base/gvfs/gvfs-9999.ebuild | 24 ++++++++++--------------
2 files changed, 20 insertions(+), 28 deletions(-)
diff --git a/gnome-base/gvfs/gvfs-1.8.0.ebuild b/gnome-base/gvfs/gvfs-1.8.0.ebuild
index 22b1e90..9f3c6cc 100644
--- a/gnome-base/gvfs/gvfs-1.8.0.ebuild
+++ b/gnome-base/gvfs/gvfs-1.8.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.6.4-r1.ebuild,v 1.1 2010/10/05 08:49:12 pacho Exp $
-EAPI="2"
+EAPI="3"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
@@ -16,8 +16,6 @@ HOMEPAGE="http://www.gnome.org"
LICENSE="LGPL-2"
SLOT="0"
-IUSE="archive avahi bluetooth cdda doc fuse gdu gnome-keyring gphoto2 hal +http
-iphone samba +udev"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
DOCS="AUTHORS ChangeLog.pre-1-2 NEWS README TODO"
@@ -25,6 +23,7 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
DOCS="AUTHORS ChangeLog ChangeLog.pre-1-2 NEWS README TODO"
fi
+IUSE="archive avahi bluetooth cdda doc fuse gdu gnome-keyring gphoto2 +http ios samba +udev"
RDEPEND=">=dev-libs/glib-2.27.4
>=sys-apps/dbus-1.0
@@ -42,15 +41,12 @@ RDEPEND=">=dev-libs/glib-2.27.4
gdu? ( >=sys-apps/gnome-disk-utility-2.29 )
gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
- iphone? (
+ ios? (
>=app-pda/libimobiledevice-1.1.0
>=app-pda/libplist-0.15 )
udev? (
cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
>=sys-fs/udev-145[extras] )
- hal? (
- cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
- >=sys-apps/hal-0.5.10 )
http? ( >=net-libs/libsoup-gnome-2.26.0 )
samba? ( || ( >=net-fs/samba-3.4.6[smbclient]
<=net-fs/samba-3.3 ) )"
@@ -60,18 +56,19 @@ DEPEND="${RDEPEND}
dev-util/gtk-doc-am
doc? ( >=dev-util/gtk-doc-1 )"
-
pkg_setup() {
- if use cdda && ! use hal && ! use udev; then
- ewarn "You have \"+cdda\", but you have \"-hal\" and \"-udev\""
- ewarn "cdda support will NOT be built unless you enable EITHER hal OR udev"
+ if use cdda && ! use udev; then
+ ewarn
+ ewarn "You need to enable USE=\"udev\" for USE=\"cdda\" to be useful."
+ ewarn
fi
G2CONF="${G2CONF}
--enable-udev
--disable-bash-completion
- --with-dbus-service-dir=/usr/share/dbus-1/services
+ --disable-hal
--disable-schemas-compile
+ --with-dbus-service-dir=/usr/share/dbus-1/services
$(use_enable archive)
$(use_enable avahi)
$(use_enable bluetooth obexftp)
@@ -79,9 +76,8 @@ pkg_setup() {
$(use_enable fuse)
$(use_enable gdu)
$(use_enable gphoto2)
- $(use_enable iphone afc)
+ $(use_enable ios afc)
$(use_enable udev gudev)
- $(use_enable hal)
$(use_enable http)
$(use_enable gnome-keyring keyring)
$(use_enable samba)"
diff --git a/gnome-base/gvfs/gvfs-9999.ebuild b/gnome-base/gvfs/gvfs-9999.ebuild
index 22b1e90..9f3c6cc 100644
--- a/gnome-base/gvfs/gvfs-9999.ebuild
+++ b/gnome-base/gvfs/gvfs-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.6.4-r1.ebuild,v 1.1 2010/10/05 08:49:12 pacho Exp $
-EAPI="2"
+EAPI="3"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
@@ -16,8 +16,6 @@ HOMEPAGE="http://www.gnome.org"
LICENSE="LGPL-2"
SLOT="0"
-IUSE="archive avahi bluetooth cdda doc fuse gdu gnome-keyring gphoto2 hal +http
-iphone samba +udev"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
DOCS="AUTHORS ChangeLog.pre-1-2 NEWS README TODO"
@@ -25,6 +23,7 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
DOCS="AUTHORS ChangeLog ChangeLog.pre-1-2 NEWS README TODO"
fi
+IUSE="archive avahi bluetooth cdda doc fuse gdu gnome-keyring gphoto2 +http ios samba +udev"
RDEPEND=">=dev-libs/glib-2.27.4
>=sys-apps/dbus-1.0
@@ -42,15 +41,12 @@ RDEPEND=">=dev-libs/glib-2.27.4
gdu? ( >=sys-apps/gnome-disk-utility-2.29 )
gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
- iphone? (
+ ios? (
>=app-pda/libimobiledevice-1.1.0
>=app-pda/libplist-0.15 )
udev? (
cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
>=sys-fs/udev-145[extras] )
- hal? (
- cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
- >=sys-apps/hal-0.5.10 )
http? ( >=net-libs/libsoup-gnome-2.26.0 )
samba? ( || ( >=net-fs/samba-3.4.6[smbclient]
<=net-fs/samba-3.3 ) )"
@@ -60,18 +56,19 @@ DEPEND="${RDEPEND}
dev-util/gtk-doc-am
doc? ( >=dev-util/gtk-doc-1 )"
-
pkg_setup() {
- if use cdda && ! use hal && ! use udev; then
- ewarn "You have \"+cdda\", but you have \"-hal\" and \"-udev\""
- ewarn "cdda support will NOT be built unless you enable EITHER hal OR udev"
+ if use cdda && ! use udev; then
+ ewarn
+ ewarn "You need to enable USE=\"udev\" for USE=\"cdda\" to be useful."
+ ewarn
fi
G2CONF="${G2CONF}
--enable-udev
--disable-bash-completion
- --with-dbus-service-dir=/usr/share/dbus-1/services
+ --disable-hal
--disable-schemas-compile
+ --with-dbus-service-dir=/usr/share/dbus-1/services
$(use_enable archive)
$(use_enable avahi)
$(use_enable bluetooth obexftp)
@@ -79,9 +76,8 @@ pkg_setup() {
$(use_enable fuse)
$(use_enable gdu)
$(use_enable gphoto2)
- $(use_enable iphone afc)
+ $(use_enable ios afc)
$(use_enable udev gudev)
- $(use_enable hal)
$(use_enable http)
$(use_enable gnome-keyring keyring)
$(use_enable samba)"
next reply other threads:[~2011-04-10 18:05 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-10 18:04 Gilles Dartiguelongue [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-09-14 8:44 [gentoo-commits] proj/gnome:master commit in: gnome-base/gvfs/ Mart Raudsepp
2018-09-10 21:33 Gilles Dartiguelongue
2018-07-31 14:34 Sobhan Mohammadpour
2018-02-14 19:56 Sobhan Mohammadpour
2018-01-12 13:20 Dennis Lamm
2015-10-13 20:03 Ole Reifschneider
2015-05-17 15:39 Gilles Dartiguelongue
2014-12-22 23:11 Gilles Dartiguelongue
2014-11-23 22:27 Gilles Dartiguelongue
2014-04-21 14:40 Gilles Dartiguelongue
2014-02-12 20:58 Gilles Dartiguelongue
2013-12-18 22:49 Gilles Dartiguelongue
2013-03-27 0:37 Priit Laes
2013-03-25 9:46 Nirbheek Chauhan
2013-01-22 8:12 Alexandre Rostovtsev
2012-12-27 23:02 Alexandre Rostovtsev
2012-09-25 15:59 Alexandre Rostovtsev
2012-09-22 15:54 Nirbheek Chauhan
2012-04-24 3:58 Alexandre Restovtsev
2011-10-18 7:57 Alexandre Restovtsev
2011-06-27 20:25 Alexandre Restovtsev
2011-05-30 17:43 Nirbheek Chauhan
2011-04-27 22:22 Gilles Dartiguelongue
2011-04-05 0:57 Nirbheek Chauhan
2011-03-22 1:18 Nirbheek Chauhan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4be59f2f12cdd39ef8f1e9de0645089d39d9e010.eva@gentoo \
--to=eva@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox