Make optional libsoup dep a slot dependency to prepare for the new 2.4 slot, and remove old versions; bug 208087

(Portage version: 2.1.4.1)

9 files changed, 17 insertions, 315 deletions

diff --git a/app-pda/libsyncml/ChangeLog b/app-pda/libsyncml/ChangeLog
index 8cad03dcc027..4a12662ca985 100644
--- a/app-pda/libsyncml/ChangeLog
+++ b/app-pda/libsyncml/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-pda/libsyncml
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/ChangeLog,v 1.9 2008/01/27 17:36:58 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/ChangeLog,v 1.10 2008/02/03 23:27:19 leio Exp $
+
+  03 Feb 2008; Mart Raudsepp <leio@gentoo.org>
+  -files/libsyncml-0.4.2-wbxml.patch, -libsyncml-0.4.2.ebuild,
+  -libsyncml-0.4.2-r1.ebuild, -libsyncml-0.4.3.ebuild,
+  -libsyncml-0.4.4.ebuild, libsyncml-0.4.5.ebuild, libsyncml-0.4.6.ebuild,
+  libsyncml-9999.ebuild:
+  Make optional libsoup dep a slot dependency to prepare for the new 2.4 slot,
+  and remove old versions; bug 208087
 
 *libsyncml-0.4.6 (27 Jan 2008)
 
diff --git a/app-pda/libsyncml/files/libsyncml-0.4.2-wbxml.patch b/app-pda/libsyncml/files/libsyncml-0.4.2-wbxml.patch
deleted file mode 100644
index 225ebefbe9cb..000000000000
--- a/app-pda/libsyncml/files/libsyncml-0.4.2-wbxml.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur libsyncml-0.4.2/libsyncml/parser/sml_xml_assm.c libsyncml/libsyncml/parser/sml_xml_assm.c
---- libsyncml-0.4.2/libsyncml/parser/sml_xml_assm.c	2006-09-09 16:40:08.000000000 +0200
-+++ libsyncml/libsyncml/parser/sml_xml_assm.c	2006-11-24 16:20:14.000000000 +0100
-@@ -1441,14 +1443,17 @@
- 	/* Add the syncml start node */
- 	switch (assm->session->version) {
- 		case SML_VERSION_10:
-+			xmlTextWriterWriteRaw(assm->writer, (xmlChar *)"<!DOCTYPE SyncML PUBLIC \"-//SYNCML//DTD SyncML 1.0//EN\" \"http://www.syncml.org/docs/syncml_represent_v10_20001207.dtd\">");
- 			if (!_smlXmlAssemblerStartNodeNS(assm, SML_ELEMENT_SYNCML, SML_NAMESPACE_SYNCML10, error))
- 				goto error_free_writer;
- 			break;
- 		case SML_VERSION_11:
-+			xmlTextWriterWriteRaw(assm->writer, (xmlChar *)"<!DOCTYPE SyncML PUBLIC \"-//SYNCML//DTD SyncML 1.1//EN\" \"http://www.syncml.org/docs/syncml_represent_v11_20020213.dtd.dtd\">");
- 			if (!_smlXmlAssemblerStartNodeNS(assm, SML_ELEMENT_SYNCML, SML_NAMESPACE_SYNCML11, error))
- 				goto error_free_writer;
- 			break;
- 		case SML_VERSION_12:
-+			xmlTextWriterWriteRaw(assm->writer, (xmlChar *)"<!DOCTYPE SyncML PUBLIC \"-//SYNCML//DTD SyncML 1.2//EN\" \"http://www.openmobilealliance.org/tech/DTD/OMA-TS-SyncML_RepPro_DTD-V1_2.dtd\">");
- 			if (!_smlXmlAssemblerStartNodeNS(assm, SML_ELEMENT_SYNCML, SML_NAMESPACE_SYNCML12, error))
- 				goto error_free_writer;
- 			break;
-
diff --git a/app-pda/libsyncml/libsyncml-0.4.2-r1.ebuild b/app-pda/libsyncml/libsyncml-0.4.2-r1.ebuild
deleted file mode 100644
index 0bf6610842bd..000000000000
--- a/app-pda/libsyncml/libsyncml-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-0.4.2-r1.ebuild,v 1.2 2007/01/08 16:31:52 peper Exp $
-
-inherit eutils
-
-DESCRIPTION="Implementation of the SyncML protocol"
-HOMEPAGE="http://libsyncml.opensync.org/"
-SRC_URI="http://dev.gentooexperimental.org/~peper/distfiles/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="bluetooth debug doc http obex"
-#test
-
-RDEPEND=">=dev-libs/glib-2.0
-	>=dev-libs/libwbxml-0.9.2
-	dev-libs/libxml2
-	http? ( >=net-libs/libsoup-2.2.91 )
-	obex? ( >=dev-libs/openobex-1.1 )
-	bluetooth? ( net-wireless/bluez-libs )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-	#test? ( dev-libs/check )
-
-# 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."
-		einfo "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."
-			einfo "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."
-			einfo "Please enable \"obex\" USE flag."
-			die "Please enable \"obex\" USE flag."
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix some wbxml problems
-	epatch "${FILESDIR}/${P}-wbxml.patch"
-}
-
-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.2.ebuild b/app-pda/libsyncml/libsyncml-0.4.2.ebuild
deleted file mode 100644
index 8d16bf9c20e7..000000000000
--- a/app-pda/libsyncml/libsyncml-0.4.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-0.4.2.ebuild,v 1.1 2006/11/13 22:02:11 peper Exp $
-
-DESCRIPTION="Implementation of the SyncML protocol"
-HOMEPAGE="http://libsyncml.opensync.org/"
-SRC_URI="http://dev.gentooexperimental.org/~peper/distfiles/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="bluetooth debug doc http obex"
-#test
-
-RDEPEND=">=dev-libs/glib-2.0
-	>=dev-libs/libwbxml-0.9.2
-	dev-libs/libxml2
-	http? ( >=net-libs/libsoup-2.2.91 )
-	obex? ( >=dev-libs/openobex-1.1 )
-	bluetooth? ( net-wireless/bluez-libs )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-	#test? ( dev-libs/check )
-
-# Some of the tests are broken
-RESTRICT="test"
-
-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.3.ebuild b/app-pda/libsyncml/libsyncml-0.4.3.ebuild
deleted file mode 100644
index 9c0907daf732..000000000000
--- a/app-pda/libsyncml/libsyncml-0.4.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-0.4.3.ebuild,v 1.2 2007/03/28 20:13:43 peper Exp $
-
-inherit eutils
-
-DESCRIPTION="Implementation of the SyncML protocol"
-HOMEPAGE="http://libsyncml.opensync.org/"
-SRC_URI="http://dev.gentooexperimental.org/~peper/distfiles/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="bluetooth debug doc http obex"
-#test
-
-RDEPEND=">=dev-libs/glib-2.0
-	>=dev-libs/libwbxml-0.9.2
-	dev-libs/libxml2
-	http? ( >=net-libs/libsoup-2.2.91 )
-	obex? ( >=dev-libs/openobex-1.1 )
-	bluetooth? ( net-wireless/bluez-libs )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-	#test? ( dev-libs/check )
-
-# 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.4.ebuild b/app-pda/libsyncml/libsyncml-0.4.4.ebuild
deleted file mode 100644
index f507f959f229..000000000000
--- a/app-pda/libsyncml/libsyncml-0.4.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-0.4.4.ebuild,v 1.1 2007/03/28 20:13:43 peper Exp $
-
-inherit eutils
-
-DESCRIPTION="Implementation of the SyncML protocol"
-HOMEPAGE="http://libsyncml.opensync.org/"
-SRC_URI="http://dev.gentooexperimental.org/~peper/distfiles/${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 )
-	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.5.ebuild b/app-pda/libsyncml/libsyncml-0.4.5.ebuild
index 57714cf41fcd..6b2d9eb1dfd1 100644
--- a/app-pda/libsyncml/libsyncml-0.4.5.ebuild
+++ b/app-pda/libsyncml/libsyncml-0.4.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.1 2007/12/29 14:40:31 peper Exp $
+# $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"
 
