Version bump. Fix some memory leaks, optimize object infos lookup, add 'shadowing'.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 100 insertions, 119 deletions

diff --git a/dev-libs/dbus-glib/ChangeLog b/dev-libs/dbus-glib/ChangeLog
index 39d46bc3d77d..789da70a6696 100644
--- a/dev-libs/dbus-glib/ChangeLog
+++ b/dev-libs/dbus-glib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/dbus-glib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/ChangeLog,v 1.55 2010/03/24 18:18:41 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/ChangeLog,v 1.56 2010/03/31 22:17:21 eva Exp $
+
+*dbus-glib-0.86 (31 Mar 2010)
+
+  31 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -dbus-glib-0.80.ebuild, -dbus-glib-0.82.ebuild, +dbus-glib-0.86.ebuild:
+  Version bump. Fix some memory leaks, optimize object infos lookup, add
+  'shadowing'.
 
   24 Mar 2010; Brent Baude <ranger@gentoo.org> dbus-glib-0.82-r1.ebuild:
   stable ppc, bug 310705
diff --git a/dev-libs/dbus-glib/dbus-glib-0.80.ebuild b/dev-libs/dbus-glib/dbus-glib-0.80.ebuild
deleted file mode 100644
index 579d915f9b07..000000000000
--- a/dev-libs/dbus-glib/dbus-glib-0.80.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.80.ebuild,v 1.1 2009/03/08 19:32:07 eva Exp $
-
-EAPI="2"
-
-inherit eutils bash-completion
-
-DESCRIPTION="D-Bus bindings for glib"
-HOMEPAGE="http://dbus.freedesktop.org/"
-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 test"
-
-RDEPEND=">=sys-apps/dbus-1.1.0
-	>=dev-libs/glib-2.10
-	>=dev-libs/expat-1.95.8"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext
-	doc? (
-		app-doc/doxygen
-		app-text/xmlto
-		>=dev-util/gtk-doc-1.4 )"
-
-BASH_COMPLETION_NAME="dbus"
-
-src_prepare() {
-	# description ?
-	epatch "${FILESDIR}"/${PN}-introspection.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable bash-completion) \
-		$(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) \
-		--localstatedir=/var \
-		$(use_enable doc doxygen-docs) \
-		$(use_enable doc gtk-doc)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README || die "dodoc failed."
-
-	#FIXME: We need --with-bash-completion-dir
-	if use bash-completion ; then
-		dobashcompletion "${D}"/etc/bash_completion.d/dbus-bash-completion.sh
-		rm -rf "${D}"/etc/bash_completion.d
-	fi
-}
diff --git a/dev-libs/dbus-glib/dbus-glib-0.82.ebuild b/dev-libs/dbus-glib/dbus-glib-0.82.ebuild
deleted file mode 100644
index e5afaa6bd3fd..000000000000
--- a/dev-libs/dbus-glib/dbus-glib-0.82.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.82.ebuild,v 1.1 2009/11/07 20:00:54 eva Exp $
-
-EAPI="2"
-
-inherit eutils bash-completion
-
-DESCRIPTION="D-Bus bindings for glib"
-HOMEPAGE="http://dbus.freedesktop.org/"
-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 test"
-
-RDEPEND=">=sys-apps/dbus-1.1
-	>=dev-libs/glib-2.10
-	>=dev-libs/expat-1.95.8"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext
-	doc? (
-		app-doc/doxygen
-		app-text/xmlto
-		>=dev-util/gtk-doc-1.4 )"
-
-BASH_COMPLETION_NAME="dbus"
-
-src_prepare() {
-	# description ?
-	epatch "${FILESDIR}"/${PN}-introspection.patch
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		$(use_enable bash-completion) \
-		$(use_enable debug verbose-mode) \
-		$(use_enable debug checks) \
-		$(use_enable debug asserts) \
-		$(use_enable doc doxygen-docs) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable test tests) \
-		$(use_with test test-socket-dir "${T}"/dbus-test-socket)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README || die "dodoc failed."
-
-	# FIXME: We need --with-bash-completion-dir
-	if use bash-completion ; then
-		dobashcompletion "${D}"/etc/bash_completion.d/dbus-bash-completion.sh
-		rm -rf "${D}"/etc/bash_completion.d || die "rm failed"
-	fi
-}
diff --git a/dev-libs/dbus-glib/dbus-glib-0.86.ebuild b/dev-libs/dbus-glib/dbus-glib-0.86.ebuild
new file mode 100644
index 000000000000..c297d3da4033
--- /dev/null
+++ b/dev-libs/dbus-glib/dbus-glib-0.86.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2010 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.86.ebuild,v 1.1 2010/03/31 22:17:21 eva Exp $
+
+EAPI="2"
+
+inherit bash-completion
+
+DESCRIPTION="D-Bus bindings for glib"
+HOMEPAGE="http://dbus.freedesktop.org/"
+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 test"
+
+RDEPEND=">=sys-apps/dbus-1.1
+	>=dev-libs/glib-2.10
+	>=dev-libs/expat-1.95.8"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext
+	doc? (
+		app-doc/doxygen
+		app-text/xmlto
+		>=dev-util/gtk-doc-1.4 )"
+
+# out of sources build directory
+BD=${WORKDIR}/${P}-build
+# out of sources build dir for make check
+TBD=${WORKDIR}/${P}-tests-build
+
+BASH_COMPLETION_NAME="dbus"
+
+src_configure() {
+	local my_conf
+
+	my_conf="--localstatedir=/var
+		$(use_enable bash-completion)
+		$(use_enable debug verbose-mode)
+		$(use_enable debug asserts)
+		$(use_enable doc doxygen-docs)
+		$(use_enable doc gtk-doc)"
+
+	mkdir "${BD}"
+	cd "${BD}"
+	einfo "Running configure in ${BD}"
+	ECONF_SOURCE="${S}" econf ${my_conf}
+
+	if use test; then
+		mkdir "${TBD}"
+		cd "${TBD}"
+		einfo "Running configure in ${TBD}"
+		ECONF_SOURCE="${S}" econf \
+			${my_conf} \
+			$(use_enable test checks) \
+			$(use_enable test tests) \
+			$(use_enable test asserts) \
+			$(use_with test test-socket-dir "${T}"/dbus-test-socket)
+	fi
+}
+
+src_compile() {
+	cd "${BD}"
+	einfo "Running make in ${BD}"
+	emake || die "make failed"
+
+	if use test; then
+		cd "${TBD}"
+		einfo "Running make in ${TBD}"
+		emake || die "make failed"
+	fi
+}
+
+src_test() {
+	cd "${TBD}"
+	emake check || die "make check failed"
+}
+
+src_install() {
+	dodoc AUTHORS ChangeLog HACKING NEWS README || die "dodoc failed."
+
+	cd "${BD}"
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	# FIXME: We need --with-bash-completion-dir
+	if use bash-completion ; then
+		dobashcompletion "${D}"/etc/bash_completion.d/dbus-bash-completion.sh
+		rm -rf "${D}"/etc/bash_completion.d || die "rm failed"
+	fi
+}