Allow both bluez-4 and bluez-libs-3 in 0.4.6-r1; remove older

(Portage version: 2.2_rc22/cvs/Linux 2.6.31-gentoo x86_64)

4 files changed, 7 insertions, 142 deletions

diff --git a/app-pda/libsyncml/ChangeLog b/app-pda/libsyncml/ChangeLog
index 17923bc76a45..1faf0a01d51d 100644
--- a/app-pda/libsyncml/ChangeLog
+++ b/app-pda/libsyncml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-pda/libsyncml
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/ChangeLog,v 1.14 2009/05/23 08:22:08 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/ChangeLog,v 1.15 2009/09/27 00:25:19 leio Exp $
+
+  27 Sep 2009; Mart Raudsepp <leio@gentoo.org> -libsyncml-0.4.5.ebuild,
+  -libsyncml-0.4.6.ebuild, libsyncml-0.4.6-r1.ebuild:
+  Allow both bluez-4 and bluez-libs-3 in 0.4.6-r1; remove older
 
 *libsyncml-0.4.6-r1 (23 May 2009)
 
diff --git a/app-pda/libsyncml/libsyncml-0.4.5.ebuild b/app-pda/libsyncml/libsyncml-0.4.5.ebuild
deleted file mode 100644
index 6b2d9eb1dfd1..000000000000
--- a/app-pda/libsyncml/libsyncml-0.4.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-0.4.5.ebuild,v 1.2 2008/02/03 23:27:19 leio Exp $
-
-EAPI="1"
-
-inherit eutils
-
-DESCRIPTION="Implementation of the SyncML protocol"
-HOMEPAGE="http://libsyncml.opensync.org/"
-SRC_URI="http://libsyncml.opensync.org/download/releases/${PV}/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="bluetooth +debug doc http +obex"
-
-RDEPEND=">=dev-libs/glib-2.0
-	>=dev-libs/libwbxml-0.9.2
-	dev-libs/libxml2
-	http? ( >=net-libs/libsoup-2.2.91:2.2 )
-	obex? ( >=dev-libs/openobex-1.1 )
-	bluetooth? ( net-wireless/bluez-libs )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-# Some of the tests are broken
-RESTRICT="test"
-
-pkg_setup() {
-	if ! use obex && ! use http; then
-		eerror "${CATEGORY}/${P} without support for obex nor http is unusable."
-		eerror "Please enable \"obex\" or/and \"http\" USE flags."
-		die "Please enable \"obex\" or/and \"http\" USE flags."
-	fi
-
-	if use bluetooth; then
-		if use obex && ! built_with_use dev-libs/openobex bluetooth; then
-			eerror "You are trying to build ${CATEGORY}/${P} with the \"bluetooth\""
-			eerror "and \"obex\" USE flags, but dev-libs/openobex was built without"
-			eerror "the \"bluetooth\" USE flag."
-			eerror "Please rebuild dev-libs/openobex with \"bluetooth\" USE flag."
-			die "Please rebuild dev-libs/openobex with \"bluetooth\" USE flag."
-		elif ! use obex; then
-			eerror "You are trying to build ${CATEGORY}/${P} with the \"bluetooth\""
-			eerror "USE flag, but you didn't enable the \"obex\" flag, which is"
-			eerror "needed for bluetooth support."
-			eerror "Please enable \"obex\" USE flag."
-			die "Please enable \"obex\" USE flag."
-		fi
-	fi
-}
-
-src_compile() {
-	econf \
-		$(use_enable bluetooth) \
-		$(use_enable obex) \
-		$(use_enable http) \
-		$(use_enable debug) \
-		$(use_enable debug tracing) \
-		--disable-unit-tests \
-		|| die "econf failed"
-		#$(use_enable test unit-tests) \
-
-	emake || die "emake failed"
-
-	use doc && doxygen Doxyfile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README
-
-	use doc && dohtml docs/html/*
-}
diff --git a/app-pda/libsyncml/libsyncml-0.4.6-r1.ebuild b/app-pda/libsyncml/libsyncml-0.4.6-r1.ebuild
index a8fe14a774ea..939bd56555f2 100644
--- a/app-pda/libsyncml/libsyncml-0.4.6-r1.ebuild
+++ b/app-pda/libsyncml/libsyncml-0.4.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-0.4.6-r1.ebuild,v 1.1 2009/05/23 08:22:08 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-0.4.6-r1.ebuild,v 1.2 2009/09/27 00:25:19 leio Exp $
 
 EAPI="1"
 
@@ -20,7 +20,7 @@ RDEPEND=">=dev-libs/glib-2.0
 	dev-libs/libxml2
 	http? ( >=net-libs/libsoup-2.2.91:2.2 )
 	obex? ( >=dev-libs/openobex-1.1 )
-	bluetooth? ( net-wireless/bluez )"
+	bluetooth? ( || ( net-wireless/bluez net-wireless/bluez-libs ) )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( app-doc/doxygen )"
diff --git a/app-pda/libsyncml/libsyncml-0.4.6.ebuild b/app-pda/libsyncml/libsyncml-0.4.6.ebuild
deleted file mode 100644
index a343c3d18be2..000000000000
--- a/app-pda/libsyncml/libsyncml-0.4.6.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-0.4.6.ebuild,v 1.3 2008/07/13 07:44:51 josejx Exp $
-
-EAPI="1"
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Implementation of the SyncML protocol"
-HOMEPAGE="http://libsyncml.opensync.org/"
-SRC_URI="http://libsyncml.opensync.org/download/releases/${PV}/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="bluetooth +debug doc http +obex"
-
-RDEPEND=">=dev-libs/glib-2.0
-	>=dev-libs/libwbxml-0.9.2
-	dev-libs/libxml2
-	http? ( >=net-libs/libsoup-2.2.91:2.2 )
-	obex? ( >=dev-libs/openobex-1.1 )
-	bluetooth? ( net-wireless/bluez-libs )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-# Some of the tests are broken
-RESTRICT="test"
-
-pkg_setup() {
-	if ! use obex && ! use http; then
-		eerror "${CATEGORY}/${P} without support for obex nor http is unusable."
-		eerror "Please enable \"obex\" or/and \"http\" USE flags."
-		die "Please enable \"obex\" or/and \"http\" USE flags."
-	fi
-
-	if use bluetooth; then
-		if use obex && ! built_with_use dev-libs/openobex bluetooth; then
-			eerror "You are trying to build ${CATEGORY}/${P} with the \"bluetooth\""
-			eerror "and \"obex\" USE flags, but dev-libs/openobex was built without"
-			eerror "the \"bluetooth\" USE flag."
-			eerror "Please rebuild dev-libs/openobex with \"bluetooth\" USE flag."
-			die "Please rebuild dev-libs/openobex with \"bluetooth\" USE flag."
-		elif ! use obex; then
-			eerror "You are trying to build ${CATEGORY}/${P} with the \"bluetooth\""
-			eerror "USE flag, but you didn't enable the \"obex\" flag, which is"
-			eerror "needed for bluetooth support."
-			eerror "Please enable \"obex\" USE flag."
-			die "Please enable \"obex\" USE flag."
-		fi
-	fi
-}
-
-src_compile() {
-	local mycmakeargs="
-		$(cmake-utils_use_enable http HTTP)
-		$(cmake-utils_use_enable obex OBEX)
-		$(cmake-utils_use_enable bluetooth BLUETOOTH)
-		$(cmake-utils_use_enable debug TRACE)"
-
-	cmake-utils_src_compile
-}