diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2009-08-28 14:29:46 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2009-08-28 14:29:46 +0000 |
| commit | c52aeeb3f531f9c09e033731ef31705e6ab2c73f (patch) | |
| tree | 50fbf56fe7a57851313ed2d891ff535d56db3006 /x11-apps | |
| parent | Stable on alpha, bug #279585 (diff) | |
| download | gentoo-2-c52aeeb3f531f9c09e033731ef31705e6ab2c73f.tar.gz gentoo-2-c52aeeb3f531f9c09e033731ef31705e6ab2c73f.tar.bz2 gentoo-2-c52aeeb3f531f9c09e033731ef31705e6ab2c73f.zip | |
Migrate to EAPI 2 in order to get rid of built_with_use.
(Portage version: 2.2_rc38/cvs/Linux i686)
Diffstat (limited to 'x11-apps')
| -rw-r--r-- | x11-apps/xinit/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-apps/xinit/xinit-1.0.8-r4.ebuild | 15 |
2 files changed, 9 insertions, 11 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog index edbab1007216..161cc50d7769 100644 --- a/x11-apps/xinit/ChangeLog +++ b/x11-apps/xinit/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-apps/xinit # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.130 2009/06/23 19:25:02 klausman Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.131 2009/08/28 14:29:46 betelgeuse Exp $ + + 28 Aug 2009; Petteri Räty <betelgeuse@gentoo.org> xinit-1.0.8-r4.ebuild: + Migrate to EAPI 2 in order to get rid of built_with_use. 23 Jun 2009; Tobias Klausmann <klausman@gentoo.org> xinit-1.0.8-r4.ebuild: Stable on alpha for xorg-server-1.5/xorg-x11-7.4 diff --git a/x11-apps/xinit/xinit-1.0.8-r4.ebuild b/x11-apps/xinit/xinit-1.0.8-r4.ebuild index e900df46174d..18c4644a98b0 100644 --- a/x11-apps/xinit/xinit-1.0.8-r4.ebuild +++ b/x11-apps/xinit/xinit-1.0.8-r4.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.8-r4.ebuild,v 1.12 2009/06/23 19:25:02 klausman Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.8-r4.ebuild,v 1.13 2009/08/28 14:29:46 betelgeuse Exp $ + +EAPI="2" # Must be before x-modular eclass is inherited # This is enabled due to modified Makefile.am from the patches @@ -16,7 +18,7 @@ IUSE="hal minimal pam" RDEPEND="x11-apps/xauth x11-libs/libX11 - hal? ( sys-auth/consolekit )" + hal? ( sys-auth/consolekit sys-apps/dbus[X] )" DEPEND="${RDEPEND}" PDEPEND="!minimal? ( x11-wm/twm x11-apps/xclock @@ -30,16 +32,9 @@ PATCHES=( "${FILESDIR}"/nolisten-tcp-and-black-background.patch pkg_setup() { CONFIGURE_OPTIONS="$(use_with hal consolekit)" - if use hal; then - if ! built_with_use sys-apps/dbus X ; then - eerror "You MUST build sys-apps/dbus with the X USE flag enabled." - die "You MUST build sys-apps/dbus with the X USE flag enabled." - fi - fi } -src_unpack() { - x-modular_unpack_source +src_prepare() { x-modular_patch_source sed -i -e "s:^XINITDIR.*:XINITDIR = \$(sysconfdir)/X11/xinit:g" "${S}/Makefile.am" |