From c3aeb097e107dc16f41c381637d42466385efae0 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Thu, 13 Sep 2012 06:40:22 -0400 Subject: net-wireless/gnome-bluetooth: use correct udev rules dir (bug #433910) --- net-wireless/gnome-bluetooth/Manifest | 4 +- .../gnome-bluetooth-3.5.5-r1.ebuild | 87 ++++++++++++++++++++++ .../gnome-bluetooth/gnome-bluetooth-3.5.5.ebuild | 86 --------------------- .../gnome-bluetooth/gnome-bluetooth-9999.ebuild | 5 +- 4 files changed, 92 insertions(+), 90 deletions(-) create mode 100644 net-wireless/gnome-bluetooth/gnome-bluetooth-3.5.5-r1.ebuild delete mode 100644 net-wireless/gnome-bluetooth/gnome-bluetooth-3.5.5.ebuild (limited to 'net-wireless') diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest index e8d5919a..335dadca 100644 --- a/net-wireless/gnome-bluetooth/Manifest +++ b/net-wireless/gnome-bluetooth/Manifest @@ -1,4 +1,4 @@ AUX 80-rfkill.rules 117 SHA256 81b3a8a3a3639b6d6024043364ad4917b32a85fd7f766e4051211d388e165798 SHA512 dcd7173ea905e41a8d583fc11f5fb04774b42e80a6bbc4d37896d041cf05938ffb98202cda1e56f8ec8a6708d2a09dcbf1f5309f775fb746ea29e4eb63939c14 WHIRLPOOL 47cc05faa13ca9811ddbaec36c3544c52dc42ad58d67e786f5bf91ac65a76d60c0e323df1e4c6cad006332e9244d7a63a78ae11a49b27c21b70be8b6a2b06df5 DIST gnome-bluetooth-3.5.5.tar.xz 1330996 SHA256 47b6afbccb04e7fd0c09ab4431ce59b9175e8bac1462068816018da427b43cc2 SHA512 6aefdcb1bc8ff8fcfef36fc46763ddc2c1e08087521c956b4d1efbac92e25c53f76cff874a6799d5246e559a8fd84f65e6e99a23ab4171917eaf1e64edb28ff9 WHIRLPOOL e10678541caf5bbca63ce794f2d1c8c531988514c9e5a52e47c35e8d6832b650f248429bc0e9f18f26ed212ad888e3a90d9b1092699e0a5d1ecd601cf112ffc8 -EBUILD gnome-bluetooth-3.5.5.ebuild 2013 SHA256 890848f1101570fe126338a88a0330ced56887e4d6fc60fceadceff14516acfd SHA512 5508c6dd78aab014599cfe9e536739a6dc8537a4c22b3bd3332201d6e676c245607d6be008e34816f5d21ac31d149aae56c5109f6f24982b33492d2cc73b3c95 WHIRLPOOL 2d0641db5f333710e2e3828d40105052e82a0cbada21be3eaf1256196b2255fc63c26677d6c96853bed5f028c097490014da744f9f63ddf8235908fa69cad8c8 -EBUILD gnome-bluetooth-9999.ebuild 2013 SHA256 890848f1101570fe126338a88a0330ced56887e4d6fc60fceadceff14516acfd SHA512 5508c6dd78aab014599cfe9e536739a6dc8537a4c22b3bd3332201d6e676c245607d6be008e34816f5d21ac31d149aae56c5109f6f24982b33492d2cc73b3c95 WHIRLPOOL 2d0641db5f333710e2e3828d40105052e82a0cbada21be3eaf1256196b2255fc63c26677d6c96853bed5f028c097490014da744f9f63ddf8235908fa69cad8c8 +EBUILD gnome-bluetooth-3.5.5-r1.ebuild 2086 SHA256 ec5f1da036a48cc70783dbf4dcc71a0a11b884d297ddc8d9d8e3c455c4a5ed73 SHA512 152ea2c00871132eb0a4c52d2d5f61ce68ba1bd45aedc8f29ca1f4227aa64b64406aac57bc2fc3fc87d8c5cce0aaa782abc688825a8a93981923930a12b4d67d WHIRLPOOL 1296b1b758f6f88fafa32d19ddb9ab70b13d3aa64b3f6ddf52b30adf2751dd611bdec1c46dcbbd0f5dd65b9c9b1a304b72c9a7a2c931113af609c64b7ce6f6c6 +EBUILD gnome-bluetooth-9999.ebuild 2086 SHA256 ec5f1da036a48cc70783dbf4dcc71a0a11b884d297ddc8d9d8e3c455c4a5ed73 SHA512 152ea2c00871132eb0a4c52d2d5f61ce68ba1bd45aedc8f29ca1f4227aa64b64406aac57bc2fc3fc87d8c5cce0aaa782abc688825a8a93981923930a12b4d67d WHIRLPOOL 1296b1b758f6f88fafa32d19ddb9ab70b13d3aa64b3f6ddf52b30adf2751dd611bdec1c46dcbbd0f5dd65b9c9b1a304b72c9a7a2c931113af609c64b7ce6f6c6 diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.5.5-r1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.5.5-r1.ebuild new file mode 100644 index 00000000..2874ba10 --- /dev/null +++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.5.5-r1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="4" +GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" + +inherit eutils gnome2 multilib toolchain-funcs +if [[ ${PV} = 9999 ]]; then + inherit gnome2-live +fi + +DESCRIPTION="Fork of bluez-gnome focused on integration with GNOME" +HOMEPAGE="http://live.gnome.org/GnomeBluetooth" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="2" +IUSE="doc +introspection sendto" +if [[ ${PV} = 9999 ]]; then + KEYWORDS="" +else + KEYWORDS="~amd64 ~x86" +fi + +COMMON_DEPEND=">=dev-libs/glib-2.29.90:2 + >=x11-libs/gtk+-2.91.3:3[introspection?] + >=x11-libs/libnotify-0.7.0 + + introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) + sendto? ( >=gnome-extra/nautilus-sendto-2.91 ) +" +RDEPEND="${COMMON_DEPEND} + >=net-wireless/bluez-4.34 + app-mobilephone/obexd + sys-fs/udev + x11-themes/gnome-icon-theme-symbolic" +DEPEND="${COMMON_DEPEND} + !net-wireless/bluez-gnome + app-text/docbook-xml-dtd:4.1.2 + app-text/gnome-doc-utils + app-text/scrollkeeper + dev-libs/libxml2 + >=dev-util/intltool-0.40.0 + dev-util/gdbus-codegen + >=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() { + # FIXME: Add geoclue support + G2CONF="${G2CONF} + $(use_enable introspection) + $(use_enable sendto nautilus-sendto) + --enable-documentation + --disable-maintainer-mode + --disable-desktop-update + --disable-icon-update + --disable-schemas-compile + --disable-static" + DOCS="AUTHORS README NEWS ChangeLog" + + enewgroup plugdev +} + +src_install() { + gnome2_src_install + + local udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)" + insinto "${udevdir}"/rules.d + doins "${FILESDIR}"/80-rfkill.rules +} + +pkg_postinst() { + gnome2_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." +} diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.5.5.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.5.5.ebuild deleted file mode 100644 index 5967e9d5..00000000 --- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.5.5.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" - -inherit eutils gnome2 multilib -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi - -DESCRIPTION="Fork of bluez-gnome focused on integration with GNOME" -HOMEPAGE="http://live.gnome.org/GnomeBluetooth" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="2" -IUSE="doc +introspection sendto" -if [[ ${PV} = 9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~amd64 ~x86" -fi - -COMMON_DEPEND=">=dev-libs/glib-2.29.90:2 - >=x11-libs/gtk+-2.91.3:3[introspection?] - >=x11-libs/libnotify-0.7.0 - - introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) - sendto? ( >=gnome-extra/nautilus-sendto-2.91 ) -" -RDEPEND="${COMMON_DEPEND} - >=net-wireless/bluez-4.34 - app-mobilephone/obexd - sys-fs/udev - x11-themes/gnome-icon-theme-symbolic" -DEPEND="${COMMON_DEPEND} - !net-wireless/bluez-gnome - app-text/docbook-xml-dtd:4.1.2 - app-text/gnome-doc-utils - app-text/scrollkeeper - dev-libs/libxml2 - >=dev-util/intltool-0.40.0 - dev-util/gdbus-codegen - >=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() { - # FIXME: Add geoclue support - G2CONF="${G2CONF} - $(use_enable introspection) - $(use_enable sendto nautilus-sendto) - --enable-documentation - --disable-maintainer-mode - --disable-desktop-update - --disable-icon-update - --disable-schemas-compile - --disable-static" - DOCS="AUTHORS README NEWS ChangeLog" - - enewgroup plugdev -} - -src_install() { - gnome2_src_install - - insinto /$(get_libdir)/udev/rules.d - doins "${FILESDIR}"/80-rfkill.rules -} - -pkg_postinst() { - gnome2_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." -} diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild index 5967e9d5..2874ba10 100644 --- a/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild +++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild @@ -6,7 +6,7 @@ EAPI="4" GCONF_DEBUG="yes" GNOME2_LA_PUNT="yes" -inherit eutils gnome2 multilib +inherit eutils gnome2 multilib toolchain-funcs if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi @@ -72,7 +72,8 @@ pkg_setup() { src_install() { gnome2_src_install - insinto /$(get_libdir)/udev/rules.d + local udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)" + insinto "${udevdir}"/rules.d doins "${FILESDIR}"/80-rfkill.rules } -- cgit v1.2.3-65-gdbad