Dummy revision bump to change default from UDisks2 to UDisks1 temporarily wrt #427544

Package-Manager: portage-2.2.0_alpha128/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 141 insertions, 9 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 38e71c407ab9..813a12acb40c 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.183 2012/09/25 11:46:48 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.184 2012/09/26 10:54:41 ssuominen Exp $
+
+*gvfs-1.12.3-r1 (26 Sep 2012)
+
+  26 Sep 2012; Samuli Suominen <ssuominen@gentoo.org> +gvfs-1.12.3-r1.ebuild:
+  Dummy revision bump to change default from UDisks2 to UDisks1 temporarily wrt
+  #427544
 
 *gvfs-1.14.0 (25 Sep 2012)
 
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index aea681fcf6a4..dc86535616d1 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -16,18 +16,19 @@ DIST gvfs-1.14.0.tar.xz 1463400 SHA256 71ab8cf60070025d1aff9bee1f514fdb45682ffad
 DIST libgcrypt.m4.bz2 1526 SHA256 ce9d04f9cbd5417e4d4ba91095c06cea4852c70d75716311e82dfc243d2f0128 SHA512 fe7916d01efb1d14c4d84ed37f3b53b04d3b005cb04b603bded8d24e147fe69a4c0823164483dba3bc95cf540eaf93a0c0ad59f29f8e1edbae9566a81be5900d WHIRLPOOL 6baa8ed005a691fb1f31ac420d801d20a1611519a38749718dcf3956557f40a058c24b988d20534a62084fadd4141c44893cfa751ebf8011cf55d83c759868dd
 EBUILD gvfs-1.10.1.ebuild 3526 SHA256 1cfa5b275f772ef5734f7ce41329cc2236fd77847886e101db873d0866432060 SHA512 43e370b126736603382bf32616c6d267d2979973ef481cdf36f6387243298564b3acf502647d34777d5f81f8e68c0d07c42d78d2e1114e0776a0c12c1fc24809 WHIRLPOOL 9e66ce9f1b7ef9a4884a29b1bd4010219ea4848f7c690c7b8f976f07bb4697f13876afdc04d8f6c9d4432350623301975d33c7bb3c42f7d8a2c93cd6ba0917d7
 EBUILD gvfs-1.12.2-r1.ebuild 3507 SHA256 4b83beded1f186a39d7fd687c1c661d6874c62ef58327ec8e0a2841ad3999770 SHA512 17efc197b724a670a6266c79b6fd79159b4574857b8c1c28659f79c0af1af7f3e3f0b7367854118fbd6e669c508ada1d2ed42d5f682a144e6a7e60cc0d336acb WHIRLPOOL 2a91f633e03689c89766f4edb6c9d6326886b938b6fff18938bc22b25d5f7399995cb67f19a7463b9125ebe9130f248d01fa81883034e3452cb50b89bc2b7c5e
+EBUILD gvfs-1.12.3-r1.ebuild 3507 SHA256 919f81711917620b5b26b436d96d9ff23166e032d696010d4955c9726ac3946e SHA512 9583fd0c4f4e2e802de4a1cb13dc1ba218f7516eaea1850545a7b6211dd55762ae138e8fdadd4a3fdb4a25f189c8f2dbee49eac58d743c37f1dcf222c37f1159 WHIRLPOOL 586362d23926ae9e8dd38a7356f843c612e63dce109757d6a6d9042c1f8296d0a00cc81eba1ef73c07c72bfe16c667bb66776c1a1323d87cc0b15d535397df14
 EBUILD gvfs-1.12.3.ebuild 3504 SHA256 1bcbc3a549cd22da2e10c5a58825038a7c1e1e0dd10b694ba5ef756f273ed902 SHA512 6573b00bd028fc105534daa39d76512f2f9e0ee1d717e0b30a59461955ce65e4295d406fe24cc8b4d10d52749fcc97989b30535f91eac412ff14568e012e9a46 WHIRLPOOL 089c4e0c5424bd6b8ec63a47958f47d521c45f1321e93229822fcfdd5643bfc6d628220cb87b162986df0d75cbc27764aefc713ac62f745d9db418cced0396e7
 EBUILD gvfs-1.14.0.ebuild 3623 SHA256 9a041724ff8ffe5230a699be8ec2bab1f3cb66cbce0fbe9073a2452af9536cd6 SHA512 c6c5746b8e1c2a9a2aea90ffb59d1c5793f3d1cd9a892552418c64301a611e07a68ff07afa2e5069fde4bdb6cfbc163eae3c8fa1b93fbf6feab1c7533a9294c1 WHIRLPOOL 82d1ea095d4beb715c274a2b075e8249fa9ebf015b3a5612617456bcd6b27904f11461cc683d5c865a4cbf206c60d60f016ed49eff4bf9fdb879685056da87cb
