Clean up econf per bug #253596 and add missing deps.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

3 files changed, 18 insertions, 22 deletions

diff --git a/dev-libs/dbus-glib/ChangeLog b/dev-libs/dbus-glib/ChangeLog
index 155cb72f80c2..b32e76222e3f 100644
--- a/dev-libs/dbus-glib/ChangeLog
+++ b/dev-libs/dbus-glib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/dbus-glib
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/ChangeLog,v 1.46 2009/01/13 15:23:36 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/ChangeLog,v 1.47 2009/01/18 20:34:47 eva Exp $
+
+  18 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org> dbus-glib-0.78.ebuild:
+  Clean up econf per bug #253596 and add missing deps.
 
   13 Jan 2009; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   gentopia is becoming freedesktop
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index b490bae8ea33..57b3ef84747f 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -13,13 +13,13 @@ EBUILD dbus-glib-0.73.ebuild 1669 RMD160 5903a001d51f0abb7e21738d4a5d9ab5af78cf2
 EBUILD dbus-glib-0.74-r1.ebuild 1735 RMD160 703ffca5378fd580275716efca26737ed1f715fc SHA1 afe4b4ab57cb9acfe7d2331bc13c554b53490edc SHA256 6fa753964caf5bc0941527386981cc4bc7eaa1e15b02ac2d2e7e28a38419d3d4
 EBUILD dbus-glib-0.74.ebuild 1669 RMD160 99e73a07bfc8088436e46bc49ae17198853af813 SHA1 82a40d8f1f5ddb05328a8ed70df9c3d0dcf4ef9b SHA256 30c3fa27bfee48095351a6193f07f56c9a5fa6642f14aa01788601b2033685a5
 EBUILD dbus-glib-0.76.ebuild 1677 RMD160 8f28d710020af574b79908c550ac06b4d4c19941 SHA1 9680be5b06b405c9b2259a6d50b041a17666810c SHA256 7ba682fa2e9488cfbe98c6bbdef325eaef132acb760b3c3adc18cb22179c0b69
-EBUILD dbus-glib-0.78.ebuild 2109 RMD160 30ff218928a7ca1a917d48684d12ac21f2f1697d SHA1 9d2d9277c75432c644cb05f591213f018f30bb00 SHA256 ffb0976a095da14a09d18740b10b282a75be9b3277e87169d3b297acb56e73b6
-MISC ChangeLog 6010 RMD160 53659e714058240a03fe99739dd85eeb6f833885 SHA1 ee61e1e466b81f8a02413bb178de07c92f9d5ee3 SHA256 717d206c62be34766d17296ed3fef9429bba7afbffa2adb7fef90afbd2c4e834
+EBUILD dbus-glib-0.78.ebuild 1748 RMD160 784d5734421f10295fcf47d7d0e3b89c0e5ee7f4 SHA1 28037172b4a5b1c37991886114c9ce64a38480f5 SHA256 c052aef7bcd0b5ca6e38bbbdb8e08f44d0fa7fb35d4bdcbb8a3aaa2676f77459
+MISC ChangeLog 6140 RMD160 a591fed852c7e3cdb3b345791c3f70735b2b97f4 SHA1 6712f94e08aa450ae6fa6da3bb427db63d0a7690 SHA256 f2bbe4661e8b415f6fd0b86e5ba209989ae4cd06acaa9a6a2c9bf39a7e4518f8
 MISC metadata.xml 285 RMD160 a557848c4782030e9eeb3dc1f06d98840ad7f73a SHA1 e0ba318a0e1a819cc360ea98cc3477dcf52a1526 SHA256 f0df8a3ebe8d22c87645cf66ed8c50c4e64ded6ad1e279e9912cb5074feb5a82
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEUEARECAAYFAklssf4ACgkQoeSe8B0zEfyycACXWoN2fh5kSBmKOPhHnsfI8Z33
-DQCcDP3QCh/oRimuL02NZErhE8Y4yxM=
-=OFAw
+iEYEARECAAYFAklzkmwACgkQ1fmVwcYIWAaDvgCePT7sOR3YUqQX3Gtu/QfY6Hqj
+HToAoLKQ+KiLzYAoQ3SJNpsdzbnFfDfA
+=TzaH
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/dbus-glib/dbus-glib-0.78.ebuild b/dev-libs/dbus-glib/dbus-glib-0.78.ebuild
index 709ecb50f0ef..5647595ab790 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.78.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.78.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.78.ebuild,v 1.3 2008/12/30 19:18:01 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.78.ebuild,v 1.4 2009/01/18 20:34:47 eva Exp $
 
 inherit eutils multilib autotools bash-completion
 
@@ -11,15 +11,18 @@ SRC_URI="http://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bash-completion debug doc selinux test"
+IUSE="bash-completion debug doc test"
 
 RDEPEND=">=sys-apps/dbus-1.1.0
 	>=dev-libs/glib-2.10
-	selinux? ( sys-libs/libselinux )
 	>=dev-libs/expat-1.95.8"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	doc? ( app-doc/doxygen app-text/xmlto )
+	sys-devel/gettext
+	doc? (
+		app-doc/doxygen
+		app-text/xmlto
+		>=dev-util/gtk-doc-1.4 )
 	dev-util/gtk-doc-am"
 
 BASH_COMPLETION_NAME="dbus"
@@ -40,24 +43,14 @@ src_unpack() {
 src_compile() {
 	econf \
 		$(use_enable bash-completion) \
-		$(use_enable selinux) \
 		$(use_enable debug verbose-mode) \
 		$(use_enable debug checks) \
 		$(use_enable debug asserts) \
 		$(use_enable test tests) \
 		$(use_with test test-socket-dir "${T}"/dbus-test-socket) \
-		--with-system-pid-file=/var/run/dbus.pid \
-		--with-system-socket=/var/run/dbus/system_bus_socket \
-		--with-session-socket-dir=/tmp \
-		--with-dbus-user=messagebus \
 		--localstatedir=/var \
 		$(use_enable doc doxygen-docs) \
-		--disable-xml-docs \
-		|| die "econf failed"
-
-	# after the compile, it uses a selinuxfs interface to
-	# check if the SELinux policy has the right support
-	use selinux && addwrite /selinux/access
+		$(use_enable doc gtk-doc)
 
 	emake || die "make failed"
 }