Change GTK+ depend to X11. Fix /lib/ issues.

Package-Manager: portage-2.1.2.2

6 files changed, 226 insertions, 9 deletions

diff --git a/sys-auth/consolekit/ChangeLog b/sys-auth/consolekit/ChangeLog
index 2fd2dc63439c..9c90db4e4598 100644
--- a/sys-auth/consolekit/ChangeLog
+++ b/sys-auth/consolekit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/consolekit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.4 2007/03/26 14:50:43 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.5 2007/03/29 19:01:11 cardoe Exp $
+
+*consolekit-0.2.0-r1 (29 Mar 2007)
+
+  29 Mar 2007; Doug Goldstein <cardoe@gentoo.org>
+  +files/consolekit-0.2.0-gdk-to-x11.patch,
+  +files/consolekit-0.2.0-pam-lib-fix.patch, +consolekit-0.2.0-r1.ebuild:
+  Change GTK+ depend to X11. Fix /lib/ issues.
 
   26 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   consolekit-0.2.0.ebuild:
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index b4b8a39e78db..649c5a0a7cd2 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -5,15 +5,27 @@ AUX consolekit-0.1.rc 540 RMD160 0db24125d14b177ac54819f4d57fcac589a86bf3 SHA1 e
 MD5 fe92ac14f5b3146d01be6051f7fd32f3 files/consolekit-0.1.rc 540
 RMD160 0db24125d14b177ac54819f4d57fcac589a86bf3 files/consolekit-0.1.rc 540
 SHA256 53510ed5f365af2f5fc760fb9462aea660ba54cbbd5f4c6be8d3bc75c4c399c8 files/consolekit-0.1.rc 540
+AUX consolekit-0.2.0-gdk-to-x11.patch 2428 RMD160 513ae69e39444d76e8aa9c131574cf1a8d491ddc SHA1 5df4db9b1f422298d52c8bc1b2001cb50d49fdc2 SHA256 e5eaa0d9b3e973a8b04e59f562eb97bdab7c9be85fd8f1ba821c6a5620d6b9e2
+MD5 bba8e380b4e9979dd36ad5470c4c642d files/consolekit-0.2.0-gdk-to-x11.patch 2428
+RMD160 513ae69e39444d76e8aa9c131574cf1a8d491ddc files/consolekit-0.2.0-gdk-to-x11.patch 2428
+SHA256 e5eaa0d9b3e973a8b04e59f562eb97bdab7c9be85fd8f1ba821c6a5620d6b9e2 files/consolekit-0.2.0-gdk-to-x11.patch 2428
+AUX consolekit-0.2.0-pam-lib-fix.patch 952 RMD160 bd9ae6293a11af1e16ad6ee01afffa91cf0f6e77 SHA1 d8ffaab0c6f14efcba59765fd9dbbc6f01742d2d SHA256 ece5286e68417a0ea97e22969e4b504356243a3a341a7f8bf4efdc6dd30fd610
+MD5 1dd6f88baa7a4c9b370c9aaa850893e9 files/consolekit-0.2.0-pam-lib-fix.patch 952
+RMD160 bd9ae6293a11af1e16ad6ee01afffa91cf0f6e77 files/consolekit-0.2.0-pam-lib-fix.patch 952
+SHA256 ece5286e68417a0ea97e22969e4b504356243a3a341a7f8bf4efdc6dd30fd610 files/consolekit-0.2.0-pam-lib-fix.patch 952
 DIST ConsoleKit-0.2.0.tar.gz 438833 RMD160 c23bd6ec03602b7d8c35a821e03d4069e62886de SHA1 da8472f375801fffcb3c908f64ec34ac07f0a8e5 SHA256 f2f0d902190de61eaff0776620b0c6564fa3a52c3f84fd574aef74ae30383664
