Version bump to latest and cleanup cmake-utils usage. Drop old. Non-maintainer commit.

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

7 files changed, 28 insertions, 184 deletions

diff --git a/dev-libs/libwbxml/ChangeLog b/dev-libs/libwbxml/ChangeLog
index e600ccbcb7e8..80dc99dd3d64 100644
--- a/dev-libs/libwbxml/ChangeLog
+++ b/dev-libs/libwbxml/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/libwbxml
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwbxml/ChangeLog,v 1.19 2010/09/03 13:21:32 s4t4n Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwbxml/ChangeLog,v 1.20 2011/03/19 20:24:35 scarabeus Exp $
+
+*libwbxml-0.10.9 (19 Mar 2011)
+
+  19 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> -libwbxml-0.9.2.ebuild,
+  -libwbxml-0.9.2_p48.ebuild, -files/wbxml2-0.9.2_p48.make_install.patch,
+  -files/wbxml2-0.9.2.make_install.patch, -libwbxml-0.10.6.ebuild,
+  -libwbxml-0.10.8.ebuild, +libwbxml-0.10.9.ebuild:
+  Version bump to latest and cleanup cmake-utils usage. Drop old.
+  Non-maintainer commit.
 
   03 Sep 2010; Michele Noberasco <s4t4n@gentoo.org> libwbxml-0.10.1.ebuild,
   libwbxml-0.10.6.ebuild, libwbxml-0.10.8.ebuild:
