| 1 |
commit: 9432b707cba7d4bd61024997d75b88d7199aafc6 |
| 2 |
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 27 20:19:41 2012 +0000 |
| 4 |
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 27 20:23:45 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9432b707 |
| 7 |
|
| 8 |
net-wireless/gnome-bluetooth: 3.5.92 → 3.6.0 and sync with gx86 |
| 9 |
|
| 10 |
--- |
| 11 |
...-3.5.92.ebuild => gnome-bluetooth-3.6.0.ebuild} | 14 +++++++++++--- |
| 12 |
.../gnome-bluetooth/gnome-bluetooth-9999.ebuild | 14 +++++++++++--- |
| 13 |
2 files changed, 22 insertions(+), 6 deletions(-) |
| 14 |
|
| 15 |
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.5.92.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.6.0.ebuild |
| 16 |
similarity index 86% |
| 17 |
rename from net-wireless/gnome-bluetooth/gnome-bluetooth-3.5.92.ebuild |
| 18 |
rename to net-wireless/gnome-bluetooth/gnome-bluetooth-3.6.0.ebuild |
| 19 |
index 94d95a8..08dbdfc 100644 |
| 20 |
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.5.92.ebuild |
| 21 |
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.6.0.ebuild |
| 22 |
@@ -6,7 +6,7 @@ EAPI="4" |
| 23 |
GCONF_DEBUG="yes" |
| 24 |
GNOME2_LA_PUNT="yes" |
| 25 |
|
| 26 |
-inherit eutils gnome2 multilib toolchain-funcs |
| 27 |
+inherit eutils gnome2 multilib toolchain-funcs user |
| 28 |
if [[ ${PV} = 9999 ]]; then |
| 29 |
inherit gnome2-live |
| 30 |
fi |
| 31 |
@@ -14,13 +14,13 @@ fi |
| 32 |
DESCRIPTION="Fork of bluez-gnome focused on integration with GNOME" |
| 33 |
HOMEPAGE="http://live.gnome.org/GnomeBluetooth" |
| 34 |
|
| 35 |
-LICENSE="GPL-2 LGPL-2.1" |
| 36 |
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+" |
| 37 |
SLOT="2" |
| 38 |
IUSE="doc +introspection sendto" |
| 39 |
if [[ ${PV} = 9999 ]]; then |
| 40 |
KEYWORDS="" |
| 41 |
else |
| 42 |
- KEYWORDS="~amd64 ~x86" |
| 43 |
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
| 44 |
fi |
| 45 |
|
| 46 |
COMMON_DEPEND=">=dev-libs/glib-2.29.90:2 |
| 47 |
@@ -73,6 +73,14 @@ pkg_setup() { |
| 48 |
enewgroup plugdev |
| 49 |
} |
| 50 |
|
| 51 |
+src_prepare() { |
| 52 |
+ # Regenerate gdbus-codegen files to allow using any glib version; bug #436236 |
| 53 |
+ if [[ ${PV} != 9999 ]]; then |
| 54 |
+ rm -v lib/bluetooth-client-glue.{c,h} || die |
| 55 |
+ fi |
| 56 |
+ gnome2_src_prepare |
| 57 |
+} |
| 58 |
+ |
| 59 |
src_install() { |
| 60 |
gnome2_src_install |
| 61 |
|
| 62 |
|
| 63 |
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild |
| 64 |
index 94d95a8..08dbdfc 100644 |
| 65 |
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild |
| 66 |
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild |
| 67 |
@@ -6,7 +6,7 @@ EAPI="4" |
| 68 |
GCONF_DEBUG="yes" |
| 69 |
GNOME2_LA_PUNT="yes" |
| 70 |
|
| 71 |
-inherit eutils gnome2 multilib toolchain-funcs |
| 72 |
+inherit eutils gnome2 multilib toolchain-funcs user |
| 73 |
if [[ ${PV} = 9999 ]]; then |
| 74 |
inherit gnome2-live |
| 75 |
fi |
| 76 |
@@ -14,13 +14,13 @@ fi |
| 77 |
DESCRIPTION="Fork of bluez-gnome focused on integration with GNOME" |
| 78 |
HOMEPAGE="http://live.gnome.org/GnomeBluetooth" |
| 79 |
|
| 80 |
-LICENSE="GPL-2 LGPL-2.1" |
| 81 |
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+" |
| 82 |
SLOT="2" |
| 83 |
IUSE="doc +introspection sendto" |
| 84 |
if [[ ${PV} = 9999 ]]; then |
| 85 |
KEYWORDS="" |
| 86 |
else |
| 87 |
- KEYWORDS="~amd64 ~x86" |
| 88 |
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
| 89 |
fi |
| 90 |
|
| 91 |
COMMON_DEPEND=">=dev-libs/glib-2.29.90:2 |
| 92 |
@@ -73,6 +73,14 @@ pkg_setup() { |
| 93 |
enewgroup plugdev |
| 94 |
} |
| 95 |
|
| 96 |
+src_prepare() { |
| 97 |
+ # Regenerate gdbus-codegen files to allow using any glib version; bug #436236 |
| 98 |
+ if [[ ${PV} != 9999 ]]; then |
| 99 |
+ rm -v lib/bluetooth-client-glue.{c,h} || die |
| 100 |
+ fi |
| 101 |
+ gnome2_src_prepare |
| 102 |
+} |
| 103 |
+ |
| 104 |
src_install() { |
| 105 |
gnome2_src_install |
Archives