diff options
Diffstat (limited to 'net-wireless/gnome-bluetooth')
6 files changed, 34 insertions, 21 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/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 |