Fix documentation directory, bug 364857

Package-Manager: portage-2.1.9.49/cvs/Linux x86_64

4 files changed, 138 insertions, 2 deletions

diff --git a/media-libs/libwpg/ChangeLog b/media-libs/libwpg/ChangeLog
index aa7139ae40d1..44bdcbaf1a74 100644
--- a/media-libs/libwpg/ChangeLog
+++ b/media-libs/libwpg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libwpg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libwpg/ChangeLog,v 1.18 2011/04/24 17:22:51 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwpg/ChangeLog,v 1.19 2011/05/14 15:41:32 dilfridge Exp $
+
+*libwpg-0.2.0-r1 (14 May 2011)
+*libwpg-0.1.3-r2 (14 May 2011)
+
+  14 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +libwpg-0.1.3-r2.ebuild, +libwpg-0.2.0-r1.ebuild:
+  Fix documentation directory, bug 364857
 
   24 Apr 2011; Gilles Dartiguelongue <eva@gentoo.org> libwpg-0.1.3.ebuild:
   Move the old ebuild revision to proper slot.
diff --git a/media-libs/libwpg/Manifest b/media-libs/libwpg/Manifest
index ac2ff8093a83..270f8a2249dc 100644
--- a/media-libs/libwpg/Manifest
+++ b/media-libs/libwpg/Manifest
@@ -1,7 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST libwpg-0.1.3.tar.bz2 285550 RMD160 b4a51403491dcc5679c99b3b82737892648ca054 SHA1 1ab29ea5b7f01e8fb351361ed5e9e800321b67d3 SHA256 47f5c8d31e1b18d8f3b73a3dbbf78b6a2c4230b00f0be56e3547c56a867fd520
 DIST libwpg-0.2.0.tar.bz2 326684 RMD160 0169a85c75040dd96b03702c5d2cd67dfded6d1f SHA1 34a692566bda66488f83c635774d1bd92cee0fdf SHA256 d823f4b2ddfe349cca09e40bd57af8220e8bf935bcfb66be520e02ba4d327dc6
 EBUILD libwpg-0.1.3-r1.ebuild 1636 RMD160 b269481e4c859e01b6f866f57f8a116924e090d0 SHA1 4212ed73aaba53de45ce4eb1e05af521a2914a56 SHA256 a271f5bf6a96243f054588b39aa1a9ef101a0910bf80884fdf9228a5bf049882
+EBUILD libwpg-0.1.3-r2.ebuild 1684 RMD160 8c4047b35fb7eb90b4042ad8120899b07a89a6a0 SHA1 9b155b65fa7ca7fc7c4550a13ba6cf87e298205a SHA256 7ce58e824160ec9898b93fba051a5c830ef358a6eba4c2cb8b08d6d5a45433b1
 EBUILD libwpg-0.1.3.ebuild 823 RMD160 b3a39ab89a00bcb16e541606e41b6389ea883ac0 SHA1 d0864e0c48e7484073ee73e96d500f3ad3d68cff SHA256 3c70bf0d18c19b0d63a915dbced6212c75e42e76ec00732d72b52e1774444b39
+EBUILD libwpg-0.2.0-r1.ebuild 1692 RMD160 2c8271f41e22712cb03798d37ee03fdab9a0a9a8 SHA1 408ca8c4eb8b542871aaf9cb298fd7798f7c702d SHA256 72298f1844d9b62fdef1995c4f972c3ebd94873a52e5859960b6feb1b212d298
 EBUILD libwpg-0.2.0.ebuild 1635 RMD160 9e88720a1e13fa1ee665561828650a5abc4ca25c SHA1 050d1b22226b02e837bc2996a06679a0e92bdd29 SHA256 d8ffa97a8cdb798792d4270e8886de072dc489209f5fe23295f630d4b3e4f0f2