+EBUILD consolekit-0.2.0-r1.ebuild 1555 RMD160 ececff211ec08982fb1a8cebcefc69961132956e SHA1 8a36e5ddef80b48d55592ca5b552031042cdbf27 SHA256 d9d74c740dcc2a23b3b92c191ff5e5d15c4eb1a303b92d2c5d0713e79c6f72c8
+MD5 3eba85ab390d6f13d82bce2e653fc9f4 consolekit-0.2.0-r1.ebuild 1555
+RMD160 ececff211ec08982fb1a8cebcefc69961132956e consolekit-0.2.0-r1.ebuild 1555
+SHA256 d9d74c740dcc2a23b3b92c191ff5e5d15c4eb1a303b92d2c5d0713e79c6f72c8 consolekit-0.2.0-r1.ebuild 1555
 EBUILD consolekit-0.2.0.ebuild 1247 RMD160 c3e58a391c7cf84118a2705da30c9785d97a7c00 SHA1 4be2d82bd2143320ca83b1caa6c20786e294de12 SHA256 b6778110aa82dbeeea0d4da72fbfef3e9e90881730fc68884038bc06c27bf3e0
 MD5 3ceb5ba1de0c3a9714b7fcf23b61bad3 consolekit-0.2.0.ebuild 1247
 RMD160 c3e58a391c7cf84118a2705da30c9785d97a7c00 consolekit-0.2.0.ebuild 1247
 SHA256 b6778110aa82dbeeea0d4da72fbfef3e9e90881730fc68884038bc06c27bf3e0 consolekit-0.2.0.ebuild 1247
-MISC ChangeLog 865 RMD160 e6f1fbbaec92c471cb3bf729e677755b385ab1ef SHA1 5b93a69ab806410a6cd2fd8d515237ad5fbb26c6 SHA256 b3ae025daeefb52c21357bb722c23c57586323d970e70845d038f9c602fa5494
-MD5 130a596d2cce4ff7b1d2503568062c3a ChangeLog 865
-RMD160 e6f1fbbaec92c471cb3bf729e677755b385ab1ef ChangeLog 865
-SHA256 b3ae025daeefb52c21357bb722c23c57586323d970e70845d038f9c602fa5494 ChangeLog 865
+MISC ChangeLog 1115 RMD160 94fe82f914a0f5fa394066db043541f07bc025fd SHA1 4fec5cd1adcb5dc6c4ea3fefda9537667acffada SHA256 17276392b79f532334169bbe9bb4cb98d157904eb37e70c5bbf8d4cfb621a5c7
+MD5 cbe8dd188ab1ec13f61f668a3bb75d4c ChangeLog 1115
+RMD160 94fe82f914a0f5fa394066db043541f07bc025fd ChangeLog 1115
+SHA256 17276392b79f532334169bbe9bb4cb98d157904eb37e70c5bbf8d4cfb621a5c7 ChangeLog 1115
 MISC metadata.xml 224 RMD160 feef623491f64af70c81f6c3e1b05703113b9ab4 SHA1 4d12cdcf7f5c2927c2e26a843c3ee575f21687c3 SHA256 cfc5350e2a164ad4374a1972a10208274c87ae9335dff0d9db2cfc11fb003954
 MD5 36894254b4c442994701559c82e7bdaf metadata.xml 224
 RMD160 feef623491f64af70c81f6c3e1b05703113b9ab4 metadata.xml 224
@@ -21,10 +33,13 @@ SHA256 cfc5350e2a164ad4374a1972a10208274c87ae9335dff0d9db2cfc11fb003954 metadata
 MD5 3360cb1575d5d8fe8e89668d23ced719 files/digest-consolekit-0.2.0 250
 RMD160 b4b2cf5298d45e0c1d920914923948777329e6d7 files/digest-consolekit-0.2.0 250
 SHA256 01485f557f43bed3188545bec07450e93de5d6e0b10a3ba871ea703743336be3 files/digest-consolekit-0.2.0 250
