dev-libs/uriparser: No longer try installing missing .gif files (bug #350131)

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

4 files changed, 63 insertions, 12 deletions

diff --git a/dev-libs/uriparser/ChangeLog b/dev-libs/uriparser/ChangeLog
index ba3650ddac92..ac21c74bc81f 100644
--- a/dev-libs/uriparser/ChangeLog
+++ b/dev-libs/uriparser/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/uriparser
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/uriparser/ChangeLog,v 1.29 2010/01/18 16:22:50 rbu Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/uriparser/ChangeLog,v 1.30 2011/06/14 18:52:46 sping Exp $
+
+  14 Jun 2011; Sebastian Pipping <sping@gentoo.org> uriparser-0.7.5.ebuild,
+  +files/uriparser-0.7.5-no-gifs.patch:
+  No longer try installing missing .gif files (bug #350131)
 
   18 Jan 2010; Robert Buchholz <rbu@gentoo.org> metadata.xml:
   Dropping maintenance, adding sping
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index 0c89b7dc8c3e..bcbad4520379 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -1,4 +1,5 @@
+AUX uriparser-0.7.5-no-gifs.patch 1063 RMD160 229e2238ba46f452082abcd45e46b3a96e01c423 SHA1 f0473b830e523f8fb3b139023b27c2d2aef6e0a0 SHA256 06f508d688b5279d82a6762b4fcf410800af804b0494f5d72ed420ae0672537a
 DIST uriparser-0.7.5.tar.bz2 408363 RMD160 657fb03fbeb4210d94721b86cf475b6e28717d0b SHA1 146b138b0c0022bc2234c1269e6bf44a57ec026c SHA256 2a963348fb797475e9d7188da46af0a9b6e676d5ab98458f2799d352d56d5be4
-EBUILD uriparser-0.7.5.ebuild 1056 RMD160 61c40460ca5d068913c610fc5dc18f92e7f5a8b5 SHA1 9a7518fa564b9ccc2a0d53946158d709382c7388 SHA256 d3ca98a9dc04456b3b21b3f578b0f4b00f3608307d37c78a732605ea7869e0a1
-MISC ChangeLog 4088 RMD160 27947402f8c8f3594140a494a2425130f4aa09df SHA1 121ac914a522635149d44a9dca92cc65f9f64c8e SHA256 b34408bb607293d02e1ff575a43b3eb1c34cdd8a40a3183dd20b50b84bd5bee5
+EBUILD uriparser-0.7.5.ebuild 1206 RMD160 d6715f1f4009b7d6daa4797fea5ad7b9bfde583e SHA1 d181c576066bd2849e59f42d1a50452fcd4a5022 SHA256 79cc9c02e0f87c061b3793a30c1d772b8b97c5c12988b52c7b299358b1985d0b
+MISC ChangeLog 4267 RMD160 4686608d1d94afd796c9aa073597cfc11e5dbbd8 SHA1 833211e15498807d009afbde248d857a207d34fb SHA256 98f90b89fa6d133f272afab25bd44059fdae66e8a530a486feb53173562f3453
 MISC metadata.xml 471 RMD160 2faf0aaf6fe122a68b16a41fe52aeb8d32e7304b SHA1 95e23dc9b3f07c5ac0b034d59a90f59448614e1a SHA256 7e1ea17fa4ac33db3fb2ce011e70038aa5f58f9bdcb5e0a6bb96084b9c2008cb
diff --git a/dev-libs/uriparser/files/uriparser-0.7.5-no-gifs.patch b/dev-libs/uriparser/files/uriparser-0.7.5-no-gifs.patch
new file mode 100644
index 000000000000..931559c3a155
--- /dev/null
+++ b/dev-libs/uriparser/files/uriparser-0.7.5-no-gifs.patch
@@ -0,0 +1,38 @@
+From 98272c1fc5c8451dcc43be70cdfb1070e3d72f3a Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Tue, 14 Jun 2011 20:28:43 +0200
+Subject: [PATCH] No longer copy Doxygen .gif files
+
+---
+ doc/Makefile.am   |    2 +-
+ doc/release.sh.in |    1 -
+ 2 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 4e63062..d29b77c 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -27,7 +27,7 @@ distclean-local:
+ ## Install doc files
+ install-data-local:
+ 	$(MKDIR_P) "$(DESTDIR)$(docdir)/html"  ## Didn't work with installdirs-local
+-	$(INSTALL_DATA) html/*.{css,gif,html,png} "$(DESTDIR)$(docdir)/html/"
++	$(INSTALL_DATA) html/*.{css,html,png} "$(DESTDIR)$(docdir)/html/"
+ 
+ 
+ ## Uninstall doc files
+diff --git a/doc/release.sh.in b/doc/release.sh.in
+index 59afb70..a930e64 100755
+--- a/doc/release.sh.in
++++ b/doc/release.sh.in
+@@ -15,7 +15,6 @@ rm -Rf "${distdir}" "${distdir}.zip"
+ mkdir -p "${distdir}/html"
+ cp \
+ 	html/*.css \
+-	html/*.gif \
+ 	html/*.html \
+ 	html/*.png \
+ 	\
+-- 
+1.7.5.3
+
diff --git a/dev-libs/uriparser/uriparser-0.7.5.ebuild b/dev-libs/uriparser/uriparser-0.7.5.ebuild
index d422aad11e63..9200561a28ab 100644
--- a/dev-libs/uriparser/uriparser-0.7.5.ebuild
+++ b/dev-libs/uriparser/uriparser-0.7.5.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/uriparser/uriparser-0.7.5.ebuild,v 1.8 2010/01/14 21:28:17 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/uriparser/uriparser-0.7.5.ebuild,v 1.9 2011/06/14 18:52:46 sping Exp $
 
 EAPI=2
 
+inherit eutils autotools
+
 DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
 HOMEPAGE="http://uriparser.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
@@ -11,14 +13,21 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc test"
+IUSE="doc qt4 test"
 
 RDEPEND=""
 DEPEND="dev-util/pkgconfig
 	doc? ( >=app-doc/doxygen-1.5.8
-		x11-libs/qt-assistant )
+		qt4? ( x11-libs/qt-assistant ) )
 	test? ( dev-util/cpptest )"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-gifs.patch
+
+	cd doc || die
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_enable doc) \
@@ -29,11 +38,10 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog THANKS doc/*.txt
-	dohtml doc/*.htm
+	dodoc AUTHORS ChangeLog THANKS doc/*.txt || die
 
-	if use doc; then
+	if use doc && use qt4; then
 		insinto /usr/share/doc/${PF}/
-		doins doc/*.qch  # Avoiding dodoc's compression
+		doins doc/*.qch || die  # Using doins to avoiding dodoc's compression
 	fi
 }