Patch to prevent html docs installation with -doc

Package-Manager: portage-2.2_rc86/cvs/Linux i686

5 files changed, 39 insertions, 28 deletions

diff --git a/dev-libs/libunistring/ChangeLog b/dev-libs/libunistring/ChangeLog
index f5466c0f3cc1..a03a8d587335 100644
--- a/dev-libs/libunistring/ChangeLog
+++ b/dev-libs/libunistring/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libunistring
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunistring/ChangeLog,v 1.2 2010/09/15 21:30:25 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunistring/ChangeLog,v 1.3 2010/10/06 01:46:39 chiiph Exp $
+
+  06 Oct 2010; Tomas Touceda <chiiph@gentoo.org>
+  libunistring-0.9.1.1.ebuild, libunistring-0.9.3.ebuild,
+  +files/libunistring-nodocs.patch:
+  Patch to prevent html docs installation with -doc
 
 *libunistring-0.9.3 (15 Sep 2010)
 
diff --git a/dev-libs/libunistring/Manifest b/dev-libs/libunistring/Manifest
index b6a96cb31f74..2c9e11b325b2 100644
--- a/dev-libs/libunistring/Manifest
+++ b/dev-libs/libunistring/Manifest
@@ -1,6 +1,7 @@
+AUX libunistring-nodocs.patch 476 RMD160 45c4858de7c26b23c391100d2f5cb81db9ef97dc SHA1 653ae2ca4c96072f72d4e5a9b228b5de3186f52f SHA256 c507a3be0469934ad5e057206941f3e4a062e8239001b22cb03e5481882096fe
 DIST libunistring-0.9.1.1.tar.gz 2355260 RMD160 47fc725d45ff5e813fb252ecfc73535b656d5145 SHA1 6e348443805d766919ec93aff37b80781a7e4096 SHA256 c5e142add13866f75ede5c1d451ec982af47c29bef3d1e2e28231f2b99d5190b
 DIST libunistring-0.9.3.tar.gz 2555215 RMD160 52d7cbec6288708fecd7c249e03dfcbec5bce910 SHA1 e1ea13c24a30bc93932d19eb5ad0704a618506dd SHA256 610d3ec724fbdaa654afe3cff20b9f4d504be3fd296fded2e0f7f764041006a3
-EBUILD libunistring-0.9.1.1.ebuild 849 RMD160 7294c9c138e73e7e413805aeea128b97f13c2d89 SHA1 75431d2df709f3e315f62d98b7beadf6e3e407f5 SHA256 624cebbc980d1ca9280ece8e8ddc0b744eebe15ce692b3d36ced5b8664097774
-EBUILD libunistring-0.9.3.ebuild 837 RMD160 e1c9e34dc204d18e032a1ecdf63a8ea8626e8598 SHA1 74cf1ef4fe78a338b3d3f1a78f3bdfc11d92b0c0 SHA256 51ba7b954ab82f03681369e03ed7eafd878feb2a7421555f748e1a2aab5ef4bf
-MISC ChangeLog 579 RMD160 772f89a0bc6371456cd7b752c600c9021c915b3b SHA1 20d65f543c70d8b85cc0f58292978f5d10146969 SHA256 0dddc5c5ec8bf9a6d7e954c73f113d9b94917071c0c58caced29e19a8f91ce93
+EBUILD libunistring-0.9.1.1.ebuild 818 RMD160 c97a13d39e0eac940f71203f01f9ecc41253fb99 SHA1 3671b44fd1a2a2d69a4f3b6b6a52905b1606f8a3 SHA256 fe305313813849351526679f8ca422f08904deefc0848d34c1c439d964552d95
+EBUILD libunistring-0.9.3.ebuild 816 RMD160 d894fbb5beec7ca729898121345a624004469f2d SHA1 28bf940b96e9b292efc17404838b3ac0e0ef7583 SHA256 5788bf0b18613d41d889ed4428375e8c188ad113838eb29375aac08e3fcdab56
+MISC ChangeLog 775 RMD160 05a6e0925ab7e294df567b9e3b351b04184ce9fd SHA1 27f1093b2fe0d40c63dfcaa32f8ba52274c968c8 SHA256 339ea1cbb624f2af4c52c9e8a92bf563b389715132389714f41dd8adbc22c9b2
 MISC metadata.xml 936 RMD160 6cdd096d307b7a20a8e23c9576946034db6fb89a SHA1 8f09ea18ab74afb21a20194600f060a67a402c44 SHA256 e329cb7da0a1384b9bf667e06d965d684038c40c24ff1a1082f5b0280e3c0744
