Add patch to fix testsuite bug #356699. Switch to EAPI=5. Clean up old revision

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 88 insertions, 32 deletions

diff --git a/dev-libs/dbus-glib/ChangeLog b/dev-libs/dbus-glib/ChangeLog
index 5af5110005d9..7a703d0624f3 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/ChangeLog,v 1.110 2012/10/14 14:58:21 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/ChangeLog,v 1.111 2013/01/13 17:50:03 eva Exp $
+
+*dbus-glib-0.100-r2 (13 Jan 2013)
+
+  13 Jan 2013; Gilles Dartiguelongue <eva@gentoo.org> -dbus-glib-0.98.ebuild,
+  +dbus-glib-0.100-r2.ebuild, +files/dbus-glib-0.100-fix-tests.patch:
+  Add patch to fix testsuite bug #356699. Switch to EAPI=5. Clean up old
+  revision
 
   14 Oct 2012; Raúl Porcel <armin76@gentoo.org> dbus-glib-0.100.ebuild:
   ia64/m68k/s390/sh/sparc stable wrt #416725
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index 8d82c68b8da0..e60a03636560 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -2,18 +2,18 @@
 Hash: SHA256
 
 AUX dbus-glib-0.100-dbus-glib-sections.txt 5087 SHA256 894c0ad9d9b6ed4c2d2ea51cd14d36a82a61009e24c3c5fb17b3262f7a514b84 SHA512 01be4ec1c6753fe2b4e6ed50fe66ef5ea2cb6d2ae2fbf2606e75ab7bdb36f33ec8322e2f5aae2ff52784e629f89f941eaea06609144aa51934c395b7554f6368 WHIRLPOOL a085eb66dbbbfadb991d297b780c9c1bae00d18602dada4bf79158b284d10f08cf139c028e9859dba66b2bf51d8a74228aefd10421118ee3a3a4933be123c6d1
+AUX dbus-glib-0.100-fix-tests.patch 1591 SHA256 6cbc8cb71aa702e4a12e52582bb1df9737c3c1f6f0f58177e3097a20ba690e2a SHA512 8e60d56d3db1f063d949abef914791ad6aaa5a1f22f3fed5cd0dc097e5b400ad7299cdae6dc42d8382a04d359c1b1e5f4b34e714ab123c42cbd7691ddd87e89a WHIRLPOOL e62753ec9b4a17fbe88283c7dd9886262375c4f0bee424a2732b673246ebc163bee72ed0cb73711dc49f5fc00c9c7e5159512e3640ca3d0cc5a80f6bb6eb94d2
 AUX dbus-glib-0.98-glib-2.31.patch 625 SHA256 a987b9411ceee6f52e1f0be64051c57c6819f0acd7c54cca6bf54df5e562dec3 SHA512 ba12dd3abb08adbb77281286e983a1ff53f0696ddb986707709b9ee06fbef0e5e9b5ce9ef33f9cc48998c81112cc78d0476504a0e827aec0adc612984911edb3 WHIRLPOOL 62f26424487befa5947d087ea4a8513f3768f61ff9a5be84bfe0eb58bbb736202b5f8421161602a8c2c3d81c456239280276936305a5ea09391202a7c399ac70
 DIST dbus-glib-0.100.tar.gz 730875 SHA256 80ddf7584a659590103817798dd95d7e451d666f385e5e95a83abf85c46d4605 SHA512 b1b9687ba0ce60393cd5b7b71804669a95f22b1c659d4bf02cc67c3e85302732b954009e24987c6ce3694eb31eebcc439e1d8222a3d4bd8631106e4015a35228 WHIRLPOOL b1057c92971f9a97ba3dfcc122864341c0afd1b2d0bec089a6202f196eafba9c56e49eb008100ea28ebd3c5a727ccfacc835bbb06a0d84aa4ede6b54e38a8f91
-DIST dbus-glib-0.98.tar.gz 723825 SHA256 297c81d6bb8b1c312e9b0ccfe91eb28ec0672756abb64dfb7bbe2b5f1ae5d111 SHA512 aaa63b46f09340b68655378b2890c20a359336ba43e6113bea801a1b219e459df909d518cfacae2ebd10a6a1470f362f915c372e2d905baa1510eddd2aced544 WHIRLPOOL 244cb87026b6cd6fb699f76e5d0e0055a31ce1799605a1f255a7750c1a2ecbfdf986252dbe73fd09215253ffb0d394852f2b7933ccd0668a835990e925143c76
 EBUILD dbus-glib-0.100-r1.ebuild 2246 SHA256 240bed693a06884ea9db3b3966e3a8a7618d04e9b2c59631f2d483835b90d65a SHA512 ba330b2ad50ca41bbbe4bf2c99eb75f3c2d4b559fa658c76d7427f6a1dabfb99196a607092c84bf037e0350de4579c9d733f6bd8274ccbd214178a46b6acea19 WHIRLPOOL 13b47517fc18286d73c84f0227f7ae38d8d1d63326eccd3838e28a2331976f9aa944279b52e0c62c97f64ba2669455ce789a03d558dace6cd1e9e780624650b0
