Patch to prevent html docs installation with -doc

(Portage version: 2.2_rc86/cvs/Linux i686)

4 files changed, 35 insertions, 25 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/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"