Bump to EAPI=3, add prefix keywords

(Portage version: -svn/cvs/Linux i686)

3 files changed, 22 insertions, 18 deletions

diff --git a/sys-auth/consolekit/ChangeLog b/sys-auth/consolekit/ChangeLog
index 3c32268cc353..5d7247b5575d 100644
--- a/sys-auth/consolekit/ChangeLog
+++ b/sys-auth/consolekit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-auth/consolekit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.62 2010/02/28 18:47:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/ChangeLog,v 1.63 2010/03/30 08:27:33 abcd Exp $
+
+  30 Mar 2010; Jonathan Callen <abcd@gentoo.org> consolekit-0.3.0-r2.ebuild,
+  consolekit-0.4.1.ebuild:
+  Bump to EAPI=3, add prefix keywords
 
   28 Feb 2010; Raúl Porcel <armin76@gentoo.org> consolekit-0.4.1.ebuild:
   Add ~alpha/~arm/~ia64/~sparc
diff --git a/sys-auth/consolekit/consolekit-0.3.0-r2.ebuild b/sys-auth/consolekit/consolekit-0.3.0-r2.ebuild
index efe58e72f903..5c8e7850748d 100644
--- a/sys-auth/consolekit/consolekit-0.3.0-r2.ebuild
+++ b/sys-auth/consolekit/consolekit-0.3.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.3.0-r2.ebuild,v 1.9 2009/10/28 18:20:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.3.0-r2.ebuild,v 1.10 2010/03/30 08:27:33 abcd Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit autotools eutils multilib pam
 
@@ -16,7 +16,7 @@ SRC_URI="http://people.freedesktop.org/~mccann/dist/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="debug doc pam policykit"
 
 RDEPEND=">=dev-libs/glib-2.16
@@ -63,19 +63,19 @@ src_configure() {
 		$(use_enable doc docbook-docs) \
 		$(use_enable pam pam-module) \
 		$(use_enable policykit polkit) \
-		--with-pam-module-dir=/$(getpam_mod_dir) \
-		--with-dbus-services=/usr/share/dbus-1/services/ \
-		--localstatedir=/var
+		--with-pam-module-dir=$(getpam_mod_dir) \
+		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services/ \
+		--localstatedir="${EPREFIX}"/var
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
 	# crappy Redhat init script
-	rm -f "${D}/etc/rc.d/init.d/ConsoleKit"
+	rm -f "${ED}/etc/rc.d/init.d/ConsoleKit"
 
 	# Portage barfs on .la files
-	rm -f "${D}/$(get_libdir)/security/pam_ck_connector.la"
+	rm -f "${ED}/$(get_libdir)/security/pam_ck_connector.la"
 
 	# Gentoo style init script
 	newinitd "${FILESDIR}"/${PN}-0.1.rc consolekit
diff --git a/sys-auth/consolekit/consolekit-0.4.1.ebuild b/sys-auth/consolekit/consolekit-0.4.1.ebuild
index ebd211552dc2..3e4154aa69bd 100644
--- a/sys-auth/consolekit/consolekit-0.4.1.ebuild
+++ b/sys-auth/consolekit/consolekit-0.4.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.1.ebuild,v 1.5 2010/02/28 18:47:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/consolekit-0.4.1.ebuild,v 1.6 2010/03/30 08:27:33 abcd Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit autotools eutils multilib pam
 
@@ -17,7 +17,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 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="debug doc pam policykit"
 
 RDEPEND=">=dev-libs/glib-2.16
@@ -57,19 +57,19 @@ src_configure() {
 		$(use_enable doc docbook-docs) \
 		$(use_enable pam pam-module) \
 		$(use_enable policykit polkit) \
-		--with-pam-module-dir=/$(getpam_mod_dir) \
-		--with-dbus-services=/usr/share/dbus-1/services/ \
-		--localstatedir=/var
+		--with-pam-module-dir=$(getpam_mod_dir) \
+		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services/ \
+		--localstatedir="${EPREFIX}"/var
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
 	# crappy Redhat init script
-	rm -f "${D}/etc/rc.d/init.d/ConsoleKit"
+	rm -f "${ED}/etc/rc.d/init.d/ConsoleKit"
 
 	# Portage barfs on .la files
-	rm -f "${D}/$(get_libdir)/security/pam_ck_connector.la"
+	rm -f "${ED}/$(get_libdir)/security/pam_ck_connector.la"
 
 	# Gentoo style init script
 	newinitd "${FILESDIR}"/${PN}-0.1.rc consolekit