summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-08-19 13:57:44 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-08-19 13:57:44 +0000
commitd875395dab09138284734d15f6d3eca37222274f (patch)
treeb9ab733e7489094ec1d39dcadafa3e20ef6951bb /media-libs/tiff
parentStable for ppc, wrt bug #477172 (diff)
downloadgentoo-2-d875395dab09138284734d15f6d3eca37222274f.tar.gz
gentoo-2-d875395dab09138284734d15f6d3eca37222274f.tar.bz2
gentoo-2-d875395dab09138284734d15f6d3eca37222274f.zip
Remove content of /usr/share in src_install() instead of setting empty DOCS= which is breaking paludis and is supposedly against PMS too wrt #481642
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'media-libs/tiff')
-rw-r--r--media-libs/tiff/ChangeLog6
-rw-r--r--media-libs/tiff/tiff-3.9.7-r1.ebuild10
2 files changed, 12 insertions, 4 deletions
diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index 99b70b830091..6f6ca6fcfe00 100644
--- a/media-libs/tiff/ChangeLog
+++ b/media-libs/tiff/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/tiff
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.239 2013/08/13 11:41:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.240 2013/08/19 13:57:44 ssuominen Exp $
+
+ 19 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> tiff-3.9.7-r1.ebuild:
+ Remove content of /usr/share in src_install() instead of setting empty DOCS=
+ which is breaking paludis and is supposedly against PMS too wrt #481642
13 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> tiff-3.9.7-r1.ebuild:
Set empty DOCS to avoid any useless documentation from being installed as this
diff --git a/media-libs/tiff/tiff-3.9.7-r1.ebuild b/media-libs/tiff/tiff-3.9.7-r1.ebuild
index 203a0a61db38..4af1ce4c559c 100644
--- a/media-libs/tiff/tiff-3.9.7-r1.ebuild
+++ b/media-libs/tiff/tiff-3.9.7-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.9.7-r1.ebuild,v 1.2 2013/08/13 11:41:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.9.7-r1.ebuild,v 1.3 2013/08/19 13:57:44 ssuominen Exp $
EAPI=5
@@ -28,8 +28,6 @@ RDEPEND="jpeg? ( virtual/jpeg[${MULTILIB_USEDEP}] )
)"
DEPEND="${RDEPEND}"
-DOCS=""
-
src_prepare() {
epatch \
"${FILESDIR}"/${P}-CVE-2012-{4447,4564,5581}.patch \
@@ -67,3 +65,9 @@ multilib_src_install() {
rm -rf "${ED}"/tmp
}
+
+src_install() {
+ multilib-minimal_src_install
+ # Setting DOCS="" is broken wrt bug #481642
+ rm -rf "${ED}"/usr/share
+}