Fix building with older glib (bug #436236, thanks to Sasha Medvedev). Update license. Inherit user.eclass.

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

7 files changed, 47 insertions, 30 deletions

diff --git a/net-wireless/gnome-bluetooth/ChangeLog b/net-wireless/gnome-bluetooth/ChangeLog
index b7403b81599d..e74113ac8635 100644
--- a/net-wireless/gnome-bluetooth/ChangeLog
+++ b/net-wireless/gnome-bluetooth/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/gnome-bluetooth
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.116 2012/09/23 14:06:14 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.117 2012/09/27 20:19:00 tetromino Exp $
+
+  27 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-bluetooth-2.32.0.ebuild, gnome-bluetooth-2.32.0-r1.ebuild,
+  gnome-bluetooth-3.2.2.ebuild, gnome-bluetooth-3.4.2.ebuild,
+  gnome-bluetooth-3.4.2-r1.ebuild:
+  Fix building with older glib (bug #436236, thanks to Sasha Medvedev). Update
+  license. Inherit user.eclass.
 
   23 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
   gnome-bluetooth-3.4.2-r1.ebuild:
diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest
index cf82f20d2e9a..ec775464e3ae 100644
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -12,17 +12,21 @@ DIST gnome-bluetooth-2.32.0.tar.bz2 1231205 SHA256 57b1f06c96a1b85e1c19ff919d708
 DIST gnome-bluetooth-3.2.2.tar.xz 1143476 SHA256 30ba375f4d9b08fc31b9eb86f17ea2d3fc1696b3e778236270414260d4e26905 SHA512 a49200d8364d478e9011e79fa2437917a204f8fa608cd9fd829102969efbfd149b0a5878ee8259750d37047dcb70ff457e4a52e035194ba4abe81925b37211f8 WHIRLPOOL bb5ee05143c6506205c9c25010b49cc14d9ffffaa7334920df75bd2640bf2a172ad7b6d1f7ea8f34858a39d169ad85e4720539ab097e6f46dbdc6ae6da53f731
 DIST gnome-bluetooth-3.4.2.tar.xz 1139628 SHA256 c58480f1687aca048444d5e4dbd306594d0785c8e6e74f99fa0b13e57fdad4de SHA512 8b1cd88db5088b71f8b44f2c12ba96efeb13d69746e3f00d3de80568c236542710e6adeb85559045b136fbd12d2f0010639883388aacf3a740c96fa0effa4e86 WHIRLPOOL af9b89764f81177041001be731b2508a51a8a18c01668b59cf5360f8e8114ad2913660cf01c7c89bc70eca814ccf0aad69094e4d118f7515607fa4780443bc57
 DIST introspection.m4.bz2 1181 SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae SHA512 4af08dc9a7b495949b61861d7e1a1184650dc33ab1b595544d8bef14d397a3759d97361650ab0e4812390f5fb5e812818937a2d5121246c651edd7d39a076a11 WHIRLPOOL 6b9de2bee5898a9645c07c68586df5e96205d52fb6a6c77c971e8c0742f8436fce76de2b553d0533fbbe4976363180b49ae201c1a1303dfa05585db32ebc61fc
-EBUILD gnome-bluetooth-2.32.0-r1.ebuild 2923 SHA256 db3937ce16ecdb86997bf4495d0573ab60f6e5b93a133bf1ca84d1c63794161c SHA512 a49b5450a410601446087ac392b599fa241e9a8dca3f1ab43871fde8a7201a7854cee17b9e51339bc93df47743113657cc16154f23c5f4b8f8c66f100d73d802 WHIRLPOOL 1cbad201e12ea923453a11013841b90732d794be8e9e78c4edfa0c3c388395354ef4817b1eaead67fa2f9dd77d059a184120627de0111239fdb749105b1eccfd
-EBUILD gnome-bluetooth-2.32.0.ebuild 2816 SHA256 440e787787c0ded640819e261be1ce99ac4b26d3b09da41a448052a8ad954dd9 SHA512 9a22ba606c4c6e07d15c529fcf25208370093b0880e11b897c61ffc814b6cfff3265236d18fae372d058ea345531176c9e580edd1805fcd70590df99c1f44459 WHIRLPOOL ca2e61b1bb13206557aa5d31efae0df540e7fe54deca49943984a8a78df10cf916c9c2a58857b373006e8324b6e303b39c77b85f92f629cf86623f2a1550c55e
-EBUILD gnome-bluetooth-3.2.2.ebuild 2380 SHA256 06209f7f35fd3846aca34dad203302b8c8c4c2130f813ef5ccb8423cae119e1e SHA512 e2108fef585cc426b4392c57f8b0d2d356ddb44e913afef44a1a620001c4a5016a03422b0c0dc6b35dc81b41a5206d8b4545c35d0e13d694764abf3c31f8eb72 WHIRLPOOL fee33b35e4983e890df47306443c80f33cca02547abb6577c385821d658a4901a8830695f3674a052396c30d40761aa0112bd7ac335da151df2682f0e7c11a3a
-EBUILD gnome-bluetooth-3.4.2-r1.ebuild 2120 SHA256 8a76256de8ce4c58dc2100e9052d697e44c7968a1679e856aae853e216279eed SHA512 e1709cdf1d157dbbdda844aa75b31176ae64a6e587f764c1698fc32475a13526023a7e2b993c2211beff6ae2656c2851bc9635089d3de4c515ccb588c56d585e WHIRLPOOL d2940e6d03da84c3c68a3f03a0f6016d3aeb3be2d431dfaeaeeec641149e9cfd78b16fb097af0dad91234c5a44eaf91c8d5f702a621f078fcb5934c4a50eb4c0
-EBUILD gnome-bluetooth-3.4.2.ebuild 2033 SHA256 cd2c65d80f6a87da8ebfdf68f4e861210446ffd13696573acea8dd95427ef42d SHA512 8585098958afba2979c622886e63f2852ca76fe187bba5c74c978518795b380ecdc8bbed9c6efd511de0a67fa0cc1c0af6fa04382ccbeb26fcf5c5a8f98adcaf WHIRLPOOL e32987696a01a32592d267516bf4c6907ae20f48e1067b99712f2c13f443f2ffbf15ee5178b878d123018a9cab4e77b75d850a3b53f2ee2f66c4b28582fc6b58
-MISC ChangeLog 20306 SHA256 14e2a6ca808a7b257ac210387ed1c4d2d4b46829caabc573b1208914778eb3c8 SHA512 333abb8327e60cf78b11e00369fe08871f8521cc4ced8bed6a461943af7b1fc82f67244e97be40e8aeedc79c3eeae8cbf055cc945a130e8a31ae51b7d101e0ee WHIRLPOOL 8f4769e7c84bf435315986f45520e4b89752ee4aef8fa4f9d24ef62f3b085495613b39cc95f82537710374ef2b6cae8f08c78a57b927b85bf1400d38c971bce3
+EBUILD gnome-bluetooth-2.32.0-r1.ebuild 2944 SHA256 1b54119bc275dc993bfaf45d3fc20ae8e7f0f0a77e84035cfe1b8e46e39e8c1e SHA512 826207f592b2786a13a0501f39b412105911a60fb02ecc761a49e2dcdee27a97e55f86d270ed4618d985b53214fd405ee49ed8e80e7e4255d13206e6de40233a WHIRLPOOL a081ceaaf2f471abb6d6aef8bc1ec2d6ea147ff5b83d75417f1739c2eb68a2fe88b5da5a26fcf5aab6f7b44eae8a22bd1d0fb47f8bd921f35ca2377efbe8bca4
+EBUILD gnome-bluetooth-2.32.0.ebuild 2837 SHA256 f34164766a51e8c7f89b1d1845fa1f7b2bd69d148d5b8c852018c1f75d63b1c1 SHA512 1f696ecbe2227b91066a9b8e8d25c4cac31bbb4a05367d1cac403f3024764d3b59d8ba5c63db15663ba46e11e6fe8315fbda2e94a5169557639b1eec10e7dc03 WHIRLPOOL 1e523a71fe56812efc0ec1408f188194f037b83db1fd9d4170476148881a11b85ea64cdd67b907105de17378cdf53d77cba7569159b09bed7845ca271d7cda36
+EBUILD gnome-bluetooth-3.2.2.ebuild 2398 SHA256 c798aa67dc8405b0a5605cb9ce2302ad31e1b0b9d524d303b9ab2ec3d1eec8c5 SHA512 a707f4c1b2966b2ffa443a1ddbdf4bd1f5a3209fb6d7a2661844a5674339f1c68e6155da6a5db441726ecc8c27d58bca7319416b37441287a1d599149ea4ca55 WHIRLPOOL e72b35f40b72407dd2e5918bc5810fa9deecb3e899b967de1e238dab782de80cee0f45abf541b8127f86ade3b756ebe499a9a267978da94097d08beb602186fb
+EBUILD gnome-bluetooth-3.4.2-r1.ebuild 2303 SHA256 9e5db13efab852040d7b16d74e6a1e46547d5dcb51b47fbf103068d2fd48444e SHA512 94370863a11f35604d9f545d326fe173a3e2e1fb030ec84be1935ea3704719e21f20396657254434629aa93c280779a521d36ba4ed7fba0fadf5411c47e4b451 WHIRLPOOL 9ca1033e0c9b90f2c346dec7fb89313b8e85b404483b6d932bcfa6e7253378003b9ee4e0d17605c51a330f346a8fb2ca46a61931dd65cac38678396426c8a084
+EBUILD gnome-bluetooth-3.4.2.ebuild 2051 SHA256 e0ec2d156af1bd021c0d5e244ef867667decddd841f000aad50b5c7ee9ca3456 SHA512 0adc665157e318b4c2550e2cf4a55fc9abd133518c2bcefb2c29550d0ac9dd6a2e7c990d127bda90327e2c2dd9e440c4ab37b58447495573b75569d781c94c34 WHIRLPOOL 4c8af74e468aef6054ab5240f94221346c57cb08acacd2ca21bfd8b9cb184c9867114189f590226ca95767d5aa5ebab50eaa9f07bd7ab0202485aa744d8b7419
+MISC ChangeLog 20642 SHA256 08c5ca8507c11af933c1d61f47ddc94c433712eab8265e4c2e6840607e3bedc4 SHA512 df9d7d2439de93af9937e837b622780f0ee093cfd57fbecd2e7601efbd5cebdfb3f872a8d5b6124c29abd4e4979bd4020db29e361b1250618ffa77d91a34e1a5 WHIRLPOOL 55e0a3693b04ef131f39cfe435d346c1bcf02eae37c4ed649850937a284c915bf110119e304a8ce3751a26cdad9a762ef388c183ab773736e665d17c306a9807
 MISC metadata.xml 483 SHA256 32facf84ef6faf2d4818fa36a090d88bf4db5efdd6d75611125ae9000712d718 SHA512 23f8ab7d6a450dd892e1a19b7c0e7c95c59b660a8e36f8bf1e7641b119a6402e604a6d3053fb58f6a95c3ddebd32cce48d37955fe40aa54929c897f56afe4c05 WHIRLPOOL c925bfcd6016d7544c764c7c402e17f11df374d3f30fa121c9553b3f1219e090b807653e315ea9b930f5acee7a1f6f5a325f0c2d1f004bd4cca1b211dc1770a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBfF1sACgkQl5yvQNBFVTV9DQCgpFte42r+mGU2C1T4bM64XXg+
-aeEAn0yFZw4cp5rzVuM0eEz8hUEa41DD
-=84zs
+iQEcBAEBCAAGBQJQZLS7AAoJEJ0WA1zPCt1hAbsIAJeZQS8O5VNg7T8EcAQCtpEl
+7BycE8RF4tJ+oqbAyrpJeAki+zqirPO9cQ1/PXsb3n6WAqIwX2hZHSC3WlAv8uYZ
+hSbfVFFZb8sOaq2XZMZc/ASNT+YDCHZzBIR+h4R0prLvEN/fCnwdSarb5AgN+J0R
+HPelXls7TGnmSFsozWyx6ET+yThLfVhOM626zuNVRznSxCGl4nSfpBmKfM68IX0B
+uCifU3UmYg1IgvX0yki3J9cxi1KJQ1iMd+LFnsPaYpG6uGZOXq6OBzAEo/dMOsiL
+nhlmWgWduKVNKSOzogd2PQu0AS2fEtPMGPsT253Vy9JUk8WicZKFYG75Br0sj4A=
+=zLPr
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0-r1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0-r1.ebuild
index f71ecf3a5a6a..a7c3140fad10 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0-r1.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0-r1.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0-r1.ebuild,v 1.5 2012/05/04 06:41:55 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0-r1.ebuild,v 1.6 2012/09/27 20:19:00 tetromino Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
 GCONF_DEBUG="yes"
 GNOME_TARBALL_SUFFIX="bz2"
 
-inherit eutils gnome2 multilib autotools
+inherit eutils gnome2 multilib user autotools
 
 DESCRIPTION="Fork of bluez-gnome focused on integration with GNOME"
 HOMEPAGE="http://live.gnome.org/GnomeBluetooth"
 SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2"
 
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
 SLOT="2"
 KEYWORDS="amd64 ppc x86"
 IUSE="doc +introspection nautilus test"
@@ -35,7 +35,7 @@ DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/gnome-doc-utils
 	app-text/scrollkeeper
-	dev-libs/libxml2
+	dev-libs/libxml2:2
 	dev-util/intltool
 	virtual/pkgconfig
 	sys-devel/gettext
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0.ebuild
index f698f9df4a5d..438dfce92bab 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0.ebuild,v 1.16 2012/05/04 06:41:54 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0.ebuild,v 1.17 2012/09/27 20:19:00 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
 
-inherit eutils gnome2 multilib autotools
+inherit eutils gnome2 multilib user autotools
 
 DESCRIPTION="Fork of bluez-gnome focused on integration with GNOME"
 HOMEPAGE="http://live.gnome.org/GnomeBluetooth"
 SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2"
 
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
 SLOT="2"
 KEYWORDS="amd64 ppc x86"
 IUSE="doc +introspection nautilus"
@@ -33,7 +33,7 @@ DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/gnome-doc-utils
 	app-text/scrollkeeper
-	dev-libs/libxml2
+	dev-libs/libxml2:2
 	dev-util/intltool
 	virtual/pkgconfig
 	sys-devel/gettext
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.2.2.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.2.2.ebuild
index 286b52700958..3d930bec148a 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.2.2.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.2.2.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-3.2.2.ebuild,v 1.4 2012/06/04 06:51:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-3.2.2.ebuild,v 1.5 2012/09/27 20:19:00 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 # libgnome-bluetooth-applet.la is needed by gnome-shell during compilation
 GNOME2_LA_PUNT="no"
 
-inherit eutils gnome2 multilib
+inherit eutils gnome2 multilib user
 
 DESCRIPTION="Fork of bluez-gnome focused on integration with GNOME"
 HOMEPAGE="http://live.gnome.org/GnomeBluetooth"
 
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
 SLOT="2"
 IUSE="doc +introspection sendto"
 KEYWORDS="~amd64 ~x86"
@@ -37,7 +37,7 @@ DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/gnome-doc-utils
 	app-text/scrollkeeper
-	dev-libs/libxml2
+	dev-libs/libxml2:2
 	>=dev-util/intltool-0.40.0
 	virtual/pkgconfig
 	>=sys-devel/gettext-0.17
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.4.2-r1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.4.2-r1.ebuild
index 894a5f4c5264..fe26ac6583a1 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.4.2-r1.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.4.2-r1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-3.4.2-r1.ebuild,v 1.5 2012/09/23 14:06:14 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-3.4.2-r1.ebuild,v 1.6 2012/09/27 20:19:00 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2 multilib toolchain-funcs
+inherit eutils gnome2 multilib toolchain-funcs user
 
 DESCRIPTION="Fork of bluez-gnome focused on integration with GNOME"
 HOMEPAGE="http://live.gnome.org/GnomeBluetooth"
 
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
 SLOT="2"
 IUSE="doc +introspection sendto"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
@@ -33,7 +33,7 @@ DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/gnome-doc-utils
 	app-text/scrollkeeper
-	dev-libs/libxml2
+	dev-libs/libxml2:2
 	>=dev-util/intltool-0.40.0
 	dev-util/gdbus-codegen
 	>=sys-devel/gettext-0.17
@@ -62,6 +62,12 @@ pkg_setup() {
 	enewgroup plugdev
 }
 
+src_prepare() {
+	# Regenerate gdbus-codegen files to allow using any glib version; bug #436236
+	rm -v lib/bluetooth-client-glue.{c,h} || die
+	gnome2_src_prepare
+}
+
 src_install() {
 	gnome2_src_install
 
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.4.2.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.4.2.ebuild
index 256afccf3747..4b00cd8b47b5 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.4.2.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.4.2.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-3.4.2.ebuild,v 1.1 2012/07/04 23:29:09 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-3.4.2.ebuild,v 1.2 2012/09/27 20:19:00 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2 multilib
+inherit eutils gnome2 multilib user
 
 DESCRIPTION="Fork of bluez-gnome focused on integration with GNOME"
 HOMEPAGE="http://live.gnome.org/GnomeBluetooth"
 
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
 SLOT="2"
 IUSE="doc +introspection sendto"
 KEYWORDS="~amd64 ~x86"
@@ -33,7 +33,7 @@ DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/gnome-doc-utils
 	app-text/scrollkeeper
-	dev-libs/libxml2
+	dev-libs/libxml2:2
 	>=dev-util/intltool-0.40.0
 	dev-util/gdbus-codegen
 	>=sys-devel/gettext-0.17