convert to multilib, bug #494468 by Christoph Junghans

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 108 insertions, 16 deletions

diff --git a/dev-libs/dbus-glib/ChangeLog b/dev-libs/dbus-glib/ChangeLog
index edf112d01d41..c63a86aabaa7 100644
--- a/dev-libs/dbus-glib/ChangeLog
+++ b/dev-libs/dbus-glib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/dbus-glib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/ChangeLog,v 1.138 2013/06/05 00:16:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/ChangeLog,v 1.139 2013/12/30 08:35:13 aballier Exp $
+
+*dbus-glib-0.100.2-r1 (30 Dec 2013)
+
+  30 Dec 2013; Alexis Ballier <aballier@gentoo.org>
+  +dbus-glib-0.100.2-r1.ebuild:
+  convert to multilib, bug #494468 by Christoph Junghans
 
   05 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
   Add upstream CPE tag (security info) from ChromiumOS.
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index f7e04a61df4d..babd74b2432c 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -4,23 +4,14 @@ 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
 DIST dbus-glib-0.100.2.tar.gz 748836 SHA256 a5bb42da921f51c28161e0e54a5a8241d94a1c0499a14007150e9ce743da6ac5 SHA512 f7bbbeac189a724b7f95dce42e8adaf533a1d1c038521990d0eb2cb41c3f088a93d432c257a75dcce31419a55020455084d983b9471ace385c497f659a39ef59 WHIRLPOOL f5c23dab0e78fada494c3bf55c7db62bc2993789ad89a26507d499dc654d2ced22522909f191029f796bee181c4d587dad86fd72d727085add759602c3a8a90f
+EBUILD dbus-glib-0.100.2-r1.ebuild 2556 SHA256 481b97ccc0915c2a36aeab1a788ec3856498e6af3bcc5e8bfd3a9f4a16c1fbec SHA512 3987dc5b0cc2385cb1d564d37d2780b69a3d4ef1fc76c0f7e775e941520f3fa1fe687d80ee8a65236e885b9b414ef1ea5a983f97f90e274328e57262f0e5721d WHIRLPOOL 00b26c8f38c062ebe68d71485c2cbf374b68f37ac4156d36dfb8747922072e0dd10d14c8710ff5b7c444b0a6f8818557207a98961948ac0f4f6f03e8d4c473c3
 EBUILD dbus-glib-0.100.2.ebuild 2360 SHA256 16b99fa0669235b959f5ec3ea2f725959917a43eaaa26baae8a3e5e3a3851cb5 SHA512 42c2ea91e48102f79b7cab3c249f2199bffb1578b3d505885870d1abf1ee5949528e7406626dcde39418bd8ace4ff3a1a1cd48a08f436cc49fa4c00b730b5f69 WHIRLPOOL 2fcbb4551fba6a7b38fc9ff1a9b73a76a258551df6ebc336b5eae681f0c4966b13b2d1cbfd0ed78c476c1d8006e2d3c3323d4997455149649de27b7f26f3ee2d
-MISC ChangeLog 18237 SHA256 8f245883e4c3ea2bc473533ff6f29e1ba155c205a7470d9438e0cd5e62d5e098 SHA512 bd4b44d72e16781e2d41edbb4d772a118ea51783ca5d716a6c760bdaba3b258278f666111cf277734132f3d1c87af09de599d30f2a184d985248a45be73a9c4c WHIRLPOOL d6f79c916dc618ff247861f40d3a84cc7f14cf1d187e0fb20f170af517204e768ceb8569cd9b8f250d5791bdacbde70d4e0d8984c43f720fd88b3d6843e1cd24
+MISC ChangeLog 18418 SHA256 9ab62cd7f5b928b81d4f25502936e00878fe44b974c9e8b6ffee662027b67e31 SHA512 7c7e5911ee5e7e7651f223217bbc14b98c8189ac3ce51fcd4a347005bf5cffecce4f13be632339b9bc0344230aedd83d63d347b0ccd70ad65138c1ea0e0861ef WHIRLPOOL 1f2c1b1eaa75b7c1efbd313667de2407d5b466618a2636b9a9340f0b554468abc4dec7835518c6b9d8cdf5003998e0bb8883691a530dd39c50d24ed33e34be49
 MISC metadata.xml 338 SHA256 45aae49f98a1fa143d6638f9c8883bd4e2147029d1976e8fe2c67b821e38a716 SHA512 9585c9d220740849c14532682e24dad1bd36bb4c4bd512864f12409b72a72512f6bffea7e04cec543ffac41d10337819e4a7493798f85e3a06a8845030f94aed WHIRLPOOL d2e660d2c6e654897f03c20f0ad4159e52129d590f08d3f379b2cc9554f47cf15017995ed2f17240c0c51b963b76c2f06b5fa3d6c5cefc60a7c25b4260122cf9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRroNfAAoJELEHsLL7fEFW+PUP/RrNYNxskGZA84HO3NO2/Uq4
