ppc64 stable, punt old

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

4 files changed, 6 insertions, 126 deletions

diff --git a/sys-auth/consolekit/ChangeLog b/sys-auth/consolekit/ChangeLog
index 3cdfb68fbe70..37c8751f7eb9 100644
--- a/sys-auth/consolekit/ChangeLog
+++ b/sys-auth/consolekit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-auth/consolekit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.101 2011/04/23 16:45:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.102 2011/04/23 16:58:35 ssuominen Exp $
+
+  23 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> consolekit-0.4.4.ebuild:
+  ppc64 stable wrt #360769
 
   23 Apr 2011; Raúl Porcel <armin76@gentoo.org> consolekit-0.4.4.ebuild:
   alpha/ia64/sh/sparc stable wrt #360769
diff --git a/sys-auth/consolekit/consolekit-0.4.3.ebuild b/sys-auth/consolekit/consolekit-0.4.3.ebuild
deleted file mode 100644
index ef4e97cdc3a8..000000000000
--- a/sys-auth/consolekit/consolekit-0.4.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.3.ebuild,v 1.7 2011/01/13 15:26:42 jer Exp $
-
-EAPI=3
-inherit autotools eutils linux-info multilib pam
-
-MY_PN=ConsoleKit
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Framework for defining and tracking users, login sessions and seats."
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit"
-SRC_URI="http://www.freedesktop.org/software/${MY_PN}/dist/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug doc kernel_linux pam policykit test"
-
-RDEPEND=">=dev-libs/dbus-glib-0.82
-	>=dev-libs/glib-2.20:2
-	sys-libs/zlib
-	x11-libs/libX11
-	pam? ( virtual/pam )
-	policykit? ( >=sys-auth/polkit-0.96 )
-	!<sys-apps/shadow-4.1.4.2-r6
-	!<sys-auth/pambase-20101024"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-libs/libxslt
-	doc? ( app-text/xmlto )
-	test? ( app-text/docbook-xml-dtd:4.1.2 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="~AUDITSYSCALL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.2.10-cleanup_console_tags.patch \
-		"${FILESDIR}"/${PN}-0.4.0-polkit-automagic.patch \
-		"${FILESDIR}"/${PN}-0.4.0-multilib.patch \
-		"${FILESDIR}"/${PN}-0.4.1-shutdown-reboot-without-policies.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		XMLTO_FLAGS="--skip-validation" \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable pam pam-module) \
-		$(use_enable doc docbook-docs) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
-		--with-pam-module-dir=$(getpam_mod_dir)
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install || die
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README TODO
-
-	newinitd "${FILESDIR}"/${PN}-0.1.rc consolekit
-
-	keepdir /usr/$(get_libdir)/ConsoleKit/run-session.d
-	keepdir /etc/ConsoleKit/run-session.d
-	keepdir /var/run/ConsoleKit
-	keepdir /var/log/ConsoleKit
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}"/90-consolekit-3 90-consolekit || die
-
-	exeinto /usr/$(get_libdir)/ConsoleKit/run-session.d
-	doexe "${FILESDIR}"/pam-foreground-compat.ck || die
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-}
-
-pkg_postinst() {
-	ewarn "You need to restart ConsoleKit to get the new features."
-	ewarn "This can be done with /etc/init.d/consolekit restart"
-	ewarn "but make sure you do this and then restart your session"
-	ewarn "otherwise you will get access denied for certain actions"
-}
diff --git a/sys-auth/consolekit/consolekit-0.4.4.ebuild b/sys-auth/consolekit/consolekit-0.4.4.ebuild
index 165b699fce9a..ae104082d2aa 100644
--- a/sys-auth/consolekit/consolekit-0.4.4.ebuild
+++ b/sys-auth/consolekit/consolekit-0.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.4.ebuild,v 1.7 2011/04/23 16:45:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.4.ebuild,v 1.8 2011/04/23 16:58:35 ssuominen Exp $
 
 EAPI=3
 inherit autotools eutils linux-info multilib pam
@@ -14,7 +14,7 @@ SRC_URI="http://www.freedesktop.org/software/${MY_PN}/dist/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="debug doc kernel_linux pam policykit test"
 
 RDEPEND=">=dev-libs/dbus-glib-0.88
diff --git a/sys-auth/consolekit/files/consolekit-0.2.10-polkit-automagic.patch b/sys-auth/consolekit/files/consolekit-0.2.10-polkit-automagic.patch
deleted file mode 100644
index 18b0de8f5761..000000000000
--- a/sys-auth/consolekit/files/consolekit-0.2.10-polkit-automagic.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur ConsoleKit-0.2.10/configure.ac ConsoleKit-0.2.10.new/configure.ac
---- ConsoleKit-0.2.10/configure.ac	2008-02-13 09:25:50.000000000 +0530
-+++ ConsoleKit-0.2.10.new/configure.ac	2008-08-09 11:36:25.000000000 +0530
-@@ -55,10 +55,21 @@
-   gthread-2.0 >= $GLIB_REQUIRED_VERSION
- )
- 
--PKG_CHECK_MODULES(POLKIT,
--  polkit >= $POLKIT_REQUIRED_VERSION,
--  have_polkit=yes,
--  have_polkit=no)
-+AC_ARG_ENABLE([polkit],
-+  AC_HELP_STRING([--enable-polkit], [Enable PolicyKit support (default auto)]),
-+  enable_polkit=$enableval,
-+  enable_polkit=auto)
-+
-+if test "x$enable_polkit" != "xno"; then
-+  PKG_CHECK_MODULES(POLKIT,
-+    polkit >= $POLKIT_REQUIRED_VERSION,
-+    have_polkit=yes,
-+    have_polkit=no)
-+  if test "x$enable_polkit"  = "xyes" -a "x$have_polkit" = "xno"; then
-+    AC_MSG_ERROR([PolicyKit support explicitly requested but dependencies not found])
-+  fi
-+fi
-+
- if test "x$have_polkit" = "xyes" ; then
-        AC_DEFINE(HAVE_POLKIT, [], [Define if we have polkit])
- fi