+EBUILD dbus-glib-0.100-r2.ebuild 2327 SHA256 2ecb67183bd5d9dbe10607141aa5f2c513a0c938ed14ce848ab73143a816c8fb SHA512 86b7348e2641cc23d515c643dccdddd6c0ccbc48c6601ac2bd0e366b6c358047322013a972760bac2aab9cfab551b4c1413e1d72f5b998d1fdbe52bd8e1c8393 WHIRLPOOL f1eea8bc0264074dc0e1b4dea5c245cedba8a49aad6707d2ce67f6c84a6e228f7d6aead5f13c60d4f6eff6465b8608df3799ecb494eebb6d32ac10395dfdcb48
 EBUILD dbus-glib-0.100.ebuild 2085 SHA256 67fb56b3540ab7ac7e1179e59c443c2c43c191ccfb327ea7af0cacbe72510b60 SHA512 609336e352229ba297c9d8ec7492e3c3f4d7037754d06aa95d1f16834bc3dd0159f25d50632aa38279a810c18c16a8ed0ef49ec37547356d9b74aa1c17104fa3 WHIRLPOOL 775bd05478c24f55c17031cf5dcb2cccc0577d75edcd05e779e821459ea49fca5f815be37e0b5c518fa034324d89d5584a99822a03ffd301755014c40319774d
-EBUILD dbus-glib-0.98.ebuild 2206 SHA256 8f5c5999ac7601a6255158e7410ae3af500f62f3e82fb92ca1b1d59d6d5bdaee SHA512 2a84a87b24b8f65798ee6c2773ffc35423f0900bf834b72c3485afb2496b8b4c76988ceca037e356a227edd44a1c4f12b0b559b662a9e3d85b7186e39bd04f27 WHIRLPOOL 6f574417c576b0e607e5f01aa2dbaa091ff4a11c26b5cee2a1bc801bfc0b1b72ea190c336e0251d4894fb09abb6d6179fa8c027078256c8d19cc72e006724d48
-MISC ChangeLog 14670 SHA256 c6861839a277f622ff03e1956b9f1407328bc5d6ff6f08754ab21ff008858e27 SHA512 5d3854a72a13b30fc98055aa035a0af0aed5009995d98b2a68b633d4bfd661e3a32b068315bc0ec731cd5be7c57722bd38a79b75b0e00e12338abc7232099723 WHIRLPOOL 6bc8ad5aeca4bc95f405fd2d3ffcb590c9c356e8d2c6591c6b564fc750f4223dce2fc11a2b8628960bd71ab95822b0fef105c25c425f173d089c1ee582aed13a
+MISC ChangeLog 14934 SHA256 507cf52505997724933bd117f608c6feb1aeaa6728cb95bab5ed365c40b0707b SHA512 1ef9dd7358df7eb42732139d0451fccd034590611064a30b8295ded306dc9efc5bc10f0ec164d4fc72bdb85d8d79226fa4556e9e3a901251ba638529edffe0a8 WHIRLPOOL 79e677e11149642d23c9e5bf257425ff8663d9e6a64d142c1f72dff29531fe95d5205d943ca4dfdd802fdf1dd0232873dba7f860d5cc65700d402a221d6378e1
 MISC metadata.xml 244 SHA256 552982cb042dce6d0051aef928f3cca7553e6d7327e0556f97f9e6e52e651b6c SHA512 9f697206cf152d13b2a3e26645959ab3353a34e4158832139689359aad999114afb8ed80e2f82464674f358434a891d74f2e94079c2c57fc7a125d17e735ff71 WHIRLPOOL 47f92e411c189c765f6665e28402aa0411ebe898b306925cf395ed23085738120fb4075682d6c86f5818de5a3d70cfeca2fda163e3eb83764ba0b4d8dce1fb04
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlB60w4ACgkQuQc30/atMkBjDwCfeiZt9jPhZsXbpGAvx9aZ4KBK
-3JwAn3zEb/k879KDi4mtdazlXhOA3Lua
-=5x1L
+iEYEAREIAAYFAlDy880ACgkQ1fmVwcYIWAbmcwCeMt8ky9I1zoCBhPr0Cn+a5M5C
+J5AAn3P9K64/jhrCbIrAvF/0SmXptwdY
+=lqsz
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/dbus-glib/dbus-glib-0.98.ebuild b/dev-libs/dbus-glib/dbus-glib-0.100-r2.ebuild
index f6a23c19f4e1..56cb0f47b770 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.98.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.100-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.98.ebuild,v 1.11 2012/05/06 00:29:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.100-r2.ebuild,v 1.1 2013/01/13 17:50:03 eva Exp $
+
+EAPI="5"
 
-EAPI=4
 inherit bash-completion-r1 eutils
 
 DESCRIPTION="D-Bus bindings for glib"
@@ -11,15 +12,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 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug doc static-libs test"
 
-RDEPEND=">=sys-apps/dbus-1.4.16
+RDEPEND="
+	>=dev-libs/expat-2
 	>=dev-libs/glib-2.26