diff --git a/dev-libs/libunistring/files/libunistring-nodocs.patch b/dev-libs/libunistring/files/libunistring-nodocs.patch
new file mode 100644
index 000000000000..07b003cb9217
--- /dev/null
+++ b/dev-libs/libunistring/files/libunistring-nodocs.patch
@@ -0,0 +1,12 @@
+diff -Naur libunistring-0.9.3.orig/Makefile.in libunistring-0.9.3/Makefile.in
+--- libunistring-0.9.3.orig/Makefile.in	2010-05-02 18:28:21.000000000 -0300
++++ libunistring-0.9.3/Makefile.in	2010-09-24 12:45:40.000000000 -0300
+@@ -773,7 +773,7 @@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
+ ACLOCAL_AMFLAGS = -I m4 -I gnulib-m4
+-SUBDIRS = doc gnulib-local lib tests
++SUBDIRS = gnulib-local lib tests
+ 
+ # Allow users to use "gnulib-tool --update".
+ 
diff --git a/dev-libs/libunistring/libunistring-0.9.1.1.ebuild b/dev-libs/libunistring/libunistring-0.9.1.1.ebuild
index 35c4437416df..1feff0302add 100644
--- a/dev-libs/libunistring/libunistring-0.9.1.1.ebuild
+++ b/dev-libs/libunistring/libunistring-0.9.1.1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunistring/libunistring-0.9.1.1.ebuild,v 1.1 2010/04/10 17:34:52 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunistring/libunistring-0.9.1.1.ebuild,v 1.2 2010/10/06 01:46:39 chiiph Exp $
 
-EAPI="2"
+EAPI="3"
+
+inherit eutils
 
 DESCRIPTION="Library for manipulating Unicode strings and C strings according to the Unicode standard"
 HOMEPAGE="http://www.gnu.org/software/libunistring/"
@@ -13,22 +15,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	if use doc; then
-		emake -C doc info html || die "Build doc failed"
-	fi
-
-	emake || die "Build failed"
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-nodocs.patch
 }
 
 src_install() {
-	dodoc AUTHORS README ChangeLog
+	dodoc AUTHORS README ChangeLog || die "dodoc failed"
 	if use doc; then
-		dohtml doc/libunistring.html
-		doinfo doc/libunistring.info
+		dohtml doc/*.html || die "dohtml failed"
+		doinfo doc/*.info || die "doinfo failed"
 	fi
 
 	emake DESTDIR="${D}" install || die "Install failed"
diff --git a/dev-libs/libunistring/libunistring-0.9.3.ebuild b/dev-libs/libunistring/libunistring-0.9.3.ebuild
index 5f0d039302f6..5cbc885a8d34 100644
--- a/dev-libs/libunistring/libunistring-0.9.3.ebuild
+++ b/dev-libs/libunistring/libunistring-0.9.3.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunistring/libunistring-0.9.3.ebuild,v 1.1 2010/09/15 21:30:25 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunistring/libunistring-0.9.3.ebuild,v 1.2 2010/10/06 01:46:39 chiiph Exp $
 
 EAPI="3"
 
+inherit eutils
+
 DESCRIPTION="Library for manipulating Unicode strings and C strings according to the Unicode standard"
 HOMEPAGE="http://www.gnu.org/software/libunistring/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
@@ -13,19 +15,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-src_compile() {
-	if use doc; then
-		emake -C doc info html || die "Build doc failed"
-	fi
-
-	emake || die "Build failed"
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-nodocs.patch
 }
 
 src_install() {
-	dodoc AUTHORS README ChangeLog || die
+	dodoc AUTHORS README ChangeLog || die "dodoc failed"
 	if use doc; then
-		dohtml doc/libunistring.html || die
-		doinfo doc/libunistring.info || die
+		dohtml doc/*.html || die "dohtml failed"
+		doinfo doc/*.info || die "doinfo failed"
 	fi
 
 	emake DESTDIR="${D}" install || die "Install failed"