Fix libvisio not install doc to correct location. Stable 0.0.14 on amd64 and x86. Fixes bug #403943

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

4 files changed, 24 insertions, 66 deletions

diff --git a/media-libs/libvisio/ChangeLog b/media-libs/libvisio/ChangeLog
index 46ecd18feeb1..d7540d6a02cf 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.18 2012/02/14 19:27:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisio/ChangeLog,v 1.19 2012/02/15 21:04:32 scarabeus Exp $
+
+  15 Feb 2012; Tomáš Chvátal <scarabeus@gentoo.org> -libvisio-0.0.8.ebuild,
+  libvisio-0.0.14.ebuild:
+  Fix libvisio not install doc to correct location. Stable 0.0.14 on amd64 and
+  x86. Fixes bug #403943
 
   14 Feb 2012; Tomáš Chvátal <scarabeus@gentoo.org> libvisio-0.0.14.ebuild:
   Fix typo wrt bug #401531.
diff --git a/media-libs/libvisio/Manifest b/media-libs/libvisio/Manifest
index 5e3c4b080c79..dcbee2bb3724 100644
--- a/media-libs/libvisio/Manifest
+++ b/media-libs/libvisio/Manifest
@@ -2,26 +2,24 @@
 Hash: SHA1
 
 DIST libvisio-0.0.14.tar.xz 315620 RMD160 839a9622fdc3da8c20d6f220535c93422785e0e7 SHA1 9127d5b08fdfd4c3441588a073be38a5025bb9f0 SHA256 4528042a6df7ec462342a116ed8631865c4c835f58a54b44b96a0be52c1aa4e4
-DIST libvisio-0.0.8.tar.xz 282732 RMD160 50a513fba64cbc32904ec697f63f384954217cfc SHA1 adde696194cb117ef5d80b90e4ff2441fa15930d SHA256 8d7530734dd861425088df5aeb8216ee517f76d30bca2c5ff5f3e507d5d971da
-EBUILD libvisio-0.0.14.ebuild 1106 RMD160 4e52ada6bb42fedf5d5781f1fc2731cdf523f031 SHA1 701c8e75428a9eaa8209bfa72c5738370ba32018 SHA256 1903f8ccda2716cf07cb34023a1c11a236011c51e694d7741880b51e376d0137
-EBUILD libvisio-0.0.8.ebuild 1075 RMD160 010c8fde9c1371e757dd9ef1d37cd677165c5f39 SHA1 f6b0ab4e460835c15ea42831ddb5c4361d6a421f SHA256 b6c88de9b4f2d1a8c5b7cb50f6c08bf9ef00ce6cbef044a8c715d4bcab9a023e
+EBUILD libvisio-0.0.14.ebuild 1146 RMD160 f7d94a47b41e10ea5ec71014bd485ea2b848146b SHA1 a7bb93c96de3f782bef686b8b8c92192844e0d9e SHA256 07c2f18f3c12dca18b0823af86e77485a4e3d36dff41e9ff74b7f6b102f861fa
 EBUILD libvisio-9999.ebuild 1125 RMD160 e803e320ca8e914f90ac72cc3ac61fafbfabd4f5 SHA1 98756e0b4df3ad5077a4bc8bc709c75c6fb9cdb6 SHA256 86a600633ca9f3eb187e01c730581f995ec2871dcddf41a7cced33aa1849e4fc
-MISC ChangeLog 3176 RMD160 e9da7351a1ea4be345332a2a487b2d176741e4cb SHA1 288d8215dcb371f9337e55d483ab40563e79b037 SHA256 7f50ccf53a8247d75347c24b40e51bd4196fc92e539cdc88ed9a4c2e135a34a9
+MISC ChangeLog 3386 RMD160 f30b367e0a9a1a8df3965cd1c8ac745923c59811 SHA1 1c8f4dfd8a198bbcee916125e682dcf3cf90e7dd SHA256 44b0ffd01b98a1ccaabfc0fb52968a00241986cbc79d82b421bf9f204bd9770f
 MISC metadata.xml 164 RMD160 fd8b45464863ba55ec9ffa050f8c7580be4ead20 SHA1 988d65b213818898ef7fc0eeedba86d0af4f18fe SHA256 6dd077e0a4bddf8cac0a6d7fb01d5f992a81c85d77d55787d19c6d4ae4c5aeeb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPOrWPAAoJEOSiRoyO7jvoL3cP/3K1V+YzOr8wFQaXr9fPNiNX
