old

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

4 files changed, 5 insertions, 235 deletions

diff --git a/sys-fs/udisks/ChangeLog b/sys-fs/udisks/ChangeLog
index 2903a631603b..8604a3638806 100644
--- a/sys-fs/udisks/ChangeLog
+++ b/sys-fs/udisks/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udisks
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.131 2013/03/19 19:41:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.132 2013/03/19 19:43:44 ssuominen Exp $
+
+  19 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> -udisks-1.0.4-r2.ebuild,
+  -files/udisks-2.0.1-pragma.patch, -udisks-2.0.92.ebuild:
+  old
 
   19 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> udisks-1.0.4-r4.ebuild:
   sh stable wrt #427550
diff --git a/sys-fs/udisks/files/udisks-2.0.1-pragma.patch b/sys-fs/udisks/files/udisks-2.0.1-pragma.patch
deleted file mode 100644
index bebbb9f91b24..000000000000
--- a/sys-fs/udisks/files/udisks-2.0.1-pragma.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 02c041674cbcbee75e7fe70095f37c35837f4901 Mon Sep 17 00:00:00 2001
-From: David Zeuthen <zeuthen@gmail.com>
-Date: Sat, 13 Oct 2012 09:58:48 +0000
-Subject: Only use #pragma GCC diagnostic on GCC >= 4.6
-
-https://bugs.freedesktop.org/show_bug.cgi?id=52614
-
-Signed-off-by: David Zeuthen <zeuthen@gmail.com>
----
-diff --git a/udisks/udisksclient.c b/udisks/udisksclient.c
-index 22c20b8..4a5a4b0 100644
---- a/udisks/udisksclient.c
-+++ b/udisks/udisksclient.c
-@@ -25,6 +25,11 @@
- #include "udiskserror.h"
- #include "udisks-generated.h"
- 
-+/* For __GNUC_PREREQ usage below */
-+#ifdef __GNUC__
-+# include <features.h>
-+#endif
-+
- /**
-  * SECTION:udisksclient
-  * @title: UDisksClient
-@@ -1922,14 +1927,22 @@ udisks_client_get_id_for_display (UDisksClient *client,
-                    (g_strcmp0 (id_type[n].version, "*") == 0 && strlen (version) > 0))
-             {
-               /* we know better than the compiler here */
--#pragma GCC diagnostic push
--#pragma GCC diagnostic ignored "-Wformat-nonliteral"
-+#ifdef __GNUC_PREREQ
-+# if __GNUC_PREREQ(4,6)
-+#  pragma GCC diagnostic push
-+#  pragma GCC diagnostic ignored "-Wformat-nonliteral"
-+# endif
-+#endif
-               if (long_string)
-                 ret = g_strdup_printf (g_dpgettext2 (GETTEXT_PACKAGE, "fs-type", id_type[n].long_name), version);
-               else
-                 ret = g_strdup_printf (g_dpgettext2 (GETTEXT_PACKAGE, "fs-type", id_type[n].short_name), version);
-               goto out;
--#pragma GCC diagnostic pop
-+#ifdef __GNUC_PREREQ
-+# if __GNUC_PREREQ(4,6)
-+#  pragma GCC diagnostic pop
-+# endif
-+#endif
-             }
-         }
-     }
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sys-fs/udisks/udisks-1.0.4-r2.ebuild b/sys-fs/udisks/udisks-1.0.4-r2.ebuild
deleted file mode 100644
index 27d2a54baccb..000000000000
--- a/sys-fs/udisks/udisks-1.0.4-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-1.0.4-r2.ebuild,v 1.15 2012/12/09 10:42:16 swift Exp $
-
-EAPI=4
-inherit eutils bash-completion-r1 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 ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="debug nls remote-access selinux"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.98
-	>=dev-libs/glib-2.28
-	>=dev-libs/libatasmart-0.18
-	>=sys-auth/polkit-0.104-r1
-	>=sys-apps/dbus-1.4.20
-	>=sys-apps/sg3_utils-1.27.20090411
-	>=sys-block/parted-3
-	virtual/udev[gudev,hwdb]
-	>=sys-fs/lvm2-2.02.66
-	selinux? ( sec-policy/selinux-devicekit )"
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20.1-r2
-	virtual/eject
-	remote-access? ( net-dns/avahi )"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/intltool
-	virtual/pkgconfig"
-
-pkg_setup() {
-	# Listing only major arch's here to avoid tracking kernel's defconfig
-	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
-		CONFIG_CHECK="~!IDE" #319829
-		CONFIG_CHECK+=" ~USB_SUSPEND" #331065
-		CONFIG_CHECK+=" ~NLS_UTF8" #425562
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.2-ntfs-3g.patch
-}
-
-src_configure() {
-	# device-mapper -> lvm2 -> mandatory depend -> force enabled
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		$(use_enable debug verbose-mode) \
-		--enable-man-pages \
-		--disable-gtk-doc \
-		--enable-lvm2 \
-		--enable-dmmp \
-		$(use_enable remote-access) \
-		$(use_enable nls) \
-		--with-html-dir="${EPREFIX}"/deprecated
-}
-
-src_test() {
-	ewarn "Skipping testsuite because sys-fs/udisks:0 is deprecated"
-	ewarn "in favour of sys-fs/udisks:2."
-}
-
-src_install() {
-	emake DESTDIR="${D}" slashsbindir=/usr/sbin install #398081
-	dodoc AUTHORS HACKING NEWS README
-
-	rm -f "${ED}"/etc/profile.d/udisks-bash-completion.sh
-	newbashcomp tools/udisks-bash-completion.sh ${PN}
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	keepdir /media
-	keepdir /var/lib/udisks #383091
-
-	rm -rf "${ED}"/deprecated
-}
diff --git a/sys-fs/udisks/udisks-2.0.92.ebuild b/sys-fs/udisks/udisks-2.0.92.ebuild
deleted file mode 100644
index b25d5e33b222..000000000000
--- a/sys-fs/udisks/udisks-2.0.92.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-2.0.92.ebuild,v 1.1 2013/03/05 12:26:06 ssuominen Exp $
-
-EAPI=5
-inherit bash-completion-r1 eutils linux-info systemd udev
-
-DESCRIPTION="Daemon providing interfaces to work with storage devices"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
-SRC_URI="http://udisks.freedesktop.org/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug crypt +gptfdisk +introspection selinux systemd"
-
-UDEV_VERSION="197"
-COMMON_DEPEND=">=dev-libs/glib-2.32
-	>=dev-libs/libatasmart-0.19
-	>=sys-auth/polkit-0.110
-	virtual/acl
-	>=virtual/udev-${UDEV_VERSION}[gudev,hwdb]
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )
-	selinux? ( sec-policy/selinux-devicekit )
-	systemd? ( >=sys-apps/systemd-${UDEV_VERSION} )"
-# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1)
-# util-linux -> mount, umount, swapon, swapoff (see also #403073)
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20.1-r2
-	>=sys-block/parted-3
-	virtual/eject
-	crypt? ( sys-fs/cryptsetup )
-	gptfdisk? ( >=sys-apps/gptfdisk-0.8 )"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.32
-	dev-util/intltool
-	>=sys-kernel/linux-headers-3.1
-	virtual/pkgconfig"
-
-QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd"
-
-DOCS="AUTHORS HACKING NEWS README"
-
-pkg_setup() {
-	# Listing only major arch's here to avoid tracking kernel's defconfig
-	if use amd64 || use arm || use ppc || use ppc64 || use x86; then
-		CONFIG_CHECK="~!IDE" #319829
-		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
-		CONFIG_CHECK+=" ~USB_SUSPEND" #331065
-		CONFIG_CHECK+=" ~SWAP" # http://forums.gentoo.org/viewtopic-t-923640.html
-		CONFIG_CHECK+=" ~NLS_UTF8" #425562
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	use systemd || { sed -i -e 's:libsystemd-login:&disable:' configure || die; }
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		$(use_enable debug) \
-		--disable-gtk-doc \
-		$(use_enable introspection) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-udevdir="$(get_udevdir)" \
-		"$(systemd_with_unitdir)"
-}
-
-src_install() {
-	default
-	prune_libtool_files
-	keepdir /var/lib/udisks2 #383091
-
-	rm -rf "${ED}"/usr/share/bash-completion
-	dobashcomp data/completions/udisksctl
-
-	local htmldir=udisks2
-	if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-		dosym /usr/share/doc/${PF}/html/${htmldir} /usr/share/gtk-doc/html/${htmldir}
-	fi
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"/run #415987
-
-	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
-	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
-		echo
-		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
-	fi
-}