old

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 13 insertions, 108 deletions

diff --git a/sys-fs/udisks/ChangeLog b/sys-fs/udisks/ChangeLog
index 2aa1ab9c7e91..76343c8dbe61 100644
--- a/sys-fs/udisks/ChangeLog
+++ b/sys-fs/udisks/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udisks
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.62 2012/01/10 22:21:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.63 2012/01/10 22:22:59 ssuominen Exp $
+
+  10 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> -udisks-1.0.3-r1.ebuild,
+  -files/udisks-1.0.3-mkfs-tempdir.patch:
+  old
 
   10 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> udisks-1.0.4-r1.ebuild:
   ppc64 stable wrt #385231
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 2299aad5b344..0777d4af7ec4 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -2,21 +2,18 @@
 Hash: SHA1
 
 AUX udisks-1.0.2-ntfs-3g.patch 198 RMD160 e4b5cb3386184edf90bce5140a1c414ef5e99210 SHA1 d3ee3999b9d0437a6022d85d4535fc72632f6258 SHA256 1db923f52619c2dcc6c30ffedcd47dedce048dbec2eb781088738e51f8dc0539
-AUX udisks-1.0.3-mkfs-tempdir.patch 552 RMD160 e421c0d325327d299f5f825b5c8d5abe9eb20e67 SHA1 994fbac57474d2d135f91b6994cc12b2a76042b8 SHA256 db9740b6d09fcfe3c8b1ccd48a8dcf12d3d956ccead9caa6638fc61e7dbc9e89
-DIST udisks-1.0.3.tar.gz 722912 RMD160 d6052f2e7b5be11163bbc784a9d18357fd31d7c2 SHA1 3033d99fe830a95c2a7c5a1a4e680c82632dc911 SHA256 d95bceb52a70c727291b934c4c05774899a0074927c8138a219b81a784de8a4b
 DIST udisks-1.0.4.tar.gz 719889 RMD160 163a8046fcc7f30d48b8272859ab0d09a88f179a SHA1 10d2acfd6e6ff4c8d9d962af1fb1856a885e3219 SHA256 854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5
-EBUILD udisks-1.0.3-r1.ebuild 2053 RMD160 78ec65fdca89ab4b5a93258ac3993530e134c5bb SHA1 981c0c867a392a7330e0829df57f9babeb29f77a SHA256 20ce42700e904f19b206cf0357c7f5e8be2df3910b670353b74ee139a8db3c12
 EBUILD udisks-1.0.4-r1.ebuild 2032 RMD160 04d090ed0171f8f325fd56552c894422adb4d49b SHA1 dde90f398bab1eef95e18720eca31725e5adfcca SHA256 cda270fa2ede1c1bff53b7e67ab608f78bc831d2c0f2916afbe3ab3d9350db6c
