Fixing installation of HTML files and images (closing #149737 - thanks to Brad Walker...

Package-Manager: portage-2.1.2_rc4-r6

diff --git a/dev-python/mod_python/ChangeLog b/dev-python/mod_python/ChangeLog
index 7185c40893821195ea0c81a5c77dc4be821f510e..753289ffa59c36aee7b7945cbf1f6c64962256de 100644 (file)
--- a/dev-python/mod_python/ChangeLog
+++ b/dev-python/mod_python/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/mod_python
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.47 2006/10/08 19:34:51 kloeri Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.48 2007/01/11 19:25:40 phreak Exp $
+
+  11 Jan 2007; Christian Heim <phreak@gentoo.org> mod_python-2.7.11.ebuild,
+  mod_python-3.1.4.ebuild, mod_python-3.1.4-r1.ebuild,
+  mod_python-3.2.10.ebuild:
+  Fixing installation of HTML files and images (closing #149737 - thanks to
+  Brad Walker <bradmwalker@cableone.net>).
 
 *mod_python-3.2.10 (08 Oct 2006)
 

diff --git a/dev-python/mod_python/Manifest b/dev-python/mod_python/Manifest
index 7f3678c7ff363476d04652b4672a65a9971a3f1b..8c57a9e7cba5f0360641c6a67041bdd0391c8985 100644 (file)
--- a/dev-python/mod_python/Manifest
+++ b/dev-python/mod_python/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 16_mod_python-r1.conf 1101 RMD160 7221a2a77cc1481855bfac75191d666c642861b8 SHA1 2b2061929b9e2a6b2690b231718f269394151270 SHA256 fffa4ce78f0bbe242e88b19a23d1e69fcaa2cfad73954f72d78688ee3a9523d3
 MD5 fc933df167083c6c8abc4d2e28c6274d files/16_mod_python-r1.conf 1101
 RMD160 7221a2a77cc1481855bfac75191d666c642861b8 files/16_mod_python-r1.conf 1101
@@ -18,30 +21,30 @@ DIST mod_python-2.7.11.tgz 175763
 DIST mod_python-3.1.3.tgz 293548
 DIST mod_python-3.1.4.tgz 308510 RMD160 395fdf56a349717dadba418ce91cd5699cf0970f SHA1 d28022f6b14d0f7d01c6aed95a56e47f8df71f64 SHA256 f8e1925a0ade1adf4b5528e892eb347b013100d6c30b0e43209143b427c976a5
 DIST mod_python-3.2.10.tgz 365768 RMD160 2afdd0a80c815f8b9a1b33258e04ae17a12b7dbd SHA1 d3949d71c718e84b7897e9ce62fed26dea4c9584 SHA256 ac404c02ee052dcfbd8e303fe9148866c561be9b9a8a12cffee25276e147f13c
-EBUILD mod_python-2.7.11.ebuild 1723 RMD160 1ef8c65f2ac0a4f7bf667c9271950e44f19e0210 SHA1 2bd69d82401a3aaf1f2c3b5ec7d79ddf6c7f6ff9 SHA256 be85d0d4293081d4bc8e6ed0c50c7fcb0d00f69a381b4dbe002a744e90cb4b9f
-MD5 52e09367e4f5f4f0752f7cb696791127 mod_python-2.7.11.ebuild 1723
-RMD160 1ef8c65f2ac0a4f7bf667c9271950e44f19e0210 mod_python-2.7.11.ebuild 1723
-SHA256 be85d0d4293081d4bc8e6ed0c50c7fcb0d00f69a381b4dbe002a744e90cb4b9f mod_python-2.7.11.ebuild 1723
+EBUILD mod_python-2.7.11.ebuild 1662 RMD160 2ef719fb09427eb1b3f8d537f032183895b56eeb SHA1 e95215aaf80fc8973c817addd4a75d659f8b75b2 SHA256 4bfad933a85c0747901a337d0fa229fa65ab4ee90ac6a99737ec115ef8c91235
+MD5 3feede92d5dfa662a37af306bd5ef4f7 mod_python-2.7.11.ebuild 1662
+RMD160 2ef719fb09427eb1b3f8d537f032183895b56eeb mod_python-2.7.11.ebuild 1662
+SHA256 4bfad933a85c0747901a337d0fa229fa65ab4ee90ac6a99737ec115ef8c91235 mod_python-2.7.11.ebuild 1662
 EBUILD mod_python-3.1.3-r1.ebuild 1875 RMD160 db7f7210ccf4de0aa78939ef9173fdfea631222c SHA1 92822ca9d35e5c1d9a2caf90e93aee9a9ff2ccf1 SHA256 985daeab3897ebba1e603742623238b0ff774eacf143cfd58e42efaa2f774a5a
 MD5 c21328b1a8879707a158196fc9caa5c2 mod_python-3.1.3-r1.ebuild 1875
 RMD160 db7f7210ccf4de0aa78939ef9173fdfea631222c mod_python-3.1.3-r1.ebuild 1875
 SHA256 985daeab3897ebba1e603742623238b0ff774eacf143cfd58e42efaa2f774a5a mod_python-3.1.3-r1.ebuild 1875
-EBUILD mod_python-3.1.4-r1.ebuild 1659 RMD160 eeeb6f828ae169a76f37959e67a16954e796c532 SHA1 fce49800e69b84f5b06aa4b4c5bcc54eadac99e1 SHA256 305b1c9160f8d0a21fb32947da3e90dd15eed835131f4d606732e9b1b4a697b9
-MD5 2eb9f368d5513beed6f0c30d3d69d7bb mod_python-3.1.4-r1.ebuild 1659
-RMD160 eeeb6f828ae169a76f37959e67a16954e796c532 mod_python-3.1.4-r1.ebuild 1659
-SHA256 305b1c9160f8d0a21fb32947da3e90dd15eed835131f4d606732e9b1b4a697b9 mod_python-3.1.4-r1.ebuild 1659
-EBUILD mod_python-3.1.4.ebuild 1534 RMD160 e9e100076b6dfb9c677a3ca3d81ed46b8ced85ba SHA1 f8dbae6e5340677299bff9acb5a2acdad2ffc01d SHA256 54c65c5579f288bffa7b0c1a03796b4b0e8b7e65e7a6bed5241d69e7fc120528
-MD5 7014ce279d11b10e01891e484d5e6486 mod_python-3.1.4.ebuild 1534
-RMD160 e9e100076b6dfb9c677a3ca3d81ed46b8ced85ba mod_python-3.1.4.ebuild 1534
-SHA256 54c65c5579f288bffa7b0c1a03796b4b0e8b7e65e7a6bed5241d69e7fc120528 mod_python-3.1.4.ebuild 1534
-EBUILD mod_python-3.2.10.ebuild 1540 RMD160 2886c951c00afb16f38180ed03420787919efe44 SHA1 1bbf6b99facd4f8198230cf831f10a45b583fe94 SHA256 06365f9b059735c3b32ea4d5b64e852a89fb6d6fab18b205edafa6670029bbac
-MD5 25df3130d9ce94c39d51cccf680dc484 mod_python-3.2.10.ebuild 1540
-RMD160 2886c951c00afb16f38180ed03420787919efe44 mod_python-3.2.10.ebuild 1540
-SHA256 06365f9b059735c3b32ea4d5b64e852a89fb6d6fab18b205edafa6670029bbac mod_python-3.2.10.ebuild 1540
-MISC ChangeLog 7042 RMD160 571af3eb36645c8a5982202e76ed81e7a19f75c9 SHA1 d1182319f36e6dd7f604996e640703226738dd55 SHA256 01d771c4b33d52ccf4cea5033d420dadc8398f8989bcf83671540e08f6bf2c81
-MD5 aec3841c9c74502387ca3e452ff221a9 ChangeLog 7042
-RMD160 571af3eb36645c8a5982202e76ed81e7a19f75c9 ChangeLog 7042
-SHA256 01d771c4b33d52ccf4cea5033d420dadc8398f8989bcf83671540e08f6bf2c81 ChangeLog 7042
+EBUILD mod_python-3.1.4-r1.ebuild 1595 RMD160 9422dfe20325cda3d55f161e426bcc65c20cbb05 SHA1 9a1f9b7a8ee753383906bb53ce47ee89f9198b7c SHA256 8785d6a36dc8a9a7c518adfac0065afcae2bc6e813ec7dabc7a13f08a8cacacd
+MD5 ca3c1ef63c53b3f7434c1c6c2189a22b mod_python-3.1.4-r1.ebuild 1595
+RMD160 9422dfe20325cda3d55f161e426bcc65c20cbb05 mod_python-3.1.4-r1.ebuild 1595
+SHA256 8785d6a36dc8a9a7c518adfac0065afcae2bc6e813ec7dabc7a13f08a8cacacd mod_python-3.1.4-r1.ebuild 1595
+EBUILD mod_python-3.1.4.ebuild 1472 RMD160 b130fb350ea76a43b3280746460e95eb0183ab79 SHA1 a9ef03a3a72fad1ef695e2ec70a9af0fd9619d25 SHA256 603bfc84f4ab00b0cf1656ae17167c8dbc7ad9a64574da11a4d4f809a4479043
+MD5 79bab2b35e9916b646d7850ed5a36143 mod_python-3.1.4.ebuild 1472
+RMD160 b130fb350ea76a43b3280746460e95eb0183ab79 mod_python-3.1.4.ebuild 1472
+SHA256 603bfc84f4ab00b0cf1656ae17167c8dbc7ad9a64574da11a4d4f809a4479043 mod_python-3.1.4.ebuild 1472
+EBUILD mod_python-3.2.10.ebuild 1478 RMD160 32fecc9101ae545c8921f2a73ea30b7bd9b15ecd SHA1 4cca150e1006791469c036170d3586c53a503c42 SHA256 160251f19aef176b78395eb53736909141ba1b9605784fc3506d20e793570a7a
+MD5 ca7d1ad44d6700e39f7d473cb5502e1d mod_python-3.2.10.ebuild 1478
+RMD160 32fecc9101ae545c8921f2a73ea30b7bd9b15ecd mod_python-3.2.10.ebuild 1478
+SHA256 160251f19aef176b78395eb53736909141ba1b9605784fc3506d20e793570a7a mod_python-3.2.10.ebuild 1478
+MISC ChangeLog 7321 RMD160 2b163fee8a0fb2a5577614adc0945c331b041237 SHA1 46a6a55d2b1f412e5439dd1d753e42f0ea761dfe SHA256 e74effe278789d8c2e22181a59d017991f952a9822217aa8774e6bcf69a3914b
+MD5 d8de5280f1fede6265c80501ea92a605 ChangeLog 7321
+RMD160 2b163fee8a0fb2a5577614adc0945c331b041237 ChangeLog 7321
+SHA256 e74effe278789d8c2e22181a59d017991f952a9822217aa8774e6bcf69a3914b ChangeLog 7321
 MISC metadata.xml 1061 RMD160 181f0edbb61dae133206cb760f9a1e485e960623 SHA1 2495194ebd305d7012702d3cd40a2d89d0b99eee SHA256 8055ef4e2954a77a90a3d3c48438fb7993442d22b2737c563ba3af67069e658a
 MD5 4238f8266f49d6a9dbe435b27aa5cbb2 metadata.xml 1061
 RMD160 181f0edbb61dae133206cb760f9a1e485e960623 metadata.xml 1061
@@ -61,3 +64,10 @@ SHA256 8284a8bd265034aa07543a96029164848192d3826d6a9939df29374e46c364b8 files/di
 MD5 7356bad2e0df6f2d04de41533b44a0f5 files/digest-mod_python-3.2.10 244
 RMD160 ad8a915266a5c1e9983b75d060ec14e616c9f2dd files/digest-mod_python-3.2.10 244
 SHA256 71ca744baad29cf4a061da86837b5ea7f31c11501008225018160c636be80de7 files/digest-mod_python-3.2.10 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFpo7HyuNVb5qfaOYRAuY8AJ0fHlWvaPzuG1849jk03IxbykATfgCgrjPI
+YaDspu0ddHs+DhEkDZCj00k=
+=eoGE
+-----END PGP SIGNATURE-----

diff --git a/dev-python/mod_python/mod_python-2.7.11.ebuild b/dev-python/mod_python/mod_python-2.7.11.ebuild
index a75c72961cd87dbc20b488f822c8680a5daeb1cb..0c4e69dc23f689e7f96cc7ec050736b210a7a1df 100644 (file)
--- a/dev-python/mod_python/mod_python-2.7.11.ebuild
+++ b/dev-python/mod_python/mod_python-2.7.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-2.7.11.ebuild,v 1.4 2006/06/28 10:59:12 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-2.7.11.ebuild,v 1.5 2007/01/11 19:25:40 phreak Exp $
 
 inherit python apache-module
 
@@ -50,9 +50,7 @@ src_install() {
        rm ${D}${PY_LIBPATH}/compileall.py
 
        insinto /usr/share/doc/${PF}/html
-       doins doc-html/*
-       insinto /usr/share/doc/${PF}/html/icons
-       doins doc-html/icons/*
+       doins -r doc-html/*
 
        apache-module_src_install
        insinto ${APACHE1_MODULES_CONFDIR}

diff --git a/dev-python/mod_python/mod_python-3.1.4-r1.ebuild b/dev-python/mod_python/mod_python-3.1.4-r1.ebuild
index 93e915a49a5c36fba66dea6268c2ce606edd65e1..55ae9095584c911d97ca33b7edd850daf9c37ce6 100644 (file)
--- a/dev-python/mod_python/mod_python-3.1.4-r1.ebuild
+++ b/dev-python/mod_python/mod_python-3.1.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.1.4-r1.ebuild,v 1.10 2006/07/12 15:46:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.1.4-r1.ebuild,v 1.11 2007/01/11 19:25:40 phreak Exp $
 
 inherit python eutils apache-module autotools
 
@@ -47,9 +47,7 @@ src_compile() {
 src_install() {
        emake DESTDIR=${D} install || die
 
-       dohtml doc-html/*
-       insinto /usr/share/doc/${PF}/html/icons
-       doins doc-html/icons/*
+       dohtml -r doc-html/*
 
        apache-module_src_install
        insinto ${APACHE2_MODULES_CONFDIR}

diff --git a/dev-python/mod_python/mod_python-3.1.4.ebuild b/dev-python/mod_python/mod_python-3.1.4.ebuild
index 90b4494f940e9569df29b81a9c74b25da27792c3..8434154323faf3d27570156fbea208f6d01b0892 100644 (file)
--- a/dev-python/mod_python/mod_python-3.1.4.ebuild
+++ b/dev-python/mod_python/mod_python-3.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.1.4.ebuild,v 1.4 2005/02/27 11:18:51 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.1.4.ebuild,v 1.5 2007/01/11 19:25:40 phreak Exp $
 
 inherit python eutils apache-module
 
@@ -42,9 +42,7 @@ src_compile() {
 src_install() {
        emake DESTDIR=${D} install || die
 
-       dohtml doc-html/*
-       insinto /usr/share/doc/${PF}/html/icons
-       doins doc-html/icons/*
+       dohtml -r doc-html/*
 
        apache-module_src_install
        insinto ${APACHE2_MODULES_CONFDIR}

diff --git a/dev-python/mod_python/mod_python-3.2.10.ebuild b/dev-python/mod_python/mod_python-3.2.10.ebuild
index ba5330f47c174fb788f898d5c93a6ac86b2f1e73..03f80c64d086f154a79f4cfd3a6f12f0b1542cad 100644 (file)
--- a/dev-python/mod_python/mod_python-3.2.10.ebuild
+++ b/dev-python/mod_python/mod_python-3.2.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.2.10.ebuild,v 1.1 2006/10/08 19:34:51 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.2.10.ebuild,v 1.2 2007/01/11 19:25:40 phreak Exp $
 
 inherit python eutils apache-module autotools
 
@@ -43,9 +43,7 @@ src_compile() {
 src_install() {
        emake DESTDIR=${D} install || die
 
-       dohtml doc-html/*
-       insinto /usr/share/doc/${PF}/html/icons
-       doins doc-html/icons/*
+       dohtml -r doc-html/*
 
        apache-module_src_install
        insinto ${APACHE2_MODULES_CONFDIR}