+MD5 3360cb1575d5d8fe8e89668d23ced719 files/digest-consolekit-0.2.0-r1 250
+RMD160 b4b2cf5298d45e0c1d920914923948777329e6d7 files/digest-consolekit-0.2.0-r1 250
+SHA256 01485f557f43bed3188545bec07450e93de5d6e0b10a3ba871ea703743336be3 files/digest-consolekit-0.2.0-r1 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGB93KKRy60XGEcJIRAk3zAJ9hCt/8bZlDNruXWZVgjL5gzDJqEQCfeCRq
-t/KXAb84dkcI0QiDgBhRxfs=
-=Ap8a
+iD8DBQFGDAzFoeSe8B0zEfwRAhg1AKCG3T/6Gsdw4OzJr3GX2z18xCjvfACeKXaX
+0+1Q7eQ+Awe/0DohWsgqEW4=
+=BfMj
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/consolekit/consolekit-0.2.0-r1.ebuild b/sys-auth/consolekit/consolekit-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..78ed3be882d8
--- /dev/null
+++ b/sys-auth/consolekit/consolekit-0.2.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.2.0-r1.ebuild,v 1.1 2007/03/29 19:01:11 cardoe Exp $
+
+inherit eutils autotools multilib
+
+MY_PN="ConsoleKit"
+
+DESCRIPTION="Framework for defining and tracking users, login sessions and seats."
+HOMEPAGE="http://if.only.it.had.one"
+SRC_URI="http://people.freedesktop.org/~mccann/dist/${MY_PN}-${PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug pam"
+
+# Not parallel make safe
+MAKEOPTS="$MAKEOPTS -j1"
+
+RDEPEND=">=dev-libs/glib-2.7
+		>=dev-libs/dbus-glib-0.61
+		>=x11-libs/libX11-1.0.0
+		pam? ( >=sys-libs/pam-0.99.7.1 )"
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-0.2.0-pam-lib-fix.patch
+	epatch "${FILESDIR}"/${PN}-0.2.0-gdk-to-x11.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	econf $(use_enable debug) \
+	$(use_enable pam pam-module) \
+	--with-slibdir=/$(get_libdir) \
+	--with-pid-file=/var/run/consolekit.pid \
+	--with-dbus-services=/usr/share/dbus-1/services/ \
+	|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	#crappy Redhat init script
+	rm -f "${D}/etc/rc.d/init.d/ConsoleKit"
+	rm -r "${D}/etc/rc.d/"
+
+	#Portage barfs on .la files
+	rm -f "${D}/$(get_libdir)/libck-connector.la"
+
+	# Gentoo style init script
+	newinitd "${FILESDIR}"/${PN}-0.1.rc consolekit
+}
diff --git a/sys-auth/consolekit/files/consolekit-0.2.0-gdk-to-x11.patch b/sys-auth/consolekit/files/consolekit-0.2.0-gdk-to-x11.patch
new file mode 100644
index 000000000000..4cc0c334309e
--- /dev/null
+++ b/sys-auth/consolekit/files/consolekit-0.2.0-gdk-to-x11.patch
@@ -0,0 +1,98 @@
+From: William Jon McCann <mccann@jhu.edu>
+Date: Mon, 26 Mar 2007 18:39:44 +0000 (-0400)
+Subject: use xlib directly instead of via gdk
+X-Git-Url: http://gitweb.freedesktop.org/?p=ConsoleKit.git;a=commitdiff;h=a2b51f00af2143a90138c6ce1df1e7e9b4ec8afa
+
+use xlib directly instead of via gdk
+---
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,7 +34,7 @@ AM_GLIB_GNU_GETTEXT
+ 
+ DBUS_REQUIRED_VERSION=0.30
+ GLIB_REQUIRED_VERSION=2.7.0
+-GDK_REQUIRED_VERSION=2.8.0
++X11_REQUIRED_VERSION=1.0.0
+ 
+ AC_CHECK_HEADERS(unistd.h)
+ AC_CHECK_HEADERS(paths.h)
+@@ -51,7 +51,8 @@ PKG_CHECK_MODULES(LIBDBUS,
+ 	dbus-1 >= $DBUS_REQUIRED_VERSION
+ )
+ PKG_CHECK_MODULES(TOOLS,
+-        gdk-2.0 >= $GDK_REQUIRED_VERSION
++        x11 >= $X11_REQUIRED_VERSION
++        glib-2.0 >= $GLIB_REQUIRED_VERSION
+ )
+ 
+ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+--- a/tools/linux/ck-get-x11-server-pid.c
++++ b/tools/linux/ck-get-x11-server-pid.c
+@@ -29,15 +29,17 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ 
+-#include <gdk/gdk.h>
+-#include <gdk/gdkx.h>
++#include <X11/Xlib.h>
++#include <glib.h>
+ 
+ static void
+ print_peer_pid (int fd)
+ {
+ #ifdef SO_PEERCRED
+         struct ucred cr;
+-        int cr_len = sizeof (cr);
++        socklen_t cr_len;
++
++        cr_len = sizeof (cr);
+ 
+         if (getsockopt (fd, SOL_SOCKET, SO_PEERCRED, &cr, &cr_len) == 0 && cr_len == sizeof (cr)) {
+                 /* paranoia check for peer running as root */
+@@ -53,18 +55,41 @@ print_peer_pid (int fd)
+ #endif
+ }
+ 
++static Display *
++display_init (int *argc, char ***argv)
++{
++        const char *display_name;
++        Display    *xdisplay;
++
++        display_name = g_getenv ("DISPLAY");
++
++        if (display_name == NULL) {
++                g_warning ("DISPLAY is not set");
++                exit (1);
++        }
++
++        xdisplay = XOpenDisplay (display_name);
++        if (xdisplay == NULL) {
++                g_warning ("cannot open display: %s", display_name ? display_name : "");
++                exit (1);
++        }
++
++        return xdisplay;
++}
++
+ int
+ main (int    argc,
+       char **argv)
+ {
+-        int fd;
+-        int ret;
++        int      fd;
++        int      ret;
++        Display *xdisplay;
+ 
+         ret = 1;
+ 
+-        gdk_init (&argc, &argv);
++        xdisplay = display_init (&argc, &argv);
+ 
+-        fd = ConnectionNumber (GDK_DISPLAY());
++        fd = ConnectionNumber (xdisplay);
+ 
+         if (fd > 0) {
+                 ret = 0;
diff --git a/sys-auth/consolekit/files/consolekit-0.2.0-pam-lib-fix.patch b/sys-auth/consolekit/files/consolekit-0.2.0-pam-lib-fix.patch
new file mode 100644
index 000000000000..d939e77a726b
--- /dev/null
+++ b/sys-auth/consolekit/files/consolekit-0.2.0-pam-lib-fix.patch
@@ -0,0 +1,33 @@
+diff -Nur ConsoleKit-0.2.0/configure.ac ConsoleKit-0.2.0-fixed/configure.ac
+--- ConsoleKit-0.2.0/configure.ac	2007-03-14 19:21:25.000000000 -0400
++++ ConsoleKit-0.2.0-fixed/configure.ac	2007-03-29 10:26:36.000000000 -0400
+@@ -12,6 +12,8 @@
+ 
+ AM_MAINTAINER_MODE
+ 
++AC_DISABLE_STATIC
++
+ AC_ISC_POSIX
+ AC_PROG_CC
+ AC_STDC_HEADERS
+@@ -199,7 +201,7 @@
+ if ! test -z "$with_slibdir"; then
+    SLIBDIR="$with_slibdir"
+ else
+-   SLIBDIR="$libdir"
++   SLIBDIR="/lib"
+ fi
+ AC_SUBST(SLIBDIR)
+ 
+diff -Nur ConsoleKit-0.2.0/pam-ck-connector/Makefile.am ConsoleKit-0.2.0-fixed/pam-ck-connector/Makefile.am
+--- ConsoleKit-0.2.0/pam-ck-connector/Makefile.am	2007-03-13 02:58:10.000000000 -0400
++++ ConsoleKit-0.2.0-fixed/pam-ck-connector/Makefile.am	2007-03-28 17:57:05.000000000 -0400
+@@ -7,7 +7,7 @@
+ 	-I$(top_builddir)/libck-connector	\
+ 	$(NULL)
+ 
+-pamlibdir = /lib/security
++pamlibdir = $(SLIBDIR)/security
+ 
+ pamlib_LTLIBRARIES = 				\
+ 	pam_ck_connector.la			\
diff --git a/sys-auth/consolekit/files/digest-consolekit-0.2.0-r1 b/sys-auth/consolekit/files/digest-consolekit-0.2.0-r1
new file mode 100644
index 000000000000..e800a7875833
--- /dev/null
+++ b/sys-auth/consolekit/files/digest-consolekit-0.2.0-r1
@@ -0,0 +1,3 @@
+MD5 e1ffc51b71e955a8703bcf31ff505f50 ConsoleKit-0.2.0.tar.gz 438833
+RMD160 c23bd6ec03602b7d8c35a821e03d4069e62886de ConsoleKit-0.2.0.tar.gz 438833
+SHA256 f2f0d902190de61eaff0776620b0c6564fa3a52c3f84fd574aef74ae30383664 ConsoleKit-0.2.0.tar.gz 438833