-X8G3wMl9ZntEubJpDDd543Fa3cV5b3ed9CkS7mfbGrYAYo9NTWFh/VuADR8wObFt
-vNZ5xegqZNy0/946LUEz+KGAbW/2qPf6ixxucab01OVPXwuFhhzMe+Gc1Rs7BnAZ
-KZXFvqIpQS5P6inbfentG9DIHIRVX/fmasxRAiZEESHF1jvdFeUgvF49l/KMDL0O
-wU8a7a0VApLFehFC3YtdgiepLo3QSvX89SI9cpEqKCW1WGyhfcFZSu3O6MvSVwKq
-vAVdVUJOEmVHFzCCA0cgFYfysahRYWfCBkuycWouSZPZCoKMOYQCE1kuu/nwqe+O
-1QCGgPy2/aRJjNZ7kEHA7RTtOLWSwQNH6TLCo3j4m0uxnmeSAkIaw2bwU8T6uEYz
-31hdB85s02ueSCQXbQz9gu/4ftHJyojVf8sTzWP8mKI7NtibtvioVm1RA3/edZ8h
-IdJAvuqgnWuWNCBlFAadBS7ipXWXHxCPKMvvIW70CNhnWEZKSbKyOsSQr3DT4zKQ
-LnDlRtG0lGg50FkntVywX9/ucugZ9LEHLSL03v1pNfuXOEDfYoqgU/sgvQ4zzsG7
-c0ASYblSqBsNRKREYjoV0qrEwzJZrZXv5iWtGW+Y1t0XNJ62fKnrR0/fdFrr1KwE
-pBolzn46d9RvrBjH2q/t
-=DHBk
+iQIcBAEBAgAGBQJPPB3qAAoJEOSiRoyO7jvoVkIP/jXKpV2BnPN5cG7dX5AKsIRi
+zxm6Y66SYE48YtwHinAIPNY+nQJgeQ5U0KSZfejxfJVIYABr1CjYIhX+09WGjtpH
+QoB+tdUEvHVd3SlVSclVCerBqNMZqziLco790oSMbCnSuWeGIWwlvNgTGxqppU+4
+Lmo0AnD+fLXAXpdVxXEtigsT4eFsRKIDEJvwFe2GarVc9iLttTgZwVHguEFPY2kH
+h8MQpiTRoLRd1F27HV6Xbf9X1S0/pYfA4PeYdmiXccD31A/RHroJ22P8JuBSbUhZ
+E4PL2WSI2dudf2cA3Pned3nJ3Yu0XhcoEilWlmqU0/sCMJn6TfDP5lcVUJPx5q2A
+Qxm1p50TWzjn049KV6VXhtOH6VZ17vAUM2Bf2bYlo5CRf2NkkbM2tRzJZ14NPeJ6
+jEZvqN1F/IY6bQZa+u1XX9g04oMJY8xYlJ39WUWfKwiz/Z8OdFBeWbHJIX959dQY
+3wB+XwUeHC6fduu/FSmI7jiPRnqzH2AJpSQUjAb9FRnYiMabZiMUva7Q9CzgSwXo
+ursnOU2DAug/WDa/eMfz+YEN+r9JtrgsOBxMhcPGru9ziJJ+BlOoZozgmo8as9eG
+HbMFNs6YeJvrASO6oN7bxZrkBvYe+UNMUujevwvFWSTS+XlAyvGydUdN8ubJyR5i
+ON7iqTEl5E8ylcr32YS6
+=5hzN
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libvisio/libvisio-0.0.14.ebuild b/media-libs/libvisio/libvisio-0.0.14.ebuild
index 37bd890cb772..6dbac239fd15 100644
--- a/media-libs/libvisio/libvisio-0.0.14.ebuild
+++ b/media-libs/libvisio/libvisio-0.0.14.ebuild
@@ -1,6 +1,6 @@
 # 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.14.ebuild,v 1.2 2012/02/14 19:27:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisio/libvisio-0.0.14.ebuild,v 1.3 2012/02/15 21:04:32 scarabeus Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/libvisio"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~ppc ~x86"
+[[ ${PV} == 9999 ]] || KEYWORDS="amd64 ~ppc x86"
 IUSE="doc static-libs"
 
 RDEPEND="
@@ -36,6 +36,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--docdir="${EPREFIX}/usr/share/${PF}" \
 		$(use_enable static-libs static) \
 		--disable-werror \
 		$(use_with doc docs)
diff --git a/media-libs/libvisio/libvisio-0.0.8.ebuild b/media-libs/libvisio/libvisio-0.0.8.ebuild
deleted file mode 100644
index 19919ad54bd9..000000000000
--- a/media-libs/libvisio/libvisio-0.0.8.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisio/libvisio-0.0.8.ebuild,v 1.3 2011/12/04 15:59:31 scarabeus Exp $
-
-EAPI=4
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/contrib/libvisio/"
-[[ ${PV} == 9999 ]] && vcs="autotools git-2"
-inherit base ${vcs}
-unset vcs
-
-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"
-[[ ${PV} == 9999 ]] || KEYWORDS="amd64 ~x86"
-IUSE="doc static-libs"
-
-RDEPEND="
-	app-text/libwpd:0.9
-	app-text/libwpg:0.2
-"
-DEPEND="${DEPEND}
-	dev-util/pkgconfig
-	sys-devel/libtool
-	doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	base_src_prepare
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--disable-werror \
-		$(use_with doc docs)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}