Missing dev-util/intltool and x11-proto/xproto dependencies. Fix USE="udev" handling (sys-apps/dbus is only used for it per configure).

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

3 files changed, 23 insertions, 34 deletions

diff --git a/lxde-base/lxsession/ChangeLog b/lxde-base/lxsession/ChangeLog
index 597cb9ab20f7..6d130904b11b 100644
--- a/lxde-base/lxsession/ChangeLog
+++ b/lxde-base/lxsession/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for lxde-base/lxsession
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/ChangeLog,v 1.23 2011/01/26 20:13:12 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/ChangeLog,v 1.24 2011/01/26 20:40:20 ssuominen Exp $
+
+  26 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> lxsession-0.4.5.ebuild:
+  Missing dev-util/intltool and x11-proto/xproto dependencies. Fix USE="udev"
+  handling (sys-apps/dbus is only used for it per configure).
 
   26 Jan 2011; Markos Chandras <hwoarang@gentoo.org> lxsession-0.4.5.ebuild:
   Add missing dbus,nls useflags. Use udev flag for upower
diff --git a/lxde-base/lxsession/Manifest b/lxde-base/lxsession/Manifest
index 2e445a4c3175..4f37eecaab92 100644
--- a/lxde-base/lxsession/Manifest
+++ b/lxde-base/lxsession/Manifest
@@ -1,26 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 DIST lxsession-0.4.4.tar.gz 245804 RMD160 86225d6759f85cbe20c6bcbf06843847076cd424 SHA1 e76d437abb111bda2b83cc7de541790bcbca0c17 SHA256 5d9304697fbc872f34e60728d046b10a0f41322099be828bae461b6b9ab617f8
 DIST lxsession-0.4.5.tar.gz 259755 RMD160 49fa3d1b282a3508304502eb3b0b93f0dc8dc239 SHA1 e66fd5d1f239f4cea6195218fbfab7bce19cd884 SHA256 f65625a491f4d7aee24f1fb0e183a6abc9bd31a5fa8411eac125b2d00adeff15
 EBUILD lxsession-0.4.4.ebuild 713 RMD160 19bc20a004abf6ee7ae2641f7cbd5a5d3b5b144e SHA1 e933b173604404fbfdbaa4e02dde9ea580c73fdf SHA256 0dfe6dfd5b8f67614375d20ec22f5699b4c09898801b7106b84f644d576f9181
-EBUILD lxsession-0.4.5.ebuild 863 RMD160 81a638b7e264801c5e67ab80f84f8cce60118f03 SHA1 d44042c6fad511f87df0cc4f2aad2c12b7c89295 SHA256 cea7bcd372982c3068eea665be6ccbbdad4166cb04d4665a9c625ea04e9fa66d
-MISC ChangeLog 3309 RMD160 4ebc646d9e79bafb6e8a2fa69abe31811c8f4ea3 SHA1 8a676979c3ab6e137225393f09b6c1eecff8c31e SHA256 84ab2b3d33eadfdd9ffc96cfecb2a5db5017701107c518d50fe6288d66059b82
+EBUILD lxsession-0.4.5.ebuild 959 RMD160 2670942a693d598ac050b50e1cdfbdfc86f48efa SHA1 44317bb164d2ccc7d18293642c300b4bac15b60f SHA256 90450ac667624ca449aa226ed15430373944e7f97fa2758a2fab99b263835333
+MISC ChangeLog 3529 RMD160 11ee19a492845aebb1ba99428b82761061833572 SHA1 4ea4885e1003d67e182592ddbc21bd625d93faa9 SHA256 1720f8c82285c344611f26667b8462488d16b0a9b2ab4f82ec2b705c4ecf43b2
 MISC metadata.xml 159 RMD160 35036c133a5c9c7edccc3cdfed5789092f884048 SHA1 bdf1b7cc6ffbdd223b6f05aa072e857dfc981c4f SHA256 09574ccad15f69d5367ecbb1a491cd636fb88582f69987d2ec217109dfe8befb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJNQIAFAAoJEPqDWhW0r/LCBnkP/jJB5X/BNxfXYXvCqPirleuK
-UDgvF5eelePDYzrRcAB2TY87VUPpMBtvPmyVECNnEpxXpFbr29/36Ji80IXaN7dr
-Eec7GbGnLt21CroguhiwRSxM5wO8u5hr8ArA1uqsISMWDA4hGU96v9+2krT24Dy+
-jGzuiKAtVLzi2zNzA7aCIT89TqH9TRc4u9i2JNqOvrHlPBDH4gRDeujGr0YBbzvU
-IKghm9kAqr8i8BorWMwetewW7gaR1+mCxbT6PN1z7h9RD98R0Afq29ALhV/9zCzQ
-+or5QaqMM1AISLsZNaOn+vMzwuUK59RV4y9WsH1YGFDuWWD84rb5vx7CqjeSuj8L
-DXB3Z2PfcVT1iCwtFBlAFBWnn5LkA8JHCSr8huNyWP/KaYYtuAHms3uR53cggApp
-JXXZWegZjgO0+d/7kbLjKqs2KRZu+B/HejYJC02Iaas8EhXZyPxj42ilxGuByzRK
-EyCv7K+SH//GBo6lplrwOOhLjNh5zaTcB+mFbYz9QK3TN7A5tIANmuT5Bn95ofEi
-Ge7mctOfVwI6jwZ2gSgW8xh3oUP7YmbHge02+36HXBNp9eTgzuDCSZMhiuRyQsIU
-r6C2sYTNoNe2lOJPmhwMK16dmQCHYwzW9RGvLpwzct8QIE8t+tzOOOHQn9eZeg1f
-nsCktMdgnLpuRSn9TobP
-=gbQm
------END PGP SIGNATURE-----
diff --git a/lxde-base/lxsession/lxsession-0.4.5.ebuild b/lxde-base/lxsession/lxsession-0.4.5.ebuild
index 69ce8f4fb676..f046e97fc5ee 100644
--- a/lxde-base/lxsession/lxsession-0.4.5.ebuild
+++ b/lxde-base/lxsession/lxsession-0.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/lxsession-0.4.5.ebuild,v 1.2 2011/01/26 20:13:12 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/lxsession-0.4.5.ebuild,v 1.3 2011/01/26 20:40:20 ssuominen Exp $
 
 EAPI="2"
 
@@ -11,25 +11,30 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
 SLOT="0"
-IUSE="dbus nls udev"
+IUSE="nls udev"
 
-RDEPEND="dev-libs/glib:2
+COMMON_DEPEND="dev-libs/glib:2
 	x11-libs/gtk+:2
-	sys-apps/dbus
 	>=lxde-base/lxde-common-0.5.0
-	udev? ( sys-power/upower )"
-DEPEND="${RDEPEND}
+	x11-libs/libX11
+	udev? ( >=sys-apps/dbus-1.4.1 )"
+RDEPEND="${COMMON_DEPEND}
+	udev? ( >=sys-power/upower-0.9.5 )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
 	dev-util/pkgconfig
-	sys-devel/gettext"
+	sys-devel/gettext
+	x11-proto/xproto"
 
 src_configure() {
 	econf \
 		--disable-dependency-tracking \
-		$(use_enable dbus) \
-		$(use_enable nls)
+		$(use_enable udev dbus) \
+		$(use_enable nls) \
+		${myconf}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README || die "dodoc failed"
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README || die
 }