Stabilise latest on all archs as it fixes annoying bugs.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

4 files changed, 9 insertions, 87 deletions

diff --git a/media-libs/libvisio/ChangeLog b/media-libs/libvisio/ChangeLog
index e4ce38262c2d..b346e73780e7 100644
--- a/media-libs/libvisio/ChangeLog
+++ b/media-libs/libvisio/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libvisio
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisio/ChangeLog,v 1.39 2012/11/21 10:06:47 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisio/ChangeLog,v 1.40 2012/11/21 10:09:56 scarabeus Exp $
+
+  21 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/libvisio-0.0.20-fix-underlinking-with-gold.patch,
+  -libvisio-0.0.19.ebuild, libvisio-0.0.21.ebuild:
+  Stabilise latest on all archs as it fixes annoying bugs.
 
 *libvisio-0.0.21 (21 Nov 2012)
 
diff --git a/media-libs/libvisio/files/libvisio-0.0.20-fix-underlinking-with-gold.patch b/media-libs/libvisio/files/libvisio-0.0.20-fix-underlinking-with-gold.patch
deleted file mode 100644
index 5b292c87ab02..000000000000
--- a/media-libs/libvisio/files/libvisio-0.0.20-fix-underlinking-with-gold.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d0d0f37ce6bac9320b6410970f48ad09d6425db6 Mon Sep 17 00:00:00 2001
-From: Tomas Chvatal <tchvatal@suse.cz>
-Date: Wed, 7 Nov 2012 07:30:40 +0100
-Subject: [PATCH] Fix underlinking with gold.
-
----
- configure.ac |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4e4017e..bf5eb04 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -222,8 +222,8 @@ AS_IF([test "x$native_win32" = "xyes"], [
- 		CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wshadow -pedantic"
- 	])
- ])
--LIBVISIO_CXXFLAGS="${WPD_CFLAGS} ${WPG_CFLAGS} ${LIBXML_CFLAGS}"
--LIBVISIO_LIBS="${WPD_LIBS} ${WPG_LIBS} ${LIBXML_LIBS}"
-+LIBVISIO_CXXFLAGS="${WPD_CFLAGS} ${WPG_CFLAGS} ${LIBXML_CFLAGS} ${ZLIB_CFLAGS}"
-+LIBVISIO_LIBS="${WPD_LIBS} ${WPG_LIBS} ${LIBXML_LIBS} ${ZLIB_LIBS}"
- AC_SUBST(LIBVISIO_CXXFLAGS)
- AC_SUBST(LIBVISIO_LIBS)
- 
--- 
-1.7.8.6
-
diff --git a/media-libs/libvisio/libvisio-0.0.19.ebuild b/media-libs/libvisio/libvisio-0.0.19.ebuild
deleted file mode 100644
index dfdc507a00d3..000000000000
--- a/media-libs/libvisio/libvisio-0.0.19.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisio/libvisio-0.0.19.ebuild,v 1.3 2012/11/16 19:53:54 ago Exp $
-
-EAPI=4
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/contrib/libvisio/"
-inherit base
-[[ ${PV} == 9999 ]] && inherit autotools git-2
-
-DESCRIPTION="Library parsing the visio documents"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/libvisio"
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ppc x86"
-
-IUSE="doc static-libs"
-
-RDEPEND="
-	app-text/libwpd:0.9
-	app-text/libwpg:0.2
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.46
-	virtual/pkgconfig
-	sys-devel/libtool
-	doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	[[ -d m4 ]] || mkdir "m4"
-	base_src_prepare
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static) \
-		--disable-werror \
-		$(use_with doc docs)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/media-libs/libvisio/libvisio-0.0.21.ebuild b/media-libs/libvisio/libvisio-0.0.21.ebuild
index 80bac9b64af5..38f0ade42b49 100644
--- a/media-libs/libvisio/libvisio-0.0.21.ebuild
+++ b/media-libs/libvisio/libvisio-0.0.21.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisio/libvisio-0.0.21.ebuild,v 1.1 2012/11/21 10:06:47 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisio/libvisio-0.0.21.ebuild,v 1.2 2012/11/21 10:09:56 scarabeus Exp $
 
-EAPI=4
+EAPI=5
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/contrib/libvisio/"
 inherit base autotools
@@ -17,7 +17,7 @@ SLOT="0"
 
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 IUSE="doc static-libs"
 
@@ -34,10 +34,6 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-fix-underlinking-with-gold.patch"
-)
-
 src_prepare() {
 	[[ -d m4 ]] || mkdir "m4"
 	base_src_prepare