diff options
-rw-r--r-- | net-wireless/gnome-bluetooth/ChangeLog | 9 | ||||
-rw-r--r-- | net-wireless/gnome-bluetooth/Manifest | 19 | ||||
-rw-r--r-- | net-wireless/gnome-bluetooth/files/61-gnome-bluetooth.rules | 11 | ||||
-rw-r--r-- | net-wireless/gnome-bluetooth/gnome-bluetooth-3.6.1.ebuild (renamed from net-wireless/gnome-bluetooth/gnome-bluetooth-3.2.2.ebuild) | 68 | ||||
-rw-r--r-- | net-wireless/gnome-bluetooth/metadata.xml | 2 |
5 files changed, 60 insertions, 49 deletions
diff --git a/net-wireless/gnome-bluetooth/ChangeLog b/net-wireless/gnome-bluetooth/ChangeLog index bf0abcd9cb5b..3f14bb6f065b 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.121 2012/12/11 21:59:34 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.122 2012/12/24 11:12:03 eva Exp $ + +*gnome-bluetooth-3.6.1 (24 Dec 2012) + + 24 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org> + +files/61-gnome-bluetooth.rules, -gnome-bluetooth-3.2.2.ebuild, + +gnome-bluetooth-3.6.1.ebuild, metadata.xml: + Version bump for Gnome 3.6. Switch to EAPI=5, ACL support for udev rules. 11 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> gnome-bluetooth-2.32.0-r1.ebuild, gnome-bluetooth-3.2.2.ebuild: diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest index 0bf28872e047..6eaf38ff1ffa 100644 --- a/net-wireless/gnome-bluetooth/Manifest +++ b/net-wireless/gnome-bluetooth/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX 61-gnome-bluetooth.rules 399 SHA256 3590ead9f0f5344b8dd7b73d11ce2750711072f26d12ad76c48f38ec75641b72 SHA512 74fd95e2afb3d3f13df72bb593ae6644a3a4975e43f5f50c622f14f756861596ef92aa331200d9fce6ff3976e8a1ed57e4053186b7a9716039ace971a6dfed0d WHIRLPOOL 5562bbf15568c101aabdbba0d0f9b17ae9ca289da8100b3ae82077fd53fdf46b00736f729a444f4ebec13e7f6bdcd5a1b27e548fc7881722d5984efde0eed5fd AUX 80-rfkill.rules 117 SHA256 81b3a8a3a3639b6d6024043364ad4917b32a85fd7f766e4051211d388e165798 SHA512 dcd7173ea905e41a8d583fc11f5fb04774b42e80a6bbc4d37896d041cf05938ffb98202cda1e56f8ec8a6708d2a09dcbf1f5309f775fb746ea29e4eb63939c14 WHIRLPOOL 47cc05faa13ca9811ddbaec36c3544c52dc42ad58d67e786f5bf91ac65a76d60c0e323df1e4c6cad006332e9244d7a63a78ae11a49b27c21b70be8b6a2b06df5 AUX gnome-bluetooth-2.32.0-fix-typo.patch 823 SHA256 0cd8c2bc6e3a3eb94ba317f9599c86ecea9db4981e3ae27286004a8027b3c421 SHA512 a51a5d1aa57d339615cdabb9e7ef5865fc16bd67d0a6d43000149ef801e13af2d76be390fcb6664f090be931af9f6220585a446775addb701d634688086f2378 WHIRLPOOL 185ca55cc90c065f724959ba536fd9d60d6e2d7d0e21a77f54b511d3734ddcdf983af50887e06b3c9868a1640964b9db75c52b232abb1770cdb3b08a504fb15d AUX gnome-bluetooth-2.32.0-introspection-build.patch 7550 SHA256 65d0326ffc06315d14e1d5790230edcae77b2ecb477c86792fed814639f0ad9f SHA512 9ef14a5e1dd52b7e97db4c8a4b45fa9b8372b1dc4796f12b64cd52d6cbe775862efc6fc1edf8b5ea190969121b038fcaff793f250547a0597edf3dca6c5c5ac3 WHIRLPOOL 631f3b74ee2b4976de58b3754a9a512763b6ff846b64960ba80a9a793c1df8d2dc8da5a039ef0cb6d0a0cf8e7996c73fce3b8839346b6ee30fc733949dae2242 @@ -9,22 +10,18 @@ AUX gnome-bluetooth-2.32.0-nsd-automagic.patch 989 SHA256 5db8f82ff311c6181cdf70 AUX gnome-bluetooth-2.32.0-pin-quirk.patch 812 SHA256 a1d703840e2c81d621225fd4b68e67627e8c09a8d3fcd857bf68f2c2521e21c0 SHA512 4fc021d7d6f01e29729e79a9ad1607d412b4402fe08d17d0621957f4dc0a45d8e31a246bff2b3cd3df6b584ffefdf8afa3dad5a196b78c89882104003032c041 WHIRLPOOL 991c28c4e793db1f26792cab5918abfaaa87b3647c936ee1f8d08a3abf5ab6818190e34181e4a46815f1994cc708a66b8ae0046403e03256f94027a5326e8e08 AUX gnome-bluetooth-2.32.0-update-dtd.patch 800 SHA256 6bdbe47e15f89d61702a30ad9e5d1b6f569617e2d683833b698dbfb8ff8b0783 SHA512 d0bbe586c319ee78e4f0b39c56d0f4eced7fd83092a8e4bd90c4e4d2ff8cba1f97accf4718d4aec0d798df9fcd2243f1d4e33289d440ab2fba3e816d52cffc26 WHIRLPOOL 107b95615b1e6f4e7f42e377d9f91e42baef34d38f58238724326bb2bee97b621b69c67523bd6b3a0d17d1a7b188e820a9aa770858c32a686805a3a6e074ed83 DIST gnome-bluetooth-2.32.0.tar.bz2 1231205 SHA256 57b1f06c96a1b85e1c19ff919d708cc38e95edae658881ed99968c325839a973 SHA512 ba4a301ba0f2f3010722af910082c805a0bfa7981e0c4b84e68437908fda5a8314db720418e21aca4fa4dcdb830cdcd6bdc9a591802e08dce167d415f72b52ec WHIRLPOOL 052faa04f4fefc769e797035a64aa14724cc2d0404066b2f74ddfb38ed27c9eac49fd3f14c19acb44a83723bc2d2459950fe85fb4d39366974a3b83e10c43735 -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 gnome-bluetooth-3.6.1.tar.xz 1335268 SHA256 71d72a4637916450987f69c71d374c5bc1102be6dd9d9d7f923aa924659f768a SHA512 9ae64b7d2edc308244a2ece81b1700524da89730a04df9dfbf81999af601ab23f7ed1bf6056bf39787a153f8c59fd354ac4713b54ef31bd4ec530d60fd229a62 WHIRLPOOL f842e39f1b474331fba5f9d1d9bb65c94450ca5cde06fd43bb4526882999fcc68c49129b63229a40f595800a7f7ec2ba3a61f53eb180342fc35cd7ce0b197e63 DIST introspection.m4.bz2 1181 SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae SHA512 4af08dc9a7b495949b61861d7e1a1184650dc33ab1b595544d8bef14d397a3759d97361650ab0e4812390f5fb5e812818937a2d5121246c651edd7d39a076a11 WHIRLPOOL 6b9de2bee5898a9645c07c68586df5e96205d52fb6a6c77c971e8c0742f8436fce76de2b553d0533fbbe4976363180b49ae201c1a1303dfa05585db32ebc61fc EBUILD gnome-bluetooth-2.32.0-r1.ebuild 2920 SHA256 208e708fb88d55312516e27a7508efbe7d310ac8492e5514cfb2b7b3b385235a SHA512 80a206d359ffe61b497683c8ecc4d1104b84ad67f61b1916fdd36b0aa1f9ceb39e6a5e370c7c4d6f9ac4bb8f065599a7ff755fb32c1f3a2fcdfff9a7f27807fc WHIRLPOOL 78bf5e0cc6f3c85a5c1670c0edf34f258ad347ee05d9e558d96b38ba04848b9e28a42a595dddb168487ce284a35574e8e3f18225e36dc1ebd3d52cc912b1d653 -EBUILD gnome-bluetooth-3.2.2.ebuild 2374 SHA256 3b5618d22093262ab60c09a353fde1e59fd2908f9d413404590ec76949e1352a SHA512 db49feda518f008ea9517e17e186f679cb09a88ab953f896f60824af17ee5a11e12e855b63168fe5e2d36ce4e36d320ca09da84d4d87232707094829ce757c0f WHIRLPOOL 922053b030186c78e80de555ce644ff3fb7209e7a6ee409731752129fa39e9ca15bc376a56169c3772ecbcd4280d422c9e2ed60aa22172daf44a701029ececf0 EBUILD gnome-bluetooth-3.4.2-r1.ebuild 2216 SHA256 ad1e873310840734cafb179e7bd067445202d010b68c1dd2176de694fbf36f04 SHA512 5faeeed5a3f8f3b9a4fe2b880476c88a2886d7b985e363687bbae0611afb8584bfbcbf46fadcd12d45c6f937a96e8f4f5e5169f4a39f42abae203e3c77a3b8d1 WHIRLPOOL e986204e70559e2e30a5f629201fbc0181dcfbe83895a3d98780a1e5760ced6b4409ee6997a681f03f156ed729aeec2b6c474df9fe26a17b902c90ee8f90a212 -MISC ChangeLog 21338 SHA256 5f06e74a5f1d0c720ddc514f783b3fc3a22dfdbc0317f4d05c1c65ff832d271c SHA512 8e10238fbc4eb8a07f520e876a2b855ceb11cd1f84f66801d47089015958694eb87c32f2d0ebd526ae06f1eb9cd2a669f75c3cc7b0916bd693ac57b98eb0f1cc WHIRLPOOL fab84a8e547bff9bf219c82d071e185211db1fcb43d08bc514c092637f30968ca4637e0bc14cfb6746b771853d71a77fdc20e3520192193e688c6cc9c8b2f9fd -MISC metadata.xml 446 SHA256 9c3877d368e7e88e47919361b3e3d3fdf64b2c5eedde6842ed8a7b57777e6c6b SHA512 02a216c00f2ba587c67705a28d46cda9f67776a571f756f78407bccd50a4f4de5e5eb949f24ea469bb412b6cd1146801a1a924c4b5c5d170494db4e4f5b4b957 WHIRLPOOL 1c8a2f39c5b28d8f957c140b0c914f6453db515ded964d41f4b1ef6073e2846b2275b271b988cdf181084a4c39bc9fe3f1a298576eda35a410686c252192e123 +EBUILD gnome-bluetooth-3.6.1.ebuild 2195 SHA256 621cd2b25fbe90a7b35932a867cfc5bf2f618ada91745904508d0ecd70cbb356 SHA512 3cde2eb37f1557ac85c433bf1e6ab73a8a109b49e2d53442ccb230fa4caf1884d236c1d461a6a952661fefcad27c8765dd070dd3b1a6229e4ff74de675d8f121 WHIRLPOOL cd7c00485adabda71c985064929a5aff84216a1f701aeb88c733a8d6e51b726b271f82ea7d3a0caa0d2f5ffd81bda68abbadfff324e2f37de1f686d956c701ab +MISC ChangeLog 21614 SHA256 66f37772d48dabd7a98678d9fd646661d7877c5948cfe651b9c7ed3807268ef4 SHA512 005acbbf6aeaea3ef15bbdc4c097298a5d2757c0d52ea7a9a68a9fffc5522015f1e1f8a2ba042ddc5e01d3074cf9ab47303f9f0d1b54460afb6a8155fe2ddf5b WHIRLPOOL 2818cd4ff167d9716bca61ec39c46d5d24fdfd96a22f45d2b67a51f4b21d5fb7241ddcf34d978ee507d0e9526f2e4ec8fd106576fb5730eb903d08177bb61ad0 +MISC metadata.xml 345 SHA256 28714d1b815044fc0f784338c55aad2e8a185eb5f4247e1ae201de45f3dd8849 SHA512 2993152c4410f92564b77dbe139fd42ee77cee55e99ee9bd09aaba130050a31070150f3c96f4bbf9ca687fb0a88ad5c094618024dd69924585c126971d4cc94e WHIRLPOOL 4da7ae9efc8ec2dda79fa1cf1bf41c88d2fafc6b93ffd7e96fb4c4c48095d0fb85a0d0a5fbed4b380a966444a7dbaa2f5b810e26446b822a03953e8e4c3101e9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJQx6zHAAoJEEdUh39IaPFNL04H/jTym7ECUvbmH+OwvNWmtY64 -GvKWnqK1lz0gOVu2XB98hlkBq4rqK08P3HwxuHQJk6zbTZd6khUt3vI4PRE3Fyog -8Rqr2HzgVf98317NHTYmhDhM/UBhEq3xCyVT1SUvgS0xoIVlTarCZK7tu1A91Wkg -on7/DNBVkJv54G9S5/N5eVi3nxVZugjU2UFgxfJsRpDkOMdWCdmvX6fNx8MHOs6u -nt8reepUtLDM9+ltqtliZxZvuWEa0Bsolk/2nJAKCljW4qZuennZrJ+ilU4AjPJm -rJJTwtRJukCkzrkdQ95OYiIlNiQ4yhU18ns28jjOEBCBIX4Hhiaf7rj1b7E/Yfk= -=p7ga +iEYEAREIAAYFAlDYOIQACgkQ1fmVwcYIWAaA8QCgzNcGsLkB/FamP5D7CIS5HVGh +xMoAn3tHk3OAp2RkCVzI99MOKL4JRsGD +=eD3f -----END PGP SIGNATURE----- diff --git a/net-wireless/gnome-bluetooth/files/61-gnome-bluetooth.rules b/net-wireless/gnome-bluetooth/files/61-gnome-bluetooth.rules new file mode 100644 index 000000000000..506574082122 --- /dev/null +++ b/net-wireless/gnome-bluetooth/files/61-gnome-bluetooth.rules @@ -0,0 +1,11 @@ +# Get access to /dev/rfkill for users +# See https://bugzilla.redhat.com/show_bug.cgi?id=514798 +# +# Updated for udev >= 154 +# http://bugs.debian.org/582188 +# https://bugzilla.redhat.com/show_bug.cgi?id=588660 + +ENV{ACL_MANAGE}=="0", GOTO="gnome_bluetooth_end" +ACTION!="add|change", GOTO="gnome_bluetooth_end" +KERNEL=="rfkill", GROUP="plugdev", MODE="0664", TAG+="udev-acl" +LABEL="gnome_bluetooth_end" diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.2.2.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.6.1.ebuild index 37b5d16cf1c2..9001f5f5be14 100644 --- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.2.2.ebuild +++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.6.1.ebuild @@ -1,26 +1,25 @@ # 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.7 2012/12/11 21:59:34 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-3.6.1.ebuild,v 1.1 2012/12/24 11:12:03 eva Exp $ -EAPI="4" +EAPI="5" GCONF_DEBUG="yes" -# libgnome-bluetooth-applet.la is needed by gnome-shell during compilation -GNOME2_LA_PUNT="no" +GNOME2_LA_PUNT="yes" -inherit eutils gnome2 multilib user udev +inherit eutils gnome2 multilib udev user DESCRIPTION="Fork of bluez-gnome focused on integration with GNOME" HOMEPAGE="http://live.gnome.org/GnomeBluetooth" LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+" SLOT="2" -IUSE="doc +introspection sendto" -KEYWORDS="~amd64 ~x86" +IUSE="+introspection sendto" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -COMMON_DEPEND=">=dev-libs/glib-2.25.7:2 +COMMON_DEPEND=">=dev-libs/glib-2.29.90:2 >=x11-libs/gtk+-2.91.3:3[introspection?] - >=x11-libs/libnotify-0.7.0 - >=dev-libs/dbus-glib-0.74 + >=x11-libs/libnotify-0.7:= + virtual/udev introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) sendto? ( >=gnome-extra/nautilus-sendto-2.91 ) @@ -28,54 +27,51 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.7:2 RDEPEND="${COMMON_DEPEND} >=net-wireless/bluez-4.34 app-mobilephone/obexd - virtual/udev x11-themes/gnome-icon-theme-symbolic" -# To break circular dependencies -PDEPEND=">=gnome-base/gnome-control-center-2.91" DEPEND="${COMMON_DEPEND} - !!net-wireless/bluez-gnome + !net-wireless/bluez-gnome app-text/docbook-xml-dtd:4.1.2 - app-text/gnome-doc-utils - app-text/scrollkeeper dev-libs/libxml2:2 + dev-util/gdbus-codegen + >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.40.0 - virtual/pkgconfig >=sys-devel/gettext-0.17 + virtual/pkgconfig x11-libs/libX11 x11-libs/libXi x11-proto/xproto - doc? ( >=dev-util/gtk-doc-1.9 )" +" # eautoreconf needs: # gnome-base/gnome-common # dev-util/gtk-doc-am 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_configure() { # FIXME: Add geoclue support G2CONF="${G2CONF} $(use_enable introspection) $(use_enable sendto nautilus-sendto) + --enable-documentation --disable-maintainer-mode - --disable-moblin --disable-desktop-update --disable-icon-update - --disable-schemas-compile - --disable-static" - DOCS="AUTHORS README NEWS ChangeLog" - - enewgroup plugdev + --disable-static + ITSTOOL=$(type -P true)" + gnome2_src_configure } src_install() { gnome2_src_install - - local la - for la in gnome-bluetooth/plugins/libgbtgeoclue.la \ - control-center-1/panels/libbluetooth.la \ - libgnome-bluetooth.la; do - rm -v "${ED}/usr/$(get_libdir)/${la}" || die - done - - udev_dorules "${FILESDIR}"/80-rfkill.rules + udev_dorules "${FILESDIR}"/61-${PN}.rules } pkg_postinst() { @@ -83,6 +79,8 @@ pkg_postinst() { # Notify about old libraries that might still be around preserve_old_lib_notify /usr/$(get_libdir)/libgnome-bluetooth.so.7 - elog "Don't forget to add yourself to the plugdev group " - elog "if you want to be able to control bluetooth transmitter." + if ! has_version sys-auth/consolekit[acl] ; then + elog "Don't forget to add yourself to the plugdev group " + elog "if you want to be able to control bluetooth transmitter." + fi } diff --git a/net-wireless/gnome-bluetooth/metadata.xml b/net-wireless/gnome-bluetooth/metadata.xml index b0f4a0f404be..3c13ef1d7e8b 100644 --- a/net-wireless/gnome-bluetooth/metadata.xml +++ b/net-wireless/gnome-bluetooth/metadata.xml @@ -3,8 +3,6 @@ <pkgmetadata> <herd>gnome</herd> <use> - <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> - for introspection</flag> <flag name="nautilus">Build the <pkg>gnome-extra/nautilus-sendto</pkg> plugin</flag> <flag name="sendto">Build the <pkg>gnome-extra/nautilus-sendto</pkg> |