-MISC ChangeLog 2338 RMD160 838e2a582af06113ab8818ed570f012094c6ac55 SHA1 d0886e2afd3bcca5b455accdd0fde35b2badefc0 SHA256 e65af11833883e5232b9af732675a26733ccade89e306a77626f6d43cf35f688
+MISC ChangeLog 2559 RMD160 7f01e766cf59afcf85e1eac40f84d20911fb1e2c SHA1 b85be7000fdbe9ea1476bee6a52421bb43948725 SHA256 d099bfaa6465be702f5330e589992c90e38bd37ab88281778cf18ce69f0587d2
 MISC metadata.xml 222 RMD160 f886df34a2e2ab5dec6a9b4eb154d37ade9ea977 SHA1 fb8e8bfe95993793f579d3a842fcf69b9c11462c SHA256 27fe41ff354ef423be79c6d75cc3ff75ba7ec53a02942d7c7f15140bd6330eff
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJNzqecAAoJENwGBM22xffe0HkP/RYXGZQU+ioDLn4KJsnjO/rN
+GtK4Lk9+FQZlGAMZQqOTaJsrdw72lITOmJicYDHBrz/jjFfMF69a5UEElP6Uz5tj
+Vq1UDgYJFvb3QEMYEcTYMGCVodPIpPhYZ5SyDPXSlAp89xM2Gam67GDuzLHkun95
+ph5aCX/UXpOCQKcEHoaKtvUlLt+DCyivTK+KoqAqdAQxGSl3Rw9On9SdWTrqeaaR
+u2LxIMDfeW9wzpJdLKHh6mgUstisR5zb9/kAUtTQmtz73B+UWL5cQmmn4daVH7hJ
+r3ZbVBta5DCTYc+iV0tUQS98g188BZ4WKlWbdGPj7ifq+quffiGlDqvTJY2kwg5x
+Pf/ZQAQR2cMtur+q+R7v4kAbxNwdkldBMhK1o3U5dfYweIH+cUO7crukloQ0GO+N
+t+gVBJv7zOGu5SC05E2GUDrC7WXQbC1s2a2GuYxj2k59ry8rwWP6BVhXD9zDSM1k
+yFrArm6l/d6t2CdttnNWOMNVYp+OWaqbuemvRdD1gvn0OGTV6vcpE0vyV90jk5Kt
+KCVv8rbUXzZjdw8Gp5CjQf2ec9qep9PV7DuSIdkXMqpHId8uhtpmoUuPaz3Hrc/g
+ajmYwGYdvOZg4DTIi7clo5nKoNQwxyphsvv8smPJiqk16lQw21ziwZdWq7CrvilV
+U3faRKbAqV1J1f4q/UOQ
+=58qq
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libwpg/libwpg-0.1.3-r2.ebuild b/media-libs/libwpg/libwpg-0.1.3-r2.ebuild
new file mode 100644
index 000000000000..393448482c12
--- /dev/null
+++ b/media-libs/libwpg/libwpg-0.1.3-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwpg/libwpg-0.1.3-r2.ebuild,v 1.1 2011/05/14 15:41:32 dilfridge Exp $
+
+EAPI="4"
+
+inherit alternatives
+
+DESCRIPTION="C++ library to read and parse graphics in WPG"
+HOMEPAGE="http://libwpg.sourceforge.net/libwpg.htm"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc tools"
+
+RDEPEND="app-text/libwpd:0.8[tools?]"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_configure() {
+	econf \
+		--program-suffix=-${SLOT} \
+		--disable-dependency-tracking \
+		--docdir="${EPREFIX%/}/usr/share/doc/${PF}" \
+		$(use_with doc docs) \
+		$(use_with tools stream)
+}
+
+src_install() {
+	default
+	# Uses a binary that is conditionaly distributed
+	use tools || rm "${ED}"/usr/bin/wpg2svgbatch.pl-${SLOT}
+	find "${ED}" -name '*.la' -delete
+}
+
+pkg_postinst() {
+	if use tools; then
+		alternatives_auto_makesym /usr/bin/wpg2svgbatch.pl "/usr/bin/wpg2svgbatch.pl-[0-9].[0-9]"
+		alternatives_auto_makesym /usr/bin/wpg2svg "/usr/bin/wpg2svg-[0-9].[0-9]"
+		alternatives_auto_makesym /usr/bin/wpg2raw "/usr/bin/wpg2raw-[0-9].[0-9]"
+	fi
+}
+
+pkg_postrm() {
+	if use tools; then
+		alternatives_auto_makesym /usr/bin/wpg2svgbatch.pl "/usr/bin/wpg2svgbatch.pl-[0-9].[0-9]"
+		alternatives_auto_makesym /usr/bin/wpg2svg "/usr/bin/wpg2svg-[0-9].[0-9]"
+		alternatives_auto_makesym /usr/bin/wpg2raw "/usr/bin/wpg2raw-[0-9].[0-9]"
+	fi
+}
diff --git a/media-libs/libwpg/libwpg-0.2.0-r1.ebuild b/media-libs/libwpg/libwpg-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..f9a0f8fb5af3
--- /dev/null
+++ b/media-libs/libwpg/libwpg-0.2.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwpg/libwpg-0.2.0-r1.ebuild,v 1.1 2011/05/14 15:41:32 dilfridge Exp $
+
+EAPI="4"
+
+inherit alternatives autotools
+
+DESCRIPTION="C++ library to read and parse graphics in WPG"
+HOMEPAGE="http://libwpg.sourceforge.net/libwpg.htm"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND="app-text/libwpd:0.9[tools]"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
+RDEPEND="${RDEPEND}
+	!<app-text/libwpd-0.1.3-r1"
+
+src_prepare() {
+	sed -i -e 's: -Werror::g' configure.in || die
+	# FIXME: Touching configure.in triggers maintainer-mode always
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--program-suffix=-${SLOT} \
+		--disable-dependency-tracking \
+		--docdir="${EPREFIX%/}/usr/share/doc/${PF}" \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete
+}
+
+pkg_postinst() {
+	alternatives_auto_makesym /usr/bin/wpg2svgbatch.pl "/usr/bin/wpg2svgbatch.pl-[0-9].[0-9]"
+	alternatives_auto_makesym /usr/bin/wpg2svg "/usr/bin/wpg2svg-[0-9].[0-9]"
+	alternatives_auto_makesym /usr/bin/wpg2raw "/usr/bin/wpg2raw-[0-9].[0-9]"	fi
+}
+
+pkg_postrm() {
+	alternatives_auto_makesym /usr/bin/wpg2svgbatch.pl "/usr/bin/wpg2svgbatch.pl-[0-9].[0-9]"
+	alternatives_auto_makesym /usr/bin/wpg2svg "/usr/bin/wpg2svg-[0-9].[0-9]"
+	alternatives_auto_makesym /usr/bin/wpg2raw "/usr/bin/wpg2raw-[0-9].[0-9]"
+}