Prevent installation of doc files, bug 315981.

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

diff --git a/app-admin/supervisor/ChangeLog b/app-admin/supervisor/ChangeLog
index 67c1a6f60349ee10bfc1ee293f028fa8355ffdff..5ae7c03c105058b55227d220862a9342a6566ed8 100644 (file)
--- a/app-admin/supervisor/ChangeLog
+++ b/app-admin/supervisor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/supervisor
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/ChangeLog,v 1.1 2010/03/09 13:45:31 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/ChangeLog,v 1.2 2010/06/07 10:23:47 djc Exp $
+
+  07 Jun 2010; Dirkjan Ochtman <djc@gentoo.org>
+  +files/3.0_alpha8-no-docs.patch, supervisor-3.0_alpha8.ebuild:
+  Prevent installation of doc files in /usr/share/doc directly (bug 315981).
 
 *supervisor-3.0_alpha8 (09 Mar 2010)
 

diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
index b75d1b621a4b1a278bba29c606844a4ac3ea1823..e6f07a79cb8975f5991ea1e5e220e7b73a3638c2 100644 (file)
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -1,6 +1,7 @@
+AUX 3.0_alpha8-no-docs.patch 607 RMD160 99e3a993b94de199ae8d9ba858d5021477b6725b SHA1 936b6f1bcb2fcb04c6f26fc38bf96b0be9637da6 SHA256 ec3fa157556714133fe0c2590855d0de3a6ae8cbf1426725c95f1396c485c9b8
 AUX conf.d 85 RMD160 f147f3b47c11337cb06f887dbdedeb3711e9734f SHA1 efa92ca887b8a8393038e5ab5875dfd315c631d8 SHA256 312ec20f53a96a4daf6f49c2928c4d1243a527ac8e32ecd882ec1a7a3d6b72eb
 AUX init.d 734 RMD160 a66d8d2c10a1e8b14ee3191bd84b3d2e3ac9500d SHA1 102c61cfea9b7c095c16a0f0096e3acb71f15f17 SHA256 089fab0a143af0b1d68b3edd442ec4c1267129585f30250261adfd0839f78506
 DIST supervisor-3.0a8.tar.gz 287705 RMD160 1dda7a52b3fb24b790de14e7b8644d4b713f646f SHA1 f3905d105e99127253dcb34a091495630a7fb947 SHA256 ce61afd01780ffba3e40ec244205b6db309da3b84ef27b5c5b179456050e5b8b
-EBUILD supervisor-3.0_alpha8.ebuild 965 RMD160 44d42669c73666d6d2dcd03ec555eb9e600e37ff SHA1 f14f48faf371c3a76a17dd64e3dbc2d5bd4ec8e9 SHA256 93f44f38cacbd3a85f053d3b242bb2d9e197b9714bd8061e80c7a28af7616b8d
-MISC ChangeLog 411 RMD160 c0a468269773722519f45bbcdb8bb1019144d4e6 SHA1 b508abbd556c73337cb55d2a4c80c145d566ebf7 SHA256 e81af977f4e1836be6e8d5b3aa933b273d48734cd49eddc17e435e43f3edb190
+EBUILD supervisor-3.0_alpha8.ebuild 1075 RMD160 e3d6f706884c476570106a753322fa8aa9622d00 SHA1 8ed5e40b07075d3ba32479f0e0e16d9c64db4f82 SHA256 00584cc1810d19cdc16d8397bb65ac2273579fd30342d31a9fcef8f6966678bd
+MISC ChangeLog 602 RMD160 9d233b0d13a7fde2ab0eaad6b3b59d74256c56f3 SHA1 e32ba56f7fc75de403e90bbddc33cd4de6fd9b1a SHA256 48e067461614e77c5493d101d0cbdcc0c1bf9a78785626739d346e1c7800699e
 MISC metadata.xml 259 RMD160 4b781a038008fac445e4154045f964b64ad59e75 SHA1 9809d89f3360f9f7537c2bb480d6bcbe942c6ea0 SHA256 0fb1da675767b69b5bd240d135effe2fc500e8b997a5f4eed212e5b26d027972

diff --git a/app-admin/supervisor/files/3.0_alpha8-no-docs.patch b/app-admin/supervisor/files/3.0_alpha8-no-docs.patch
new file mode 100644 (file)
index 0000000..c4e9470
--- /dev/null
+++ b/app-admin/supervisor/files/3.0_alpha8-no-docs.patch
@@ -0,0 +1,18 @@
+--- setup.py.old       2010-06-07 11:48:30.000000000 +0200
++++ setup.py   2010-06-07 11:48:40.000000000 +0200
+@@ -73,15 +73,6 @@
+     maintainer_email = "chrism@plope.com",
+     package_dir = {'':'src'},
+     packages = find_packages(os.path.join(here, 'src')),
+-    # put data files in egg 'doc' dir
+-    data_files=[ ('doc', [
+-        'README.txt',
+-        'CHANGES.txt',
+-        'TODO.txt',
+-        'LICENSES.txt',
+-        'COPYRIGHT.txt'
+-        ]
+-    )],
+     install_requires = requires,
+     extras_require = {'iterparse':['cElementTree >= 1.0.2']},
+     tests_require = requires + ['mock >= 0.5.0'],

diff --git a/app-admin/supervisor/supervisor-3.0_alpha8.ebuild b/app-admin/supervisor/supervisor-3.0_alpha8.ebuild
index 67fdfd358660ddf84ae15ef32cae52eb99b14874..e191eb5bf2788ec62e95096d2452e50d9db4fcb8 100644 (file)
--- a/app-admin/supervisor/supervisor-3.0_alpha8.ebuild
+++ b/app-admin/supervisor/supervisor-3.0_alpha8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/supervisor-3.0_alpha8.ebuild,v 1.1 2010/03/09 13:45:31 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/supervisor/supervisor-3.0_alpha8.ebuild,v 1.2 2010/06/07 10:23:47 djc Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -25,6 +25,12 @@ RESTRICT_PYTHON_ABIS="3.*"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
+DOCS="CHANGES.txt PKG-INFO README.txt TODO.txt"
+
+src_prepare() {
+       epatch "${FILESDIR}/${PV}-no-docs.patch"
+}
+
 src_install() {
        distutils_src_install
        newinitd "${FILESDIR}"/init.d supervisord