From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1MgxdO-0002gh-6F for garchives@archives.gentoo.org; Fri, 28 Aug 2009 09:20:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 713F7E07E6; Fri, 28 Aug 2009 14:29:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 35327E07E6 for ; Fri, 28 Aug 2009 14:29:47 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 172E86691A for ; Fri, 28 Aug 2009 14:29:48 +0000 (UTC) Received: from betelgeuse by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1Mh2SY-0005oi-Cd for gentoo-commits@lists.gentoo.org; Fri, 28 Aug 2009 14:29:46 +0000 From: "Petteri Raty (betelgeuse)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, betelgeuse@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in x11-apps/xinit: ChangeLog xinit-1.0.8-r4.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog xinit-1.0.8-r4.ebuild X-VCS-Directories: x11-apps/xinit X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Raty Content-Type: text/plain; charset=utf8 Message-Id: Sender: Petteri Raty Date: Fri, 28 Aug 2009 14:29:46 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 412bb945-2782-450e-9042-5ce2e564bf45 X-Archives-Hash: 442d914b3670cd56d9e6ba27d0d95adb betelgeuse 09/08/28 14:29:46 Modified: ChangeLog xinit-1.0.8-r4.ebuild Log: Migrate to EAPI 2 in order to get rid of built_with_use. (Portage version: 2.2_rc38/cvs/Linux i686) Revision Changes Path 1.131 x11-apps/xinit/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/Cha= ngeLog?rev=3D1.131&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/Cha= ngeLog?rev=3D1.131&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/Cha= ngeLog?r1=3D1.130&r2=3D1.131 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- ChangeLog 23 Jun 2009 19:25:02 -0000 1.130 +++ ChangeLog 28 Aug 2009 14:29:46 -0000 1.131 @@ -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=C3=A4ty xinit-1.0.8-r4.= ebuild: + Migrate to EAPI 2 in order to get rid of built_with_use. =20 23 Jun 2009; Tobias Klausmann xinit-1.0.8-r4.ebu= ild: Stable on alpha for xorg-server-1.5/xorg-x11-7.4 1.13 x11-apps/xinit/xinit-1.0.8-r4.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/xin= it-1.0.8-r4.ebuild?rev=3D1.13&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/xin= it-1.0.8-r4.ebuild?rev=3D1.13&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/xin= it-1.0.8-r4.ebuild?r1=3D1.12&r2=3D1.13 Index: xinit-1.0.8-r4.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.8-r4.ebuild,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- xinit-1.0.8-r4.ebuild 23 Jun 2009 19:25:02 -0000 1.12 +++ xinit-1.0.8-r4.ebuild 28 Aug 2009 14:29:46 -0000 1.13 @@ -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=3D"2" =20 # Must be before x-modular eclass is inherited # This is enabled due to modified Makefile.am from the patches @@ -16,7 +18,7 @@ =20 RDEPEND=3D"x11-apps/xauth x11-libs/libX11 - hal? ( sys-auth/consolekit )" + hal? ( sys-auth/consolekit sys-apps/dbus[X] )" DEPEND=3D"${RDEPEND}" PDEPEND=3D"!minimal? ( x11-wm/twm x11-apps/xclock @@ -30,16 +32,9 @@ =20 pkg_setup() { CONFIGURE_OPTIONS=3D"$(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 } =20 -src_unpack() { - x-modular_unpack_source +src_prepare() { x-modular_patch_source =20 sed -i -e "s:^XINITDIR.*:XINITDIR =3D \$(sysconfdir)/X11/xinit:g" "${S}= /Makefile.am"