-mFbINNxarky9taG75/1y0KQq3TmVEbBV3kkOHenMa2P/A5BTsA4PWdO1CrQdIAVl
-yonh1GXSO9WkkmEhT/8ADIGi0w58mD1Q8/yqhSynPwJglNZUK76QE8ezd9B9CRJs
-mlr8LgmQ0L7r0uSlecOjRwEymqLVXUYsBYmlP3ZWjtJR8aIXXJfBmY7Yp4iT3u68
-U8ktYWLL43FKOIAMp4sGTox603sPlXJbgGXBENTT8NZfkSE2JD7ecpLP+l3oCD9z
-2jhwI2x+FUCP2u+KhxiVcg0oKZwv0SaaTVornGNl7LqUXB/F4qw45M7mjmHri8Em
-0sj3piXZPNRnfD3xVxE16csBH/EEsKzdNr8wMN3+7Aj0ymyxCqz32xeStFETRBrA
-WkgTTnb2Xgc8pC9Wo5ZsFi9BE0nOXKFyxaXm7eG/Yo2L5PTSlJYJyhktK6SGeQZ5
-A1syASqRDMVIencfw5Kq3olsW6hYCxWTA/Yu3/PxOZOfUJfLCqKE/XSgJvMNoLGb
-VHqjeplbBMQCWFnZXUe6AkhgaAm9BdM5JAHY6WIBzbE5BjK0/bwyfEkAsBj17cNw
-23DgPaev5D1kMRq0XvxNCC64urLIUmrjQe9O6ZbZ8YLl0cGpKNLYLi8ae1ODuMpY
-O28VhMv4GC/umyYbgcpB
-=DALc
+iEYEAREIAAYFAlLBMEIACgkQvFcC4BYPU0qDiwCeIEW4jpDJ6r9RIS7NTXfZcqVr
++K8AniZOkO22b6m/SoqDX07DFcH1iNzg
+=Wvd/
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/dbus-glib/dbus-glib-0.100.2-r1.ebuild b/dev-libs/dbus-glib/dbus-glib-0.100.2-r1.ebuild
new file mode 100644
index 000000000000..708a95708a74
--- /dev/null
+++ b/dev-libs/dbus-glib/dbus-glib-0.100.2-r1.ebuild
@@ -0,0 +1,95 @@
+# 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.100.2-r1.ebuild,v 1.1 2013/12/30 08:35:13 aballier Exp $
+
+EAPI=5
+inherit bash-completion-r1 eutils multilib-minimal
+
+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 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="debug doc static-libs test"
+
+CDEPEND=">=dev-libs/expat-2[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1.6.2[${MULTILIB_USEDEP}]"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.4 )"
+RDEPEND="${CDEPEND}
+	 abi_x86_32? (
+	 	!<app-emulation/emul-linux-x86-baselibs-20131008-r8
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+# NEWS file is obsolete
+DOCS=( AUTHORS ChangeLog HACKING README )
+
+set_TBD() {
+	# out of sources build dir for make check
+	export TBD="${BUILD_DIR}-tests"
+}
+
+src_prepare() {
+	# Fix testsuite, bug #356699 (fixed in git master)
+	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}"/${PN}-0.100-dbus-glib-sections.txt doc/reference/dbus-glib-sections.txt || die
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}"/var
+		--enable-bash-completion
+		$(use_enable debug verbose-mode)
+		$(use_enable debug asserts)
+		$(use_enable static-libs static)
+		$(multilib_build_binaries && use_enable doc gtk-doc || echo " --disable-gtk-doc")
+	)
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if use test; then
+		set_TBD
+		mkdir "${TBD}"
+		cd "${TBD}"
+		einfo "Running configure in ${TBD}"
+		ECONF_SOURCE="${S}" econf \
+			"${myconf[@]}" \
+			$(use_enable test checks) \
+			$(use_enable test tests) \
+			$(use_enable test asserts) \
+			$(use_with test test-socket-dir "${T}"/dbus-test-socket)
+	fi
+}
+
+multilib_src_compile() {
+	emake
+
+	if use test; then
+		set_TBD
+		cd "${TBD}"
+		einfo "Running make in ${TBD}"
+		emake
+	fi
+}
+
+multilib_src_test() {
+	set_TBD
+	cd "${TBD}"
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	newbashcomp "${ED}"/etc/bash_completion.d/dbus-bash-completion.sh dbus
+	rm -rf "${ED}"/etc/bash_completion.d || die
+
+	prune_libtool_files
+}