-MISC ChangeLog 26376 SHA256 6537a867de6c1a43fb23800b6848705a7589bb4ae53156882db9dc961acf692e SHA512 fe03b2b4b7b49d443b5159396b2c8e6617f333838b6c5507d5e46a2c95b1f0da321e81030672e009611f394d1bd236d3facc34c50f31bf38b5ca244600e025e1 WHIRLPOOL d4dde7452d370dd38966ff91a9545b7b57e776a72f778001fd0b4b214d140a885341edae922d06a92e62ff6b3e3e64d7027c704051dbc4c9b1bc2bf932503b9a
+MISC ChangeLog 26576 SHA256 856efad482d31e0564f4d5b59a834953a2ab5dc98e4b213b2cfad658b642eb94 SHA512 5bff385afb0dd790b11aa8a0fb25e56b7e4a8d35097d9fef291f342c31ad0580d4bebe3afb63a57daf50e15ea27138d91e9ec1a57cb7577f3be95cda4497e97b WHIRLPOOL 450ef8c313ea8085e074cfa81a387829f7694c0551ffd5d8266346cdc50a4fed5be5f0091d4734446ad05377e115674c716694ee9899f16f5214688e780d6831
 MISC metadata.xml 1436 SHA256 8abc5f14d4c38e07815876aba0a376bd4c73e308477dd0cb584ec2e0fd3a58f1 SHA512 5c8481499c086482c54d5ccd18ad31f60941298e6329b32a88e909d571df46cadb80ee6c6d890a83b68288806901504287793f68c47970122092a17b8aa59a3b WHIRLPOOL 52c575106ca10f2e10406d669fc7802af23ff6dd055e03751cc9a33ced386291cf6d1865c968536cf50da9e3ccbf9511d6a7fda82ba2ef5888a7d06e0a086096
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQYZmuAAoJEJ0WA1zPCt1hUhIIAKHpWabHCTSGP360OsUalW+G
-EYa7OCnBlKyNAl0TU98o/4gQQpwbMfyiONY5GwNBjDYp3voCLJ9KhIOWV1e/JwJE
-JeS3Vjs9S62YxxGJ4tN/fhdDLysvIG81eAOqNxC8vfAdb+ZaTOcFyolbXxWSsvE4
-EK++EM/6GhvaCqJYw/QSF7Gl2j14IZ5fXonyQ1idky1y2HpXu0DkLrmX3l3QSTDg
-MCjgkUrbmZvoyAohdUcaVpZP3oePGHucBYUPEoD3rxtMb07naRsPtDMQkJVYW+xD
-z0hbqmWfhOsVRy+JypYSZ32ggfzEG5L53prVDTnVQm/2oG9M9iQz1yp/Su6QFN0=
-=FyvJ
+iQEcBAEBCAAGBQJQYt5TAAoJEEdUh39IaPFNzygH/3kbcmEF9i+mo9U+brleKv1x
+riTCsdkBTuAjCfzgdLnCSY9TEw+ZoaJaZpShB4ZBlKBqGonFv7w77hZd8O/BqvgT
+/HOX5d5Uh6Uq1/taoPZC4pgTy79twdQs3IbO9xQ9FrcpgtDcHn2U8Bj6Wa6WOyv1
+ZrIGaW65XwxDTKJHjiy8NheO50PrgFBs2e4SF0R+i4rRY0WQmKi+3qOdiSC2Pceo
+W3h6WsFiubCqLxiY9Y7e/zyN/HdCqSZU4CHSFPyiuOAi7pY8ymX4ScknHZqoIZpM
+YTAMe2JOGSjDTpGFbvAbyeG5V4VgXs3P6b3o9//fVQnllshOlsIwJD6faFb89BM=
+=0Qyu
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild b/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild
new file mode 100644
index 000000000000..f79416d90b92
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild,v 1.1 2012/09/26 10:54:41 ssuominen Exp $
+
+EAPI=4
+GCONF_DEBUG=no
+GNOME2_LA_PUNT=yes
+
+inherit autotools bash-completion-r1 eutils gnome2
+
+[[ ${PV} = 9999 ]] && inherit gnome2-live
+
+DESCRIPTION="GNOME Virtual Filesystem Layer"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+	DOCS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
+fi
+
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2"
+
+IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gphoto2 +http ios samba +udev udisks"
+
+RDEPEND=">=dev-libs/glib-2.31.0:2
+	sys-apps/dbus
+	dev-libs/libxml2
+	net-misc/openssh
+	afp? ( >=dev-libs/libgcrypt-1.2.2 )
+	archive? ( app-arch/libarchive )
+	avahi? ( >=net-dns/avahi-0.6 )
+	bluetooth? (
+		>=app-mobilephone/obex-data-server-0.4.5
+		dev-libs/dbus-glib
+		net-wireless/bluez
+		dev-libs/expat )
+	bluray? ( media-libs/libbluray )
+	fuse? ( >=sys-fs/fuse-2.8.0 )
+	gdu? ( || (
+		>=gnome-base/libgdu-3.0.2
+		=sys-apps/gnome-disk-utility-3.0.2-r300
+		=sys-apps/gnome-disk-utility-3.0.2-r200 ) )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
+	gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
+	ios? (
+		>=app-pda/libimobiledevice-1.1.0
+		>=app-pda/libplist-1 )
+	udev? (
+		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
+		|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-164-r2[extras] ) )
+	udisks? ( >=sys-fs/udisks-1.90:2 )
+	http? ( >=net-libs/libsoup-gnome-2.26.0 )
+	samba? ( >=net-fs/samba-3.4.6[smbclient] )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+REQUIRED_USE="cdda? ( udev )"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-bash-completion
+		--disable-hal
+		--disable-schemas-compile
+		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services
+		$(use_enable afp)
+		$(use_enable archive)
+		$(use_enable avahi)
+		$(use_enable bluetooth obexftp)
+		$(use_enable bluray)
+		$(use_enable cdda)
+		$(use_enable fuse)
+		$(use_enable gdu)
+		$(use_enable gphoto2)
+		$(use_enable ios afc)
+		$(use_enable udev)
+		$(use_enable udev gudev)
+		$(use_enable http)
+		$(use_enable gnome-keyring keyring)
+		$(use_enable samba)
+		$(use_enable udisks udisks2)"
+}
+
+src_prepare() {
+	# Conditional patching purely to avoid eautoreconf
+	if use gphoto2; then
+		epatch "${FILESDIR}"/${PN}-1.12.3-gphoto2-stricter-checks.patch
+		epatch "${FILESDIR}"/${PN}-1.12.3-gphoto2-2.5-{1,2}.patch
+	fi
+
+	if use archive; then
+		epatch "${FILESDIR}"/${PN}-1.2.2-expose-archive-backend.patch
+		echo mount-archive.desktop.in >> po/POTFILES.in
+		echo mount-archive.desktop.in.in >> po/POTFILES.in
+	fi
+
+	if ! use udev; then
+		sed -i -e 's/gvfsd-burn/ /' daemon/Makefile.am || die
+		sed -i -e 's/burn.mount.in/ /' daemon/Makefile.am || die
+		sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die
+	fi
+
+	if use gphoto2 || use archive || ! use udev; then
+		# libgcrypt.m4 needed for eautoreconf, bug #399043
+		mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die
+
+		AT_M4DIR=. eautoreconf
+	fi
+
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+	newbashcomp programs/gvfs-bash-completion.sh ${PN}
+}