Version bump, bug #283228. Fix swig dependency on old ebuilds, bug #221457. Make sure use flags match something. Clean up old revisions.

(Portage version: 2.2_rc49/cvs/Linux x86_64)

7 files changed, 48 insertions, 203 deletions

diff --git a/app-pda/libopensync/ChangeLog b/app-pda/libopensync/ChangeLog
index 4313095a7b7c..333ad12df930 100644
--- a/app-pda/libopensync/ChangeLog
+++ b/app-pda/libopensync/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-pda/libopensync
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/ChangeLog,v 1.33 2009/07/05 19:38:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/ChangeLog,v 1.34 2009/11/15 22:02:52 eva Exp $
+
+*libopensync-0.39 (15 Nov 2009)
+
+  15 Nov 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -libopensync-0.20.ebuild, -libopensync-0.21.ebuild,
+  libopensync-0.22.ebuild, -libopensync-0.35.ebuild,
+  -libopensync-0.36.ebuild, +libopensync-0.39.ebuild,
+  libopensync-9999.ebuild:
+  Version bump, bug #283228. Fix swig dependency on old ebuilds, bug
+  #221457. Make sure use flags match something. Clean up old revisions.
 
   05 Jul 2009; Alexis Ballier <aballier@gentoo.org>
   libopensync-0.36-r1.ebuild, libopensync-0.38.ebuild:
diff --git a/app-pda/libopensync/libopensync-0.20.ebuild b/app-pda/libopensync/libopensync-0.20.ebuild
deleted file mode 100644
index 516d43ecb878..000000000000
--- a/app-pda/libopensync/libopensync-0.20.ebuild
+++ /dev/null
@@ -1,48 +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/libopensync/libopensync-0.20.ebuild,v 1.7 2007/07/15 05:41:19 mr_bones_ Exp $
-
-DESCRIPTION="OpenSync synchronisation framework library"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://dev.gentooexperimental.org/~peper/distfiles/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="debug doc python"
-#test
-#profiling" - needs tau - http://www.cs.uoregon.edu/research/tau/
-
-RDEPEND=">=dev-db/sqlite-3
-	>=dev-libs/glib-2
-	dev-libs/libxml2
-	python? ( >=dev-lang/python-2.2
-		>=dev-lang/swig-1.3.17 )
-	debug? ( >=dev-libs/check-0.9.2 ) "
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0
-	doc? ( app-doc/doxygen )"
-
-# Tests are still broken in 0.20
-RESTRICT="test"
-
-src_compile() {
-		#$(use_enable test unit-tests) \
-	econf \
-		--enable-engine \
-		--enable-tools \
-		$(use_enable python) \
-		$(use_enable debug) \
-		$(use_enable debug tracing) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-
-	use doc && doxygen Doxyfile
-}
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	use doc && dohtml docs/html/*
-}
diff --git a/app-pda/libopensync/libopensync-0.21.ebuild b/app-pda/libopensync/libopensync-0.21.ebuild
deleted file mode 100644
index ec13e388139c..000000000000
--- a/app-pda/libopensync/libopensync-0.21.ebuild
+++ /dev/null
@@ -1,49 +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/libopensync/libopensync-0.21.ebuild,v 1.2 2007/03/28 20:14:35 peper Exp $
-
-DESCRIPTION="OpenSync synchronisation framework library"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://dev.gentooexperimental.org/~peper/distfiles/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="debug doc python"
-#test
-#profiling" - needs tau - http://www.cs.uoregon.edu/research/tau/
-
-RDEPEND=">=dev-db/sqlite-3
-	>=dev-libs/glib-2
-	dev-libs/libxml2
-	python? ( >=dev-lang/python-2.2
-		>=dev-lang/swig-1.3.17 )
-	debug? ( >=dev-libs/check-0.9.2 ) "
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0
-	doc? ( app-doc/doxygen )"
-
-# Some of the tests are still broken in 0.21
-RESTRICT="test"
-
-src_compile() {
-		#$(use_enable test unit-tests) \
-	econf \
-		--enable-engine \
-		--enable-tools \
-		$(use_enable python) \
-		$(use_enable debug) \
-		$(use_enable debug tracing) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-
-	use doc && doxygen Doxyfile
-}
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	use doc && dohtml docs/html/*
-}
diff --git a/app-pda/libopensync/libopensync-0.22.ebuild b/app-pda/libopensync/libopensync-0.22.ebuild
index 54f0a1802919..cee14b95234f 100644
--- a/app-pda/libopensync/libopensync-0.22.ebuild
+++ b/app-pda/libopensync/libopensync-0.22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.22.ebuild,v 1.16 2008/06/15 06:11:14 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.22.ebuild,v 1.17 2009/11/15 22:02:52 eva Exp $
 
 inherit eutils
 
@@ -21,13 +21,13 @@ RESTRICT="test"
 RDEPEND=">=dev-db/sqlite-3
 	>=dev-libs/glib-2
 	dev-libs/libxml2
-	python? ( >=dev-lang/python-2.2
-		>=dev-lang/swig-1.3.17 )
-	debug? ( >=dev-libs/check-0.9.2 ) "
+	python? ( >=dev-lang/python-2.2 )
+	debug? ( >=dev-libs/check-0.9.2 )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9.0
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+	python? ( >=dev-lang/swig-1.3.17 )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-pda/libopensync/libopensync-0.35.ebuild b/app-pda/libopensync/libopensync-0.35.ebuild
deleted file mode 100644
index e8876eb66293..000000000000
--- a/app-pda/libopensync/libopensync-0.35.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.35.ebuild,v 1.3 2009/06/05 11:42:55 scarabeus Exp $
-
-inherit cmake-utils eutils
-
-DESCRIPTION="OpenSync synchronisation framework library"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="debug doc python"
-
-# Tests don't pass
-#>=dev-libs/check-0.9.2
-#mycmakeargs="${mycmakeargs} -DOPENSYNC_UNITTESTS=ON"
-RESTRICT="test"
-
-RDEPEND=">=dev-db/sqlite-3
-	>=dev-libs/glib-2
-	dev-libs/libxml2
-	python? ( >=dev-lang/python-2.2 >=dev-lang/swig-1.3.17 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0
-	doc? ( app-doc/doxygen )"
-
-src_compile() {
-	local mycmakeargs
-	mycmakeargs="${mycmakeargs} -DCMAKE_SKIP_RPATH=ON
-		$(cmake-utils_use debug OPENSYNC_TRACE)
-		$(cmake-utils_use debug OPENSYNC_DEBUG_MODULES)
-		$(cmake-utils_use python OPENSYNC_PYTHONBINDINGS)
-		$(cmake-utils_use_build doc DOCUMENTATION)
-	"
-	cmake-utils_src_compile
-
-	if use doc ; then
-		cd "${CMAKE_BUILD_DIR}"
-		doxygen Doxyfile || die "Failed to generate docs."
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc ; then
-		cd "${CMAKE_BUILD_DIR}"
-		dohtml docs/html/* || die "Failed to install docs."
-	fi
-}
-
-pkg_postinst() {
-	elog "Building with 'debug' useflag is highly encouraged"
-	elog "and requiered for bug reports."
-	elog "Also see http://www.opensync.org/wiki/tracing"
-}
diff --git a/app-pda/libopensync/libopensync-0.36.ebuild b/app-pda/libopensync/libopensync-0.39.ebuild
index df21d0c86e0c..714e254ad16a 100644
--- a/app-pda/libopensync/libopensync-0.36.ebuild
+++ b/app-pda/libopensync/libopensync-0.39.ebuild
@@ -1,53 +1,50 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.36.ebuild,v 1.3 2009/06/05 11:42:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-0.39.ebuild,v 1.1 2009/11/15 22:02:52 eva Exp $
 
-inherit cmake-utils eutils
+inherit cmake-utils
 
 DESCRIPTION="OpenSync synchronisation framework library"
 HOMEPAGE="http://www.opensync.org/"
 SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 SLOT="0"
 LICENSE="LGPL-2.1"
-IUSE="debug doc python"
+IUSE="doc python test"
 
-# Tests don't pass
-#>=dev-libs/check-0.9.2
-#mycmakeargs="${mycmakeargs} -DOPENSYNC_UNITTESTS=ON"
+# 14% tests passed, 275 tests failed out of 321
 RESTRICT="test"
 
 RDEPEND=">=dev-db/sqlite-3
-	>=dev-libs/glib-2
+	>=dev-libs/glib-2.12
 	dev-libs/libxml2
 	python? ( >=dev-lang/python-2.2 )"
 
 DEPEND="${RDEPEND}
-	python? ( >=dev-lang/swig-1.3.17 )
 	>=dev-util/pkgconfig-0.9.0
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+	python? ( >=dev-lang/swig-1.3.17 )
+	test? ( >=dev-libs/check-0.9.2 )"
 
 src_compile() {
-	local mycmakeargs
-	mycmakeargs="${mycmakeargs} -DCMAKE_SKIP_RPATH=ON
-		$(cmake-utils_use debug OPENSYNC_TRACE)
-		$(cmake-utils_use debug OPENSYNC_DEBUG_MODULES)
-		$(cmake-utils_use python OPENSYNC_PYTHONBINDINGS)
+	DOCS="AUTHORS CODING ChangeLog README"
+
+	local mycmakeargs="
+		-DCMAKE_SKIP_RPATH=ON
+		$(cmake-utils_use_enable python WRAPPER)
 		$(cmake-utils_use_build doc DOCUMENTATION)
+		$(cmake-utils_use test OPENSYNC_UNITTESTS)
 	"
 
 	cmake-utils_src_compile
 
 	if use doc ; then
-		cd "${CMAKE_BUILD_DIR}"
-		doxygen Doxyfile || die "Failed to generate docs."
+		cmake-utils_src_make DoxygenDoc || die "Failed to generate docs."
 	fi
 }
 
 src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
 	pushd "${CMAKE_BUILD_DIR}" > /dev/null
 
 	if ! LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}/opensync/" emake -j1 test ; then
diff --git a/app-pda/libopensync/libopensync-9999.ebuild b/app-pda/libopensync/libopensync-9999.ebuild
index 1d66b83934fa..8eca1d980e00 100644
--- a/app-pda/libopensync/libopensync-9999.ebuild
+++ b/app-pda/libopensync/libopensync-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-9999.ebuild,v 1.5 2009/06/05 11:42:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync/libopensync-9999.ebuild,v 1.6 2009/11/15 22:02:52 eva Exp $
 
-inherit cmake-utils eutils subversion
+inherit cmake-utils subversion
 
 DESCRIPTION="OpenSync synchronisation framework library"
 HOMEPAGE="http://www.opensync.org/"
@@ -10,46 +10,40 @@ SRC_URI=""
 
 ESVN_REPO_URI="http://svn.opensync.org/trunk"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 SLOT="0"
 LICENSE="LGPL-2.1"
-IUSE="debug doc python"
-
-# Tests don't pass
-#>=dev-libs/check-0.9.2
-#mycmakeargs="${mycmakeargs} -DOPENSYNC_UNITTESTS=ON"
-RESTRICT="test"
+IUSE="doc python test"
 
 RDEPEND=">=dev-db/sqlite-3
-	>=dev-libs/glib-2
+	>=dev-libs/glib-2.12
 	dev-libs/libxml2
 	python? ( >=dev-lang/python-2.2 )"
 
 DEPEND="${RDEPEND}
-	python? ( >=dev-lang/swig-1.3.17 )
 	>=dev-util/pkgconfig-0.9.0
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+	python? ( >=dev-lang/swig-1.3.17 )
+	test? ( >=dev-libs/check-0.9.2 )"
 
 src_compile() {
-	local mycmakeargs
-	mycmakeargs="${mycmakeargs} -DCMAKE_SKIP_RPATH=ON
-		$(cmake-utils_use debug OPENSYNC_TRACE)
-		$(cmake-utils_use debug OPENSYNC_DEBUG_MODULES)
-		$(cmake-utils_use python OPENSYNC_PYTHONBINDINGS)
+	DOCS="AUTHORS CODING ChangeLog README"
+
+	local mycmakeargs="
+		-DCMAKE_SKIP_RPATH=ON
+		$(cmake-utils_use_enable python WRAPPER)
 		$(cmake-utils_use_build doc DOCUMENTATION)
+		$(cmake-utils_use test OPENSYNC_UNITTESTS)
 	"
 
 	cmake-utils_src_compile
 
 	if use doc ; then
-		cd "${CMAKE_BUILD_DIR}"
-		doxygen Doxyfile || die "Failed to generate docs."
+		cmake-utils_src_make DoxygenDoc || die "Failed to generate docs."
 	fi
 }
 
 src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
 	pushd "${CMAKE_BUILD_DIR}" > /dev/null
 
 	if ! LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}/opensync/" emake -j1 test ; then