-	>=dev-libs/expat-2"
+	>=sys-apps/dbus-1.6.2
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
+	doc? ( >=dev-util/gtk-doc-1.4 )
+"
 
 # out of sources build directory
 BD=${WORKDIR}/${P}-build
@@ -27,31 +31,35 @@ BD=${WORKDIR}/${P}-build
 TBD=${WORKDIR}/${P}-tests-build
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-glib-2.31.patch
+	# Fix testsuite, bug #356699 (in next release)
+	epatch "${FILESDIR}"/${PN}-0.100-fix-tests.patch
+
+	# Wrong sections.txt file in the tarball; https://bugs.freedesktop.org/show_bug.cgi?id=55830
+	cp "${FILESDIR}/${P}-dbus-glib-sections.txt" doc/reference/dbus-glib-sections.txt || die
 }
 
 src_configure() {
-	local myconf
-
-	myconf="--localstatedir=${EPREFIX}/var
+	# gtk-doc needs to be built when using out-of-source build
+	local myconf=(
+		--localstatedir="${EPREFIX}"/var
 		--enable-bash-completion
 		$(use_enable debug verbose-mode)
 		$(use_enable debug asserts)
-		$(use_enable static-libs static)
 		$(use_enable doc gtk-doc)
-		--with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html"
+		$(use_enable static-libs static)
+		)
 
 	mkdir "${BD}"
 	cd "${BD}"
 	einfo "Running configure in ${BD}"
-	ECONF_SOURCE="${S}" econf ${myconf}
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 
 	if use test; then
 		mkdir "${TBD}"
 		cd "${TBD}"
 		einfo "Running configure in ${TBD}"
 		ECONF_SOURCE="${S}" econf \
-			${myconf} \
+			"${myconf[@]}" \
 			$(use_enable test checks) \
 			$(use_enable test tests) \
 			$(use_enable test asserts) \
@@ -62,30 +70,26 @@ src_configure() {
 src_compile() {
 	cd "${BD}"
 	einfo "Running make in ${BD}"
-	emake
+	default
 
 	if use test; then
 		cd "${TBD}"
 		einfo "Running make in ${TBD}"
-		emake
+		default
 	fi
 }
 
 src_test() {
 	cd "${TBD}"
-	emake check
+	default
 }
 
 src_install() {
-	# NEWS file is obsolete
-	dodoc AUTHORS ChangeLog HACKING README
-
 	cd "${BD}"
-	emake DESTDIR="${D}" install
+	default
 
-	# FIXME: We need --with-bash-completion-dir
 	newbashcomp "${ED}"/etc/bash_completion.d/dbus-bash-completion.sh dbus
 	rm -rf "${ED}"/etc/bash_completion.d || die
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	prune_libtool_files
 }
diff --git a/dev-libs/dbus-glib/files/dbus-glib-0.100-fix-tests.patch b/dev-libs/dbus-glib/files/dbus-glib-0.100-fix-tests.patch
new file mode 100644
index 000000000000..3d4ac1deb877
--- /dev/null
+++ b/dev-libs/dbus-glib/files/dbus-glib-0.100-fix-tests.patch
@@ -0,0 +1,45 @@
+commit 1a61c71e4037ebea5db7dc2f0fdceae764e47e17
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date:   Thu Jun 28 12:54:02 2012 +0100
+
+    my_object_unsafe_disable_legacy_property_access: have the right signature
+    
+    I'm amazed this ever worked.
+    
+    Bug: https://bugs.freedesktop.org/show_bug.cgi?id=51511
+    Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+    Reviewed-by: Colin Walters <walters@verbum.org>
+
+diff --git a/test/core/my-object.c b/test/core/my-object.c
+index 82b6322..e31dca3 100644
+--- a/test/core/my-object.c
++++ b/test/core/my-object.c
+@@ -859,10 +859,12 @@ my_object_async_throw_error (MyObject *obj, DBusGMethodInvocation *context)
+   g_idle_add ((GSourceFunc) do_async_error,  data);
+ }
+ 
+-void
+-my_object_unsafe_disable_legacy_property_access (MyObject *obj)
++gboolean
++my_object_unsafe_disable_legacy_property_access (MyObject *obj,
++    GError **error)
+ {
+   dbus_glib_global_set_disable_legacy_property_access ();
++  return TRUE;
+ }
+ 
+ extern GMainLoop *loop;
+diff --git a/test/core/my-object.h b/test/core/my-object.h
+index d50d0b4..779efac 100644
+--- a/test/core/my-object.h
++++ b/test/core/my-object.h
+@@ -116,7 +116,8 @@ void my_object_async_increment (MyObject *obj, gint32 x, DBusGMethodInvocation *
+ 
+ void my_object_async_throw_error (MyObject *obj, DBusGMethodInvocation *context);
+ 
+-void my_object_unsafe_disable_legacy_property_access (MyObject *obj);
++gboolean my_object_unsafe_disable_legacy_property_access (MyObject *obj,
++    GError **error);
+ 
+ void my_object_emit_objectified (MyObject *obj, GObject *other);
+