diff options
author | Doug Goldstein <cardoe@gentoo.org> | 2007-03-29 19:01:11 +0000 |
---|---|---|
committer | Doug Goldstein <cardoe@gentoo.org> | 2007-03-29 19:01:11 +0000 |
commit | 455c1a614286b37021b803fa1ca58b5cc49d51d2 (patch) | |
tree | 567d4f717bb9a030ed84ae627cb0d10913b686f8 /sys-auth/consolekit | |
parent | Added ~ppc64 (diff) | |
download | gentoo-2-455c1a614286b37021b803fa1ca58b5cc49d51d2.tar.gz gentoo-2-455c1a614286b37021b803fa1ca58b5cc49d51d2.tar.bz2 gentoo-2-455c1a614286b37021b803fa1ca58b5cc49d51d2.zip |
Change GTK+ depend to X11. Fix /lib/ issues.
(Portage version: 2.1.2.2)
Diffstat (limited to 'sys-auth/consolekit')
-rw-r--r-- | sys-auth/consolekit/ChangeLog | 9 | ||||
-rw-r--r-- | sys-auth/consolekit/consolekit-0.2.0-r1.ebuild | 61 | ||||
-rw-r--r-- | sys-auth/consolekit/files/consolekit-0.2.0-gdk-to-x11.patch | 98 | ||||
-rw-r--r-- | sys-auth/consolekit/files/consolekit-0.2.0-pam-lib-fix.patch | 33 | ||||
-rw-r--r-- | sys-auth/consolekit/files/digest-consolekit-0.2.0-r1 | 3 |
5 files changed, 203 insertions, 1 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/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 |