@@ -18,7 +18,7 @@ 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 )
+	http? ( >=net-libs/libsoup-2.2.91:2.2 )
 	obex? ( >=dev-libs/openobex-1.1 )
 	bluetooth? ( net-wireless/bluez-libs )"
 DEPEND="${RDEPEND}
diff --git a/app-pda/libsyncml/libsyncml-0.4.6.ebuild b/app-pda/libsyncml/libsyncml-0.4.6.ebuild
index 1ea8161fa13a..d8fc37ff967f 100644
--- a/app-pda/libsyncml/libsyncml-0.4.6.ebuild
+++ b/app-pda/libsyncml/libsyncml-0.4.6.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2008/01/27 17:36:58 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-0.4.6.ebuild,v 1.2 2008/02/03 23:27:19 leio Exp $
 
 EAPI="1"
 
@@ -18,7 +18,7 @@ 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 )
+	http? ( >=net-libs/libsoup-2.2.91:2.2 )
 	obex? ( >=dev-libs/openobex-1.1 )
 	bluetooth? ( net-wireless/bluez-libs )"
 DEPEND="${RDEPEND}
diff --git a/app-pda/libsyncml/libsyncml-9999.ebuild b/app-pda/libsyncml/libsyncml-9999.ebuild
index d472ea8fcd94..53060873561c 100644
--- a/app-pda/libsyncml/libsyncml-9999.ebuild
+++ b/app-pda/libsyncml/libsyncml-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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-9999.ebuild,v 1.3 2007/12/16 18:42:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-9999.ebuild,v 1.4 2008/02/03 23:27:19 leio Exp $
 
 EAPI="1"
 
@@ -20,7 +20,7 @@ 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 )
+	http? ( >=net-libs/libsoup-2.2.91:2.2 )
 	obex? ( >=dev-libs/openobex-1.1 )
 	bluetooth? ( net-wireless/bluez-libs )"
 DEPEND="${RDEPEND}