diff --git a/dev-libs/libwbxml/files/wbxml2-0.9.2.make_install.patch b/dev-libs/libwbxml/files/wbxml2-0.9.2.make_install.patch
deleted file mode 100644
index 39bdade0ebda..000000000000
--- a/dev-libs/libwbxml/files/wbxml2-0.9.2.make_install.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.am	2006-08-01 17:07:09.000000000 +0200
-+++ Makefile.am.new	2006-08-01 17:07:19.000000000 +0200
-@@ -8,26 +8,6 @@
- pkgconfigdir=$(libdir)/pkgconfig
- pkgconfig_DATA = libwbxml2.pc
- 
--wbxmldocdir = ${prefix}/share/doc/wbxml2-${VERSION}
--wbxmldoc_DATA = \
--	AUTHORS\
--	bootstrap\
--	BUGS\
--	ChangeLog\
--	COPYING\
--	GNU-LGPL\
--	INSTALL\
--	NEWS\
--	README\
--	References\
--	THANKS\
--	TODO\
--	doxygen.h
--
--install-data-local:
--	$(mkinstalldirs) $(DESTDIR)$(wbxmldocdir)/manual
--	cp -Rp doc/* $(DESTDIR)$(wbxmldocdir)/manual
--
- dist-bz2: distdir
- 	sed -e "s/tar.gz/tar.bz2/g" $(distdir)/wbxml2.spec > $(distdir)/wbxml2.spec.aux
- 	mv $(distdir)/wbxml2.spec.aux $(distdir)/wbxml2.spec
diff --git a/dev-libs/libwbxml/files/wbxml2-0.9.2_p48.make_install.patch b/dev-libs/libwbxml/files/wbxml2-0.9.2_p48.make_install.patch
deleted file mode 100644
index 8dca505e6352..000000000000
--- a/dev-libs/libwbxml/files/wbxml2-0.9.2_p48.make_install.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- /Makefile.am	2010-03-11 15:44:49.000000000 +0100
-+++ /Makefile.am.new	2010-03-11 15:45:00.000000000 +0100
-@@ -8,21 +8,6 @@
- pkgconfigdir=$(libdir)/pkgconfig
- pkgconfig_DATA = libwbxml2.pc
- 
--wbxmldocdir = ${prefix}/share/doc/wbxml2-${VERSION}
--wbxmldoc_DATA = \
--	AUTHORS\
--	bootstrap\
--	BUGS\
--	ChangeLog\
--	COPYING\
--	GNU-LGPL\
--	INSTALL\
--	NEWS\
--	README\
--	References\
--	THANKS\
--	TODO
--
- dist-bz2: distdir
- 	sed -e "s/tar.gz/tar.bz2/g" $(distdir)/wbxml2.spec > $(distdir)/wbxml2.spec.aux
- 	mv $(distdir)/wbxml2.spec.aux $(distdir)/wbxml2.spec
diff --git a/dev-libs/libwbxml/libwbxml-0.10.8.ebuild b/dev-libs/libwbxml/libwbxml-0.10.8.ebuild
deleted file mode 100644
index 11d11c168ecd..000000000000
--- a/dev-libs/libwbxml/libwbxml-0.10.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwbxml/libwbxml-0.10.8.ebuild,v 1.2 2010/09/03 13:21:32 s4t4n Exp $
-
-inherit cmake-utils
-
-IUSE=""
-
-DESCRIPTION="Library and tools to parse, encode and handle WBXML documents."
-HOMEPAGE="http://libwbxml.opensync.org/"
-SRC_URI="mirror://sourceforge/libwbxml/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND=">=dev-libs/expat-2.0.1-r1"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	cmake-utils_src_install || die "installation failed"
-
-	#Fix doc installation directory. See bug #294592
-	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}" || die "installation failed"
-}
diff --git a/dev-libs/libwbxml/libwbxml-0.10.6.ebuild b/dev-libs/libwbxml/libwbxml-0.10.9.ebuild
index f4ae18ba607e..d18830c75ab1 100644
--- a/dev-libs/libwbxml/libwbxml-0.10.6.ebuild
+++ b/dev-libs/libwbxml/libwbxml-0.10.9.ebuild
@@ -1,25 +1,32 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwbxml/libwbxml-0.10.6.ebuild,v 1.2 2010/09/03 13:21:32 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwbxml/libwbxml-0.10.9.ebuild,v 1.1 2011/03/19 20:24:35 scarabeus Exp $
 
-inherit cmake-utils
+EAPI=4
 
-IUSE=""
+inherit cmake-utils
 
 DESCRIPTION="Library and tools to parse, encode and handle WBXML documents."
 HOMEPAGE="http://libwbxml.opensync.org/"
 SRC_URI="mirror://sourceforge/libwbxml/${P}.tar.bz2"
+KEYWORDS="~amd64 ~ppc ~x86"
 
+IUSE="test"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
 
-DEPEND=">=dev-libs/expat-2.0.1-r1"
+DEPEND="
+	dev-libs/expat
+	virtual/libiconv
+	test? ( dev-libs/check )
+"
 RDEPEND="${DEPEND}"
 
-src_install() {
-	cmake-utils_src_install || die "installation failed"
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_enable test UNIT_TEST)
+		"-DDOC_INSTALL_DIR=${EPREFIX}/usr/share/${PF}"
+	)
 
-	#Fix doc installation directory. See bug #294592
-	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}" || die "installation failed"
+	cmake-utils_src_configure
 }
diff --git a/dev-libs/libwbxml/libwbxml-0.9.2.ebuild b/dev-libs/libwbxml/libwbxml-0.9.2.ebuild
deleted file mode 100644
index edd30168f431..000000000000
--- a/dev-libs/libwbxml/libwbxml-0.9.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwbxml/libwbxml-0.9.2.ebuild,v 1.8 2008/06/04 15:40:03 flameeyes Exp $
-
-inherit eutils autotools
-
-IUSE=""
-
-MY_P="wbxml2-${PV}"
-
-DESCRIPTION="Library and tools to parse, encode and handle WBXML documents."
-HOMEPAGE="http://libwbxml.aymerick.com/"
-SRC_URI="mirror://sourceforge/wbxmllib/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND=">=dev-libs/expat-1.95.8"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4.1.4"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack()
-{
-	unpack ${A}
-	cd "${S}"
-
-	# Remove doc stuff from Makefile.am, otherwise make install complains
-	epatch "${FILESDIR}/${MY_P}.make_install.patch"
-
-	# Don't rewrite use CFLAGS, pass everything as AM_CFLAGS instead.
-	sed -i \
-		-e '/-\(O3\|g\)/d' \
-		-e '/-Wall/s:\\::' \
-		-e 's:CFLAGS:AM_CFLAGS:' \
-		{src,tools}/Makefile.am
-
-	eautoreconf
-}
-
-src_install()
-{
-	einstall || die "Installation failed"
-	dodoc AUTHORS BUGS ChangeLog NEWS README References THANKS TODO
-}
diff --git a/dev-libs/libwbxml/libwbxml-0.9.2_p48.ebuild b/dev-libs/libwbxml/libwbxml-0.9.2_p48.ebuild
deleted file mode 100644
index 74c9b5e5748b..000000000000
--- a/dev-libs/libwbxml/libwbxml-0.9.2_p48.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwbxml/libwbxml-0.9.2_p48.ebuild,v 1.7 2010/03/11 14:52:05 s4t4n Exp $
-
-inherit eutils autotools
-
-IUSE=""
-
-MY_P="wbxml2-${PV%%_p*}+svn49synce"
-
-DESCRIPTION="Library and tools to parse, encode and handle WBXML documents."
-HOMEPAGE="http://libwbxml.aymerick.com/"
-SRC_URI="mirror://sourceforge/synce/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND=">=dev-libs/expat-1.95.8"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack()
-{
-	unpack ${A}
-	cd "${S}"
-
-	# Remove doc stuff from Makefile.am, otherwise make install complains
-	epatch "${FILESDIR}/wbxml2-${PV}.make_install.patch"
-
-	# Don't rewrite use CFLAGS, pass everything as AM_CFLAGS instead.
-	sed -i \
-		-e '/-\(O3\|g\)/d' \
-		-e '/-Wall/s:\\::' \
-		-e 's:CFLAGS:AM_CFLAGS:' \
-		{src,tools}/Makefile.am
-
-	eautoreconf
-}
-
-src_install()
-{
-	einstall || die "Installation failed"
-	dodoc AUTHORS BUGS ChangeLog NEWS README References THANKS TODO
-}