-MISC ChangeLog 8460 RMD160 78416f87763f729a3593190bc27d2665e8126156 SHA1 61ca3e8737910de5744b3bc55561661683115c06 SHA256 f398552f7cb4f4b1fb49e1f899d7e3f5ceb394178b85cb5b540cbafcaeab3547
+MISC ChangeLog 8588 RMD160 4e191b00720ca06c63337556874c3def586374a0 SHA1 cc890e5754e8064bd8064bbd0ece261e6e81929d SHA256 bb0bbf0641f6317f47ab3974751e38441e4d5f0841ac9a534157380239e007c9
 MISC metadata.xml 367 RMD160 3cc82714647236fdce4606ef9e8432ef2753a553 SHA1 6fd0b25ca51d565fdc6c40b9d1fc90ebff4ddb22 SHA256 9da91cf204d0f5616ca669618f4eed4c477140aef9f7f9218217e63e7d88d051
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPDLmkAAoJEEdUh39IaPFNWroH/06o3O9AWlnkndWRzf0/j3qy
-DEomXlYqHkysBKGwkrWptsL3QQ+AUZO+Ag79ae10ySG0ppTGMXcfouOFqAF4X02j
-z11Okapiwa82VayCW4Rc251Ltum9mmglp4TOt/wpV+wyNVOuyFvGBhkW9d/rY2BS
-kP2nKF7gA8qi5TPMxoCOIKj8sv9fwxkRzIK5YMnnXWNe7f7UGY0sPItw7tNV6qzD
-YaQR/nq/Z1RSFA4iu0HozYGE3W2M2LTE3J+05gMlTk2UUvpV5cG9+7Plwkm98qwu
-NWuSRLJce6y1Sqz6Pi9NU9NCC20uifaDTG+QNeMWewQQU+2LlK04Z3TIHuP0gqE=
-=IjFm
+iQEcBAEBAgAGBQJPDLnpAAoJEEdUh39IaPFNNnYH/RN4JnqsuoYEJITZMgEAgPBb
+W/PK+byDz696U92MQknu6Y0IOMRtH/8aBY3LjUtFmqZneDLeGon8ON7vIX+1fjNs
+11cWChhYUSqDTZ+CYdHO3YgavNmE8HZ8WaCcI5sKkXQoESu/E2LSSjf1mhzmuaUK
+tcIig/mulQQZvwOe6DqUNgrJEYhta0EIzdybFmnM9MPfVIFGCbrxVPhSNrsF25NJ
+nBZ6QsjweqPRsVR9U7W7ZGZqO25U+7avv+uSQnSqRpe+QIXGejCWvjoEDmRHnLDW
+XwppJ3cND1oI0iNCRb9veOhwpkQv1LRC+Gd9QHIbUwZy8oOlhYdC6VjVSuMK1m4=
+=g1/R
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udisks/files/udisks-1.0.3-mkfs-tempdir.patch b/sys-fs/udisks/files/udisks-1.0.3-mkfs-tempdir.patch
deleted file mode 100644
index cc49c061065e..000000000000
--- a/sys-fs/udisks/files/udisks-1.0.3-mkfs-tempdir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-The daemon doesn't create /var/run/udisks
-
-http://bugs.gentoo.org/show_bug.cgi?id=333893
-http://bugs.freedesktop.org/show_bug.cgi?id=24265
-http://bugs.freedesktop.org/show_bug.cgi?id=36589
-
---- src/helpers/job-mkfs.c
-+++ src/helpers/job-mkfs.c
-@@ -546,7 +546,7 @@
-   /* take ownership of the device if requested */
-   if (take_ownership_uid != 0 || take_ownership_gid != 0)
-     {
--      char dir[256] = PACKAGE_LOCALSTATE_DIR "/run/udisks/job-mkfs-XXXXXX";
-+      char dir[256] = "/tmp/job-mkfs-XXXXXX";
- 
-       if (mkdtemp (dir) == NULL)
-         {
diff --git a/sys-fs/udisks/udisks-1.0.3-r1.ebuild b/sys-fs/udisks/udisks-1.0.3-r1.ebuild
deleted file mode 100644
index 2e0760196689..000000000000
--- a/sys-fs/udisks/udisks-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.3-r1.ebuild,v 1.5 2011/07/23 18:54:45 armin76 Exp $
-
-EAPI=4
-inherit eutils bash-completion linux-info
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sh sparc x86"
-IUSE="debug doc nls remote-access"
-
-COMMON_DEPEND="
-	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] )
-	>=dev-libs/glib-2.16.1:2
-	>=sys-apps/dbus-1.4.0
-	>=dev-libs/dbus-glib-0.92
-	>=sys-auth/polkit-0.97
-	>=sys-block/parted-1.8.8[device-mapper]
-	>=sys-fs/lvm2-2.02.66
-	>=dev-libs/libatasmart-0.14
-	>=sys-apps/sg3_utils-1.27.20090411
-	!sys-apps/devicekit-disks"
-RDEPEND="${COMMON_DEPEND}
-	virtual/eject
-	remote-access? ( net-dns/avahi )"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.0
-	dev-util/pkgconfig
-	doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2 )"
-
-RESTRICT="test" # this would need running dbus and sudo available
-
-pkg_setup() {
-	DOCS=( AUTHORS HACKING NEWS README )
-
-	if use amd64 || use x86; then
-		CONFIG_CHECK="~USB_SUSPEND ~!IDE"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.0.2-ntfs-3g.patch \
-		"${FILESDIR}"/${PN}-1.0.3-mkfs-tempdir.patch
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		$(use_enable debug verbose-mode) \
-		--enable-man-pages \
-		$(use_enable doc gtk-doc) \
-		$(use_enable remote-access) \
-		$(use_enable nls) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-
-	rm -f "${ED}"/etc/profile.d/udisks-bash-completion.sh
-	dobashcompletion tools/udisks-bash-completion.sh ${PN}
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	keepdir /media
-
-	rm -rf "${ED}"/var/run # See -mkfs-tempdir.patch
-}