From: "Alexandre Restovtsev" <tetromino@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gvfs/
Date: Tue, 18 Oct 2011 07:57:01 +0000 (UTC) [thread overview]
Message-ID: <1834e88d1a44661a6dacdef231779c3aae5b77e5.tetromino@gentoo> (raw)
commit: 1834e88d1a44661a6dacdef231779c3aae5b77e5
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Oct 18 07:52:00 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Oct 18 07:52:00 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1834e88d
gnome-base/gvfs: sync with gx86 changes
---
gnome-base/gvfs/gvfs-1.10.1.ebuild | 24 +++++++++---------------
gnome-base/gvfs/gvfs-9999.ebuild | 29 +++++++++++++----------------
2 files changed, 22 insertions(+), 31 deletions(-)
diff --git a/gnome-base/gvfs/gvfs-1.10.1.ebuild b/gnome-base/gvfs/gvfs-1.10.1.ebuild
index 3934ab2..a0ec60b 100644
--- a/gnome-base/gvfs/gvfs-1.10.1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.10.1.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-inherit autotools bash-completion gnome2 eutils
+inherit autotools bash-completion-r1 gnome2 eutils
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -20,16 +20,16 @@ if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
DOCS="AUTHORS ChangeLog.pre-1-2 NEWS README TODO"
else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
DOCS="AUTHORS ChangeLog ChangeLog.pre-1-2 NEWS README TODO"
fi
IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gphoto2 +http ios prefix samba +udev"
RDEPEND=">=dev-libs/glib-2.29.14
- >=sys-apps/dbus-1.0
+ sys-apps/dbus
dev-libs/libxml2
net-misc/openssh
- !prefix? ( >=sys-fs/udev-138 )
+ !prefix? ( >=sys-fs/udev-164-r2 )
afp? ( >=dev-libs/libgcrypt-1.2.2 )
archive? ( app-arch/libarchive )
avahi? ( >=net-dns/avahi-0.6 )
@@ -45,7 +45,7 @@ RDEPEND=">=dev-libs/glib-2.29.14
gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
ios? (
>=app-pda/libimobiledevice-1.1.0
- >=app-pda/libplist-0.15 )
+ >=app-pda/libplist-1 )
udev? (
cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) )
@@ -54,17 +54,13 @@ RDEPEND=">=dev-libs/glib-2.29.14
<=net-fs/samba-3.3 ) )"
DEPEND="${RDEPEND}
>=dev-util/intltool-0.40
- >=dev-util/pkgconfig-0.19
+ dev-util/pkgconfig
dev-util/gtk-doc-am
doc? ( >=dev-util/gtk-doc-1 )"
-pkg_setup() {
- if use cdda && ! use udev; then
- ewarn
- ewarn "You need to enable USE=\"udev\" for USE=\"cdda\" to be useful."
- ewarn
- fi
+REQUIRED_USE="cdda? ( udev )"
+pkg_setup() {
G2CONF="${G2CONF}
--disable-bash-completion
--disable-hal
@@ -113,13 +109,11 @@ src_prepare() {
src_install() {
gnome2_src_install
- use bash-completion && \
- dobashcompletion programs/gvfs-bash-completion.sh ${PN}
+ newbashcomp programs/gvfs-bash-completion.sh ${PN}
}
pkg_postinst() {
gnome2_pkg_postinst
- use bash-completion && bash-completion_pkg_postinst
ewarn "In order to use the new gvfs services, please reload dbus configuration"
ewarn "You may need to log out and log back in for some changes to take effect"
diff --git a/gnome-base/gvfs/gvfs-9999.ebuild b/gnome-base/gvfs/gvfs-9999.ebuild
index 60546e0..a0ec60b 100644
--- a/gnome-base/gvfs/gvfs-9999.ebuild
+++ b/gnome-base/gvfs/gvfs-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-inherit autotools bash-completion gnome2 eutils
+inherit autotools bash-completion-r1 gnome2 eutils
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -20,16 +20,16 @@ if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
DOCS="AUTHORS ChangeLog.pre-1-2 NEWS README TODO"
else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
DOCS="AUTHORS ChangeLog ChangeLog.pre-1-2 NEWS README TODO"
fi
IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gphoto2 +http ios prefix samba +udev"
RDEPEND=">=dev-libs/glib-2.29.14
- >=sys-apps/dbus-1.0
+ sys-apps/dbus
dev-libs/libxml2
net-misc/openssh
- !prefix? ( >=sys-fs/udev-138 )
+ !prefix? ( >=sys-fs/udev-164-r2 )
afp? ( >=dev-libs/libgcrypt-1.2.2 )
archive? ( app-arch/libarchive )
avahi? ( >=net-dns/avahi-0.6 )
@@ -45,7 +45,7 @@ RDEPEND=">=dev-libs/glib-2.29.14
gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
ios? (
>=app-pda/libimobiledevice-1.1.0
- >=app-pda/libplist-0.15 )
+ >=app-pda/libplist-1 )
udev? (
cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) )
@@ -54,17 +54,13 @@ RDEPEND=">=dev-libs/glib-2.29.14
<=net-fs/samba-3.3 ) )"
DEPEND="${RDEPEND}
>=dev-util/intltool-0.40
- >=dev-util/pkgconfig-0.19
+ dev-util/pkgconfig
dev-util/gtk-doc-am
doc? ( >=dev-util/gtk-doc-1 )"
-pkg_setup() {
- if use cdda && ! use udev; then
- ewarn
- ewarn "You need to enable USE=\"udev\" for USE=\"cdda\" to be useful."
- ewarn
- fi
+REQUIRED_USE="cdda? ( udev )"
+pkg_setup() {
G2CONF="${G2CONF}
--disable-bash-completion
--disable-hal
@@ -105,18 +101,19 @@ src_prepare() {
sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die
fi
- { use gphoto2 || use archive || use prefix; } && eautoreconf
+ # Drop G_DISABLE_DEPRECATED (fixed in git master); requires eautoreconf
+ epatch "${FILESDIR}/${PN}-1.10.1-G_DISABLE_DEPRECATED.patch"
+ eautoreconf
+ #{ use gphoto2 || use archive || use prefix; } && eautoreconf
}
src_install() {
gnome2_src_install
- use bash-completion && \
- dobashcompletion programs/gvfs-bash-completion.sh ${PN}
+ newbashcomp programs/gvfs-bash-completion.sh ${PN}
}
pkg_postinst() {
gnome2_pkg_postinst
- use bash-completion && bash-completion_pkg_postinst
ewarn "In order to use the new gvfs services, please reload dbus configuration"
ewarn "You may need to log out and log back in for some changes to take effect"
next reply other threads:[~2011-10-18 7:57 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-18 7:57 Alexandre Restovtsev [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-06-27 20:25 Alexandre Restovtsev
2011-05-30 17:43 Nirbheek Chauhan
2011-04-27 22:22 Gilles Dartiguelongue
2011-04-10 18:04 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=1834e88d1a44661a6dacdef231779c3aae5b77e5.tetromino@gentoo \
--to=tetromino@gmail.com \
--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