summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirkjan Ochtman <djc@gentoo.org>2010-06-07 10:39:44 +0000
committerDirkjan Ochtman <djc@gentoo.org>2010-06-07 10:39:44 +0000
commit060c3c416c9303c5747904602bdd1e0231298df2 (patch)
treea230b27767ab6035896861740912511f6ed54374
parentFix keywords, punt old (diff)
downloadhistorical-060c3c416c9303c5747904602bdd1e0231298df2.tar.gz
historical-060c3c416c9303c5747904602bdd1e0231298df2.tar.bz2
historical-060c3c416c9303c5747904602bdd1e0231298df2.zip
Prevent installation of files in /usr/share/doc, bug 315983.
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
-rw-r--r--dev-python/imdbpy/ChangeLog6
-rw-r--r--dev-python/imdbpy/Manifest5
-rw-r--r--dev-python/imdbpy/files/4.5.1-no-docs.patch12
-rw-r--r--dev-python/imdbpy/imdbpy-4.5.1.ebuild8
4 files changed, 26 insertions, 5 deletions
diff --git a/dev-python/imdbpy/ChangeLog b/dev-python/imdbpy/ChangeLog
index eec65cb6a2be..cb5049f450c0 100644
--- a/dev-python/imdbpy/ChangeLog
+++ b/dev-python/imdbpy/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/imdbpy
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imdbpy/ChangeLog,v 1.3 2010/03/01 22:19:42 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imdbpy/ChangeLog,v 1.4 2010/06/07 10:39:44 djc Exp $
+
+ 07 Jun 2010; Dirkjan Ochtman <djc@gentoo.org> +files/4.5.1-no-docs.patch,
+ imdbpy-4.5.1.ebuild:
+ Prevent installation of files in /usr/share/doc directly (bug 315983).
*imdbpy-4.5.1 (01 Mar 2010)
diff --git a/dev-python/imdbpy/Manifest b/dev-python/imdbpy/Manifest
index 953cbd0bb280..2bcbe231185d 100644
--- a/dev-python/imdbpy/Manifest
+++ b/dev-python/imdbpy/Manifest
@@ -1,6 +1,7 @@
+AUX 4.5.1-no-docs.patch 510 RMD160 4cfdb61396917934dd641f3ab90539fa1ce43545 SHA1 cb1986add57726ea58f1248ef87286e14de8e0f7 SHA256 5a496e9606a40e26a48b17e70fd237a3a043c90c64dd4e685b3aa4eef54770c6
DIST IMDbPY-4.4.tar.gz 284447 RMD160 1fb9f02370611c40b455e51a6bbf4163a9147222 SHA1 49992a2b273fb0aae46c10ef02c542acb67c5c3e SHA256 3f50da6e68ceeedf9126a16fa4481b6d37c1b931f2360637ca2bb3c96434eede
DIST IMDbPY-4.5.1.tar.gz 286295 RMD160 2935cb4b503df22f86ccf77b33196513b9e77f63 SHA1 ea0b15e4ec2fb6dac105e0d7dc91f56748877e38 SHA256 55451f0807e0669fb4c5cfd3017b85e31a90728d7683c63b1a800aef41a8062b
EBUILD imdbpy-4.4.ebuild 793 RMD160 04918e23540339c38ecd22277d8554e6a582c165 SHA1 575f0a8b06b281ef72d688d7b9d34e3ddaf84cdc SHA256 60bd065d237a5aee57995bd5321ca445cf2cc55fffaf2483303e4aa90682b99f
-EBUILD imdbpy-4.5.1.ebuild 813 RMD160 87948836912129268bf239360952d8315d9375e5 SHA1 69d9c4e49296051ec6cdbac1d75f2594e76bf955 SHA256 97174dc7cd54af3bab9020aacc6ac05b8bcb7583c49206a0ac101410c69c2139
-MISC ChangeLog 653 RMD160 9b57e44b58845cf59556dd56424c207ad2a3b85c SHA1 edc78dc99e3eb8838f9bd05ef3d74cc37d957728 SHA256 77763a67064af12419c2725b950765c3b128dc8da864d7fc375d56edfa0c781f
+EBUILD imdbpy-4.5.1.ebuild 876 RMD160 76fbd751b0f8c015363bca2903037246c966d793 SHA1 6d8f1b6e010f66893a440bd72032394b41213d2c SHA256 32fe59e20298576aeb630c1a3017f4129b0f48016592ed1ce215292c8b7ee1f5
+MISC ChangeLog 821 RMD160 477d668cbfa39819fb97911033431e66abddb302 SHA1 09dd4d63bfcf6fe0c0caa653a8cfe9187837eb7e SHA256 b74df51cbab479d0e7aac577a2d4011bee0d16ef2bac02be749ebb98ca7555b7
MISC metadata.xml 161 RMD160 e1c10e4321c70e0752e41a4909831c47de1cfd0d SHA1 e03cfc9021651dfa64a0444baa0c6058da30a4dd SHA256 ee315f25ee3b5edbd138bce91f89663222510dd606e94895beb7ff0983dc5da6
diff --git a/dev-python/imdbpy/files/4.5.1-no-docs.patch b/dev-python/imdbpy/files/4.5.1-no-docs.patch
new file mode 100644
index 000000000000..4b84a3cb0965
--- /dev/null
+++ b/dev-python/imdbpy/files/4.5.1-no-docs.patch
@@ -0,0 +1,12 @@
+--- setup.py.old 2010-06-07 12:26:43.000000000 +0200
++++ setup.py 2010-06-07 12:26:59.000000000 +0200
+@@ -69,8 +69,7 @@
+
+ # XXX: I'm not sure that 'etc' is a good idea. Making it an absolute
+ # path seems a recipe for a disaster (with bdist_egg, at least).
+-data_files = [('doc', [f for f in setuptools.findall('docs')
+- if '.svn' not in f]), ('etc', ['docs/imdbpy.cfg'])]
++data_files = [('etc', ['docs/imdbpy.cfg'])]
+
+
+ # Defining these 'features', it's possible to run commands like:
diff --git a/dev-python/imdbpy/imdbpy-4.5.1.ebuild b/dev-python/imdbpy/imdbpy-4.5.1.ebuild
index aecf4c3f54c5..5312a250891d 100644
--- a/dev-python/imdbpy/imdbpy-4.5.1.ebuild
+++ b/dev-python/imdbpy/imdbpy-4.5.1.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imdbpy/imdbpy-4.5.1.ebuild,v 1.1 2010/03/01 22:19:42 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imdbpy/imdbpy-4.5.1.ebuild,v 1.2 2010/06/07 10:39:44 djc Exp $
EAPI="2"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
-inherit distutils
+inherit distutils eutils
MY_PN="IMDbPY"
MY_P="${MY_PN}-${PV}"
@@ -28,6 +28,10 @@ S="${WORKDIR}/${MY_PN}-${PV}"
PYTHON_MODNAME="imdb"
+src_prepare() {
+ epatch "${FILESDIR}/${PV}-no-docs.patch"
+}
+
src_install() {
distutils_src_